diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-09-07 11:19:26 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-09-07 11:19:26 +0000 |
| commit | f661abe8e25da60d091492283d1844cccf5c0c21 (patch) | |
| tree | 0c705556bda96d12c823e7f7138a70d269e61de6 /games-board | |
| parent | Add ~mips. Bug #475964 (diff) | |
| download | gentoo-2-f661abe8e25da60d091492283d1844cccf5c0c21.tar.gz gentoo-2-f661abe8e25da60d091492283d1844cccf5c0c21.tar.bz2 gentoo-2-f661abe8e25da60d091492283d1844cccf5c0c21.zip | |
fix build with Xaw3d wrt #484078
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'games-board')
| -rw-r--r-- | games-board/xboard/ChangeLog | 6 | ||||
| -rw-r--r-- | games-board/xboard/files/xboard-4.7.2-Xaw3d.patch | 23 | ||||
| -rw-r--r-- | games-board/xboard/xboard-4.7.2.ebuild | 14 |
3 files changed, 35 insertions, 8 deletions
diff --git a/games-board/xboard/ChangeLog b/games-board/xboard/ChangeLog index 107d8fa28136..91c8f04e96b5 100644 --- a/games-board/xboard/ChangeLog +++ b/games-board/xboard/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-board/xboard # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.56 2013/09/06 20:57:38 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.57 2013/09/07 11:19:26 hasufell Exp $ + + 07 Sep 2013; Julian Ospald <hasufell@gentoo.org> xboard-4.7.2.ebuild, + +files/xboard-4.7.2-Xaw3d.patch: + fix build with Xaw3d wrt #484078 06 Sep 2013; Julian Ospald <hasufell@gentoo.org> files/xboard-4.7.2-paths.patch: diff --git a/games-board/xboard/files/xboard-4.7.2-Xaw3d.patch b/games-board/xboard/files/xboard-4.7.2-Xaw3d.patch new file mode 100644 index 000000000000..a180d9288e22 --- /dev/null +++ b/games-board/xboard/files/xboard-4.7.2-Xaw3d.patch @@ -0,0 +1,23 @@ +commit 7bc79645d4e404d00fee43b5a6cee4e3b6bf7a35 +Author: hasufell <hasufell@gentoo.org> +Date: Sat Sep 7 12:48:58 2013 +0200 + + BUILD: fix withXaw conditional + + Listing both one after another leads to withXaw being false + if you pass "--with-Xaw3d --without-Xaw". + +diff --git a/configure.ac b/configure.ac +index 1664491..6548295 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -248,8 +248,7 @@ fi + + dnl | make results available in Makefile.am + AM_CONDITIONAL([withGTK], [test x"$with_GTK" = x"yes"]) +-AM_CONDITIONAL([withXaw], [test x"$with_Xaw3d" = x"yes"]) +-AM_CONDITIONAL([withXaw], [test x"$with_Xaw" = x"yes"]) ++AM_CONDITIONAL([withXaw], [test x"$with_Xaw3d" = x"yes" || test x"$with_Xaw" = x"yes"]) + + + AC_SUBST(FRONTEND_CFLAGS) diff --git a/games-board/xboard/xboard-4.7.2.ebuild b/games-board/xboard/xboard-4.7.2.ebuild index 2fc7e927fccc..8fe4f9a322c6 100644 --- a/games-board/xboard/xboard-4.7.2.ebuild +++ b/games-board/xboard/xboard-4.7.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.7.2.ebuild,v 1.3 2013/09/06 19:03:16 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.7.2.ebuild,v 1.4 2013/09/07 11:19:26 hasufell Exp $ EAPI=5 inherit autotools eutils fdo-mime gnome2-utils games @@ -12,8 +12,8 @@ SRC_URI="mirror://gnu/xboard/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="Xaw3d +default-font gtk nls xpm zippy" -REQUIRED_USE="?? ( Xaw3d gtk ) xpm? ( !gtk )" +IUSE="Xaw3d +default-font gtk nls zippy" +REQUIRED_USE="?? ( Xaw3d gtk )" RESTRICT="test" #124112 RDEPEND=" @@ -21,6 +21,7 @@ RDEPEND=" gnome-base/librsvg:2 virtual/libintl x11-libs/cairo[X] + x11-libs/libXpm Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( !gtk? ( x11-libs/libXaw ) ) default-font? ( @@ -32,8 +33,7 @@ RDEPEND=" x11-libs/libXt x11-libs/libXmu ) - gtk? ( x11-libs/gtk+:2 ) - xpm? ( x11-libs/libXpm )" + gtk? ( x11-libs/gtk+:2 )" DEPEND="${RDEPEND} x11-proto/xproto virtual/pkgconfig @@ -44,7 +44,8 @@ src_prepare() { "${FILESDIR}"/${P}-paths.patch \ "${FILESDIR}"/${P}-gettext.patch \ "${FILESDIR}"/${P}-configure-switches.patch \ - "${FILESDIR}"/${P}-gnuchess-default.patch + "${FILESDIR}"/${P}-gnuchess-default.patch \ + "${FILESDIR}"/${P}-Xaw3d.patch eautoreconf } @@ -52,7 +53,6 @@ src_configure() { egamesconf \ --datadir=/usr/share \ $(use_enable nls) \ - $(use_enable xpm) \ $(use_enable zippy) \ --disable-update-mimedb \ $(use_with gtk) \ |