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 <[email protected]> +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 +
