* [gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/, games-board/aisleriot/files/
@ 2015-05-10 22:29 Gilles Dartiguelongue
0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-10 22:29 UTC (permalink / raw
To: gentoo-commits
commit: b3277001ace571abba8a04bc07e4f5c5616b2cae
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 22:26:47 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 10 22:26:47 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b3277001
games-board/aisleriot: 9999 → 3.16.2
Try to package aisleriot again for bug #475324.
Currently fails due to undefined references due to card theme handling.
games-board/aisleriot/aisleriot-3.16.2.ebuild | 75 ++++++++++++++++++++++
games-board/aisleriot/aisleriot-9999.ebuild | 72 +++++++++++----------
.../files/aisleriot-3.16.2-detect-svg.patch | 28 ++++++++
3 files changed, 140 insertions(+), 35 deletions(-)
diff --git a/games-board/aisleriot/aisleriot-3.16.2.ebuild b/games-board/aisleriot/aisleriot-3.16.2.ebuild
new file mode 100644
index 0000000..f4a5f8a
--- /dev/null
+++ b/games-board/aisleriot/aisleriot-3.16.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils gnome-games
+
+DESCRIPTION="A collection of solitaire card games for GNOME"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot"
+
+LICENSE="GPL-3 LGPL-3 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome"
+
+# FIXME: quartz support?
+# Does not build with guile-2.0.0 or 2.0.1
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
+ >=dev-scheme/guile-2.0.5:2[deprecated,regex]
+ >=gnome-base/librsvg-2.32:2
+ >=media-libs/libcanberra-0.26[gtk3]
+ >=x11-libs/cairo-1.10
+ >=x11-libs/gtk+-3.4:3
+ gnome? ( >=gnome-base/gconf-2.0:2 )
+"
+DEPEND="${COMMON_DEPEND}
+ app-arch/gzip
+ dev-libs/libxml2
+ >=dev-util/intltool-0.40.4
+ sys-apps/lsb-release
+ >=sys-devel/gettext-0.12
+ virtual/pkgconfig
+ gnome? ( app-text/docbook-xml-dtd:4.3 )
+"
+# >=app-text/yelp-tools-3.1.1
+
+src_prepare() {
+ # Fix SVG detection and usage
+ epatch "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ local myconf
+
+ if use gnome; then
+ myconf="--with-platform=gnome --with-help-method=ghelp"
+ else
+ myconf="--with-platform=gtk-only --with-help-method=library"
+ fi
+
+ gnome2_src_configure \
+ --with-gtk=3.0 \
+ --with-guile=2.0 \
+ --enable-sound \
+ --with-card-theme-formats=all \
+ --with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks \
+ --with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
+ GUILE=$(type -P guile-2.0) \
+ ITSTOOL=$(type -P true) \
+ XMLLINT=$(type -P true) \
+ ${myconf}
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ elog "Aisleriot can use additional card themes from games-board/pysolfc"
+ elog "and kde-base/libkdegames."
+}
diff --git a/games-board/aisleriot/aisleriot-9999.ebuild b/games-board/aisleriot/aisleriot-9999.ebuild
index fc4de84..0cf9ad6 100644
--- a/games-board/aisleriot/aisleriot-9999.ebuild
+++ b/games-board/aisleriot/aisleriot-9999.ebuild
@@ -1,20 +1,17 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
+EAPI="5"
GCONF_DEBUG="yes"
-# make sure games is inherited first so that the gnome2
-# functions will be called if they are not overridden
-inherit eutils games gnome2
+inherit autotools eutils gnome-games
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
DESCRIPTION="A collection of solitaire card games for GNOME"
-HOMEPAGE="http://live.gnome.org/Aisleriot"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot"
LICENSE="GPL-3 LGPL-3 FDL-1.1"
SLOT="0"
@@ -27,20 +24,15 @@ IUSE="gnome"
# FIXME: quartz support?
# Does not build with guile-2.0.0 or 2.0.1
-COMMON_DEPEND=">=dev-libs/glib-2.31.13:2
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
>=dev-scheme/guile-2.0.5:2[deprecated,regex]
- >=gnome-base/librsvg-2.32.0:2
- >=x11-libs/cairo-1.10.0
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.0.0:3
- x11-libs/libICE
- x11-libs/libSM
+ >=gnome-base/librsvg-2.32:2
>=media-libs/libcanberra-0.26[gtk3]
- gnome? ( >=gnome-base/gconf-2.0:2 )"
-# aisleriot was split off from gnome-games
-RDEPEND="${COMMON_DEPEND}
- !<gnome-extra/gnome-games-3.1.1[aisleriot]
- !<gnome-extra/gnome-games-3"
+ >=x11-libs/cairo-1.10
+ >=x11-libs/gtk+-3.4:3
+ gnome? ( >=gnome-base/gconf-2.0:2 )
+"
DEPEND="${COMMON_DEPEND}
app-arch/gzip
dev-libs/libxml2
@@ -48,28 +40,38 @@ DEPEND="${COMMON_DEPEND}
sys-apps/lsb-release
>=sys-devel/gettext-0.12
virtual/pkgconfig
- gnome? (
- app-text/docbook-xml-dtd:4.3
- >=app-text/yelp-tools-3.1.1 )"
+ gnome? ( app-text/docbook-xml-dtd:4.3 )
+"
+# >=app-text/yelp-tools-3.1.1
-pkg_setup() {
- DOCS="AUTHORS ChangeLog TODO"
+src_prepare() {
+ # Fix SVG detection and usage
+ epatch "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ local myconf
if use gnome; then
- G2CONF="${G2CONF} --with-platform=gnome --with-help-method=ghelp"
+ myconf="--with-platform=gnome --with-help-method=ghelp"
else
- G2CONF="${G2CONF} --with-platform=gtk-only --with-help-method=library
- ITSTOOL=$(type -P true) XMLLINT=$(type -P true)"
+ myconf="--with-platform=gtk-only --with-help-method=library"
fi
- G2CONF="${G2CONF}
- --with-gtk=3.0
- --with-guile=2.0
- --enable-sound
- --disable-schemas-compile
- --with-card-theme-formats=all
- --with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
- --with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc"
+ gnome2_src_configure \
+ --with-gtk=3.0 \
+ --with-guile=2.0 \
+ --enable-sound \
+ --with-card-theme-formats=all \
+ --with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks \
+ --with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
+ GUILE=$(type -P guile-2.0) \
+ ITSTOOL=$(type -P true) \
+ XMLLINT=$(type -P true) \
+ ${myconf}
}
pkg_postinst() {
diff --git a/games-board/aisleriot/files/aisleriot-3.16.2-detect-svg.patch b/games-board/aisleriot/files/aisleriot-3.16.2-detect-svg.patch
new file mode 100644
index 0000000..2dd9001
--- /dev/null
+++ b/games-board/aisleriot/files/aisleriot-3.16.2-detect-svg.patch
@@ -0,0 +1,28 @@
+Do not require a particular SVG library unless actually found.
+
+--- a/configure.ac 2015-05-11 00:13:51.180002639 +0200
++++ b/configure.ac 2015-05-11 00:13:40.365069049 +0200
+@@ -319,7 +319,9 @@
+
+ PKG_CHECK_EXISTS([librsvg-2.0 >= $RSVG_REQUIRED],[have_rsvg=yes],[have_rsvg=no])
+
+- PKGS="$PKGS librsvg-2.0 >= $RSVG_REQUIRED cairo >= $CAIRO_REQUIRED"
++ if test "$have_rsvg" = "yes" ; then
++ PKGS="$PKGS librsvg-2.0 >= $RSVG_REQUIRED cairo >= $CAIRO_REQUIRED"
++ fi
+
+ AC_DEFINE([HAVE_RSVG],[1],[Refine if librsvg is available])
+ fi
+@@ -334,8 +336,10 @@
+
+ PKG_CHECK_EXISTS([QtSvg >= $QT_SVG_REQUIRED],[have_qtsvg=yes],[have_qtsvg=no])
+
+- PKGS="$PKGS QtSvg >= $QT_SVG_REQUIRED"
+- EXTRA_CXX_LIBS="$EXTRA_CXX_LIBS -lstdc++"
++ if test "$have_qtsvg" = "yes" ; then
++ PKGS="$PKGS QtSvg >= $QT_SVG_REQUIRED"
++ EXTRA_CXX_LIBS="$EXTRA_CXX_LIBS -lstdc++"
++ fi
+
+ AC_DEFINE([HAVE_QTSVG],[1],[Refine if QtSvg is available])
+ fi
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/, games-board/aisleriot/files/
@ 2016-10-31 10:37 Gilles Dartiguelongue
0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue @ 2016-10-31 10:37 UTC (permalink / raw
To: gentoo-commits
commit: 2bd5ae6c73645e1da9961bdbbd5002ac287b7229
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 11:37:21 2016 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 10:28:23 2016 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2bd5ae6c
games-board/aisleriot: 3.20.2 → 3.22.0
Package-Manager: portage-2.3.2
Manifest-Sign-Key: C6085806
...sleriot-9999.ebuild => aisleriot-3.22.0.ebuild} | 32 ++++++-----------
games-board/aisleriot/aisleriot-9999.ebuild | 23 ++++++-------
.../files/aisleriot-3.22.0-detect-svg.patch | 40 ++++++++++++++++++++++
3 files changed, 61 insertions(+), 34 deletions(-)
diff --git a/games-board/aisleriot/aisleriot-9999.ebuild b/games-board/aisleriot/aisleriot-3.22.0.ebuild
similarity index 75%
copy from games-board/aisleriot/aisleriot-9999.ebuild
copy to games-board/aisleriot/aisleriot-3.22.0.ebuild
index 535d6b4..9e0f323 100644
--- a/games-board/aisleriot/aisleriot-9999.ebuild
+++ b/games-board/aisleriot/aisleriot-3.22.0.ebuild
@@ -1,26 +1,18 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
-GCONF_DEBUG="yes"
+EAPI=6
-inherit autotools eutils gnome-games
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
+inherit autotools gnome2
DESCRIPTION="A collection of solitaire card games for GNOME"
HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot"
LICENSE="GPL-3 LGPL-3 FDL-1.1"
SLOT="0"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~x86"
-fi
-IUSE="gnome qt4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gnome qt5"
# FIXME: quartz support?
# Does not build with guile-2.0.0 or 2.0.1
@@ -32,24 +24,22 @@ COMMON_DEPEND="
>=x11-libs/cairo-1.10
>=x11-libs/gtk+-3.4:3
gnome? ( >=gnome-base/gconf-2.0:2 )
- qt4? ( >=dev-qt/qtsvg-4.4:4 )
+ qt5? ( >=dev-qt/qtsvg-5:5 )
"
DEPEND="${COMMON_DEPEND}
app-arch/gzip
- dev-libs/libxml2
+ app-text/yelp-tools
>=dev-util/intltool-0.40.4
- dev-util/itstool
+ gnome-base/gnome-common
sys-apps/lsb-release
>=sys-devel/gettext-0.12
virtual/pkgconfig
gnome? ( app-text/docbook-xml-dtd:4.3 )
"
-# dev-util/itstool really needed for help file generation
-# >=app-text/yelp-tools-3.1.1
src_prepare() {
# Fix SVG detection and usage
- epatch "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch
+ eapply "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
eautoreconf
gnome2_src_prepare
@@ -70,7 +60,7 @@ src_configure() {
)
fi
- if use qt4 ; then
+ if use qt5 ; then
myconf+=(
--with-card-theme-formats=all
--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
@@ -82,9 +72,9 @@ src_configure() {
gnome2_src_configure \
--with-gtk=3.0 \
--with-guile=2.0 \
+ $(usex debug --enable-debug=yes --enable-debug=minimum) \
--enable-sound \
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
- GUILE=$(type -P guile-2.0) \
${myconf[@]}
}
diff --git a/games-board/aisleriot/aisleriot-9999.ebuild b/games-board/aisleriot/aisleriot-9999.ebuild
index 535d6b4..77df6e2 100644
--- a/games-board/aisleriot/aisleriot-9999.ebuild
+++ b/games-board/aisleriot/aisleriot-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
-GCONF_DEBUG="yes"
+EAPI=6
-inherit autotools eutils gnome-games
+inherit autotools gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -20,7 +19,7 @@ if [[ ${PV} = 9999 ]]; then
else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="gnome qt4"
+IUSE="debug gnome qt5"
# FIXME: quartz support?
# Does not build with guile-2.0.0 or 2.0.1
@@ -32,24 +31,22 @@ COMMON_DEPEND="
>=x11-libs/cairo-1.10
>=x11-libs/gtk+-3.4:3
gnome? ( >=gnome-base/gconf-2.0:2 )
- qt4? ( >=dev-qt/qtsvg-4.4:4 )
+ qt5? ( >=dev-qt/qtsvg-5:5 )
"
DEPEND="${COMMON_DEPEND}
app-arch/gzip
- dev-libs/libxml2
+ app-text/yelp-tools
>=dev-util/intltool-0.40.4
- dev-util/itstool
+ gnome-base/gnome-common
sys-apps/lsb-release
>=sys-devel/gettext-0.12
virtual/pkgconfig
gnome? ( app-text/docbook-xml-dtd:4.3 )
"
-# dev-util/itstool really needed for help file generation
-# >=app-text/yelp-tools-3.1.1
src_prepare() {
# Fix SVG detection and usage
- epatch "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch
+ eapply "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
eautoreconf
gnome2_src_prepare
@@ -70,7 +67,7 @@ src_configure() {
)
fi
- if use qt4 ; then
+ if use qt5 ; then
myconf+=(
--with-card-theme-formats=all
--with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
@@ -82,9 +79,9 @@ src_configure() {
gnome2_src_configure \
--with-gtk=3.0 \
--with-guile=2.0 \
+ $(usex debug --enable-debug=yes --enable-debug=minimum) \
--enable-sound \
--with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
- GUILE=$(type -P guile-2.0) \
${myconf[@]}
}
diff --git a/games-board/aisleriot/files/aisleriot-3.22.0-detect-svg.patch b/games-board/aisleriot/files/aisleriot-3.22.0-detect-svg.patch
new file mode 100644
index 0000000..827abcf
--- /dev/null
+++ b/games-board/aisleriot/files/aisleriot-3.22.0-detect-svg.patch
@@ -0,0 +1,40 @@
+From f8dfa11c318c33847670cd06a43dd5b19f1d5231 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 31 Oct 2016 11:23:30 +0100
+Subject: [PATCH] Do not require a particular SVG library unless actually found
+
+---
+ configure.ac | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8c4a38e..06e174f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -325,7 +325,9 @@ if test "$need_rsvg" = "yes"; then
+
+ PKG_CHECK_EXISTS([librsvg-2.0 >= $RSVG_REQUIRED],[have_rsvg=yes],[have_rsvg=no])
+
+- PKGS="$PKGS librsvg-2.0 >= $RSVG_REQUIRED cairo >= $CAIRO_REQUIRED"
++ if test "$have_rsvg" = "yes" ; then
++ PKGS="$PKGS librsvg-2.0 >= $RSVG_REQUIRED cairo >= $CAIRO_REQUIRED"
++ fi
+
+ AC_DEFINE([HAVE_RSVG],[1],[Refine if librsvg is available])
+ fi
+@@ -340,8 +342,10 @@ if test "$need_qtsvg" = "yes"; then
+
+ PKG_CHECK_EXISTS([Qt5Svg >= $QT_SVG_REQUIRED],[have_qtsvg=yes],[have_qtsvg=no])
+
+- PKGS="$PKGS Qt5Svg >= $QT_SVG_REQUIRED"
+- EXTRA_CXX_LIBS="$EXTRA_CXX_LIBS -lstdc++"
++ if test "$have_qtsvg" = "yes" ; then
++ PKGS="$PKGS Qt5Svg >= $QT_SVG_REQUIRED"
++ EXTRA_CXX_LIBS="$EXTRA_CXX_LIBS -lstdc++"
++ fi
+
+ AC_DEFINE([HAVE_QTSVG],[1],[Refine if QtSvg is available])
+ fi
+--
+2.10.1
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/, games-board/aisleriot/files/
@ 2016-11-13 12:07 Gilles Dartiguelongue
0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue @ 2016-11-13 12:07 UTC (permalink / raw
To: gentoo-commits
commit: 36ce83be8a80ec774affb91b7474e84361a49594
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 12:43:11 2016 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 12:43:30 2016 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=36ce83be
games-board/aisleriot: cleanup old revision
Package-Manager: portage-2.3.2
Manifest-Sign-Key: C6085806
games-board/aisleriot/aisleriot-3.20.2.ebuild | 89 ----------------------
.../files/aisleriot-3.16.2-detect-svg.patch | 28 -------
2 files changed, 117 deletions(-)
diff --git a/games-board/aisleriot/aisleriot-3.20.2.ebuild b/games-board/aisleriot/aisleriot-3.20.2.ebuild
deleted file mode 100644
index dc2b6e1..0000000
--- a/games-board/aisleriot/aisleriot-3.20.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools gnome2
-
-DESCRIPTION="A collection of solitaire card games for GNOME"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot"
-
-LICENSE="GPL-3 LGPL-3 FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gnome qt4"
-
-# FIXME: quartz support?
-# Does not build with guile-2.0.0 or 2.0.1
-COMMON_DEPEND="
- >=dev-libs/glib-2.32:2
- >=dev-scheme/guile-2.0.5:12[deprecated,regex]
- >=gnome-base/librsvg-2.32:2
- >=media-libs/libcanberra-0.26[gtk3]
- >=x11-libs/cairo-1.10
- >=x11-libs/gtk+-3.4:3
- gnome? ( >=gnome-base/gconf-2.0:2 )
- qt4? ( >=dev-qt/qtsvg-4.4:4 )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/gzip
- dev-libs/libxml2
- >=dev-util/intltool-0.40.4
- dev-util/itstool
- sys-apps/lsb-release
- >=sys-devel/gettext-0.12
- virtual/pkgconfig
- gnome? ( app-text/docbook-xml-dtd:4.3 )
-"
-# dev-util/itstool really needed for help file generation
-# >=app-text/yelp-tools-3.1.1
-
-src_prepare() {
- # Fix SVG detection and usage
- eapply "${FILESDIR}"/${PN}-3.16.2-detect-svg.patch
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- local myconf=()
-
- if use gnome; then
- myconf+=(
- --with-platform=gnome
- --with-help-method=ghelp
- )
- else
- myconf+=(
- --with-platform=gtk-only
- --with-help-method=library
- )
- fi
-
- if use qt4 ; then
- myconf+=(
- --with-card-theme-formats=all
- --with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
- )
- else
- myconf+=( --with-card-theme-formats=svg,fixed,pysol )
- fi
-
- gnome2_src_configure \
- --with-gtk=3.0 \
- --with-guile=2.0 \
- $(usex debug --enable-debug=yes --enable-debug=minimum) \
- --enable-sound \
- --with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
- GUILE=$(type -P guile-2.0) \
- ${myconf[@]}
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- elog "Aisleriot can use additional card themes from games-board/pysolfc"
- elog "and kde-base/libkdegames."
-}
diff --git a/games-board/aisleriot/files/aisleriot-3.16.2-detect-svg.patch b/games-board/aisleriot/files/aisleriot-3.16.2-detect-svg.patch
deleted file mode 100644
index 2dd9001..0000000
--- a/games-board/aisleriot/files/aisleriot-3.16.2-detect-svg.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Do not require a particular SVG library unless actually found.
-
---- a/configure.ac 2015-05-11 00:13:51.180002639 +0200
-+++ b/configure.ac 2015-05-11 00:13:40.365069049 +0200
-@@ -319,7 +319,9 @@
-
- PKG_CHECK_EXISTS([librsvg-2.0 >= $RSVG_REQUIRED],[have_rsvg=yes],[have_rsvg=no])
-
-- PKGS="$PKGS librsvg-2.0 >= $RSVG_REQUIRED cairo >= $CAIRO_REQUIRED"
-+ if test "$have_rsvg" = "yes" ; then
-+ PKGS="$PKGS librsvg-2.0 >= $RSVG_REQUIRED cairo >= $CAIRO_REQUIRED"
-+ fi
-
- AC_DEFINE([HAVE_RSVG],[1],[Refine if librsvg is available])
- fi
-@@ -334,8 +336,10 @@
-
- PKG_CHECK_EXISTS([QtSvg >= $QT_SVG_REQUIRED],[have_qtsvg=yes],[have_qtsvg=no])
-
-- PKGS="$PKGS QtSvg >= $QT_SVG_REQUIRED"
-- EXTRA_CXX_LIBS="$EXTRA_CXX_LIBS -lstdc++"
-+ if test "$have_qtsvg" = "yes" ; then
-+ PKGS="$PKGS QtSvg >= $QT_SVG_REQUIRED"
-+ EXTRA_CXX_LIBS="$EXTRA_CXX_LIBS -lstdc++"
-+ fi
-
- AC_DEFINE([HAVE_QTSVG],[1],[Refine if QtSvg is available])
- fi
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/, games-board/aisleriot/files/
@ 2017-09-03 10:30 Gilles Dartiguelongue
0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue @ 2017-09-03 10:30 UTC (permalink / raw
To: gentoo-commits
commit: 922da42611a6f519be2cc3f70c2b383e98b089c9
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 3 10:27:18 2017 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Sep 3 10:27:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=922da426
games-board/aisleriot: version bump 3.22.1 → 3.22.2
Add missing dependency on autoconf-archive, bug #627182.
Add C++11 requirement due to Qt5, bug #617256.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Manifest-Sign-Key: 0x5A56C8CD0C13248A
games-board/aisleriot/aisleriot-3.22.2.ebuild | 87 ++++++++++++++++++++++
.../aisleriot-3.22.2-qt5-requires-cxx11.patch | 27 +++++++
2 files changed, 114 insertions(+)
diff --git a/games-board/aisleriot/aisleriot-3.22.2.ebuild b/games-board/aisleriot/aisleriot-3.22.2.ebuild
new file mode 100644
index 00000000..c492247a
--- /dev/null
+++ b/games-board/aisleriot/aisleriot-3.22.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="A collection of solitaire card games for GNOME"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Aisleriot"
+
+LICENSE="GPL-3 LGPL-3 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gnome qt5"
+
+# FIXME: quartz support?
+# Does not build with guile-2.0.0 or 2.0.1
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
+ >=dev-scheme/guile-2.0.5:12[deprecated,regex]
+ >=gnome-base/librsvg-2.32:2
+ >=media-libs/libcanberra-0.26[gtk3]
+ >=x11-libs/cairo-1.10
+ >=x11-libs/gtk+-3.4:3
+ gnome? ( >=gnome-base/gconf-2.0:2 )
+ qt5? ( >=dev-qt/qtsvg-5:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ app-arch/gzip
+ app-text/yelp-tools
+ >=dev-util/intltool-0.40.4
+ gnome-base/gnome-common
+ sys-apps/lsb-release
+ sys-devel/autoconf-archive
+ >=sys-devel/gettext-0.12
+ virtual/pkgconfig
+ gnome? ( app-text/docbook-xml-dtd:4.3 )
+"
+
+PATCHES=(
+ # Fix SVG detection and usage
+ "${FILESDIR}"/${PN}-3.22.0-detect-svg.patch
+ # Fix build with Qt5, bug #617256
+ "${FILESDIR}"/${PN}-3.22.2-qt5-requires-cxx11.patch
+)
+
+src_configure() {
+ local myconf=()
+
+ if use gnome; then
+ myconf+=(
+ --with-platform=gnome
+ --with-help-method=ghelp
+ )
+ else
+ myconf+=(
+ --with-platform=gtk-only
+ --with-help-method=library
+ )
+ fi
+
+ if use qt5 ; then
+ myconf+=(
+ --with-card-theme-formats=all
+ --with-kde-card-theme-path="${EPREFIX}"/usr/share/apps/carddecks
+ )
+ else
+ myconf+=( --with-card-theme-formats=svg,fixed,pysol )
+ fi
+
+ gnome2_src_configure \
+ --with-gtk=3.0 \
+ --with-guile=2.0 \
+ $(usex debug --enable-debug=yes --enable-debug=minimum) \
+ --enable-sound \
+ --with-pysol-card-theme-path="${EPREFIX}${GAMES_DATADIR}"/pysolfc \
+ ${myconf[@]}
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ elog "Aisleriot can use additional card themes from games-board/pysolfc"
+ elog "and kde-base/libkdegames."
+}
diff --git a/games-board/aisleriot/files/aisleriot-3.22.2-qt5-requires-cxx11.patch b/games-board/aisleriot/files/aisleriot-3.22.2-qt5-requires-cxx11.patch
new file mode 100644
index 00000000..adf4f651
--- /dev/null
+++ b/games-board/aisleriot/files/aisleriot-3.22.2-qt5-requires-cxx11.patch
@@ -0,0 +1,27 @@
+From 4f747c66d41f50d017191583e670fec2468c9815 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 3 Sep 2017 12:21:17 +0200
+Subject: [PATCH] Building against Qt5 requires c++11
+
+---
+ configure.ac | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index ce3209b6..88cecedc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,6 +44,10 @@ LT_INIT
+ LT_LANG([C])
+ LT_LANG([C++])
+
++AC_LANG_CPLUSPLUS
++AC_LANG_COMPILER_REQUIRE
++AX_CXX_COMPILE_STDCXX_11([], [mandatory])
++
+ # ************
+ # Dependencies
+ # ************
+--
+2.14.1
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-09-03 10:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-03 10:30 [gentoo-commits] proj/gnome:master commit in: games-board/aisleriot/, games-board/aisleriot/files/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2016-11-13 12:07 Gilles Dartiguelongue
2016-10-31 10:37 Gilles Dartiguelongue
2015-05-10 22:29 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox