From d5794251bdcca6ab6b304be2a7f28280987ade31 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Tue, 9 Sep 2008 03:48:27 +0000 Subject: Fix ipager to actually build. Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc5-00283-g70bb089 x86_64 --- x11-misc/ipager/ChangeLog | 7 +++++- x11-misc/ipager/Manifest | 6 +++-- x11-misc/ipager/files/ipager-1.1.0-gcc43.patch | 29 ++++++++++++++++++++++ .../ipager/files/ipager-1.1.0-scons_flags.patch | 24 ++++++++++++++++++ x11-misc/ipager/ipager-1.1.0.ebuild | 28 ++++++++++++++++----- 5 files changed, 85 insertions(+), 9 deletions(-) create mode 100644 x11-misc/ipager/files/ipager-1.1.0-gcc43.patch create mode 100644 x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch (limited to 'x11-misc/ipager') diff --git a/x11-misc/ipager/ChangeLog b/x11-misc/ipager/ChangeLog index 240f2cb2d0c6..0570c97623d2 100644 --- a/x11-misc/ipager/ChangeLog +++ b/x11-misc/ipager/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/ipager # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/ipager/ChangeLog,v 1.1 2008/09/09 02:26:49 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/ipager/ChangeLog,v 1.2 2008/09/09 03:48:26 robbat2 Exp $ + + 09 Sep 2008; Robin H. Johnson + +files/ipager-1.1.0-gcc43.patch, +files/ipager-1.1.0-scons_flags.patch, + ipager-1.1.0.ebuild: + Fix ipager to actually build. *ipager-1.1.0 (09 Sep 2008) diff --git a/x11-misc/ipager/Manifest b/x11-misc/ipager/Manifest index 848bf5454478..906dce4afbd9 100644 --- a/x11-misc/ipager/Manifest +++ b/x11-misc/ipager/Manifest @@ -1,5 +1,7 @@ +AUX ipager-1.1.0-gcc43.patch 636 RMD160 c199f0d1da752c35438ef8fa74038b4bcc10f87d SHA1 d6c7e5193ab98de1b85b1157628e49504f3aacfb SHA256 ba64f42d71288c53b9b30cc3a52060c1dae8456c2d757a4525922e0264bddec5 +AUX ipager-1.1.0-scons_flags.patch 901 RMD160 3c4233160716beefbaf3aa9d26d56ac1ed84ee27 SHA1 3c36ffa70da5d47b5c23efe524f1b2253562f0c9 SHA256 24ad546814440348bca718987a04cd4387d26a8b7b65c3fa63af712c62566df6 AUX ipager-1.1.0-scons_imlib2.patch 663 RMD160 eec400effe98e398b8c8030a5fac8687bdeddf0c SHA1 f33e8a3e0d26b61504c0a3999eb9f2c3dd04c3c0 SHA256 b897845633e88514456565af26cd95667811acd84014776532a23a53d77b6b02 DIST ipager-1.1.0.tar.gz 30499 RMD160 677e13fd809824088922846e045890d7788a1dfd SHA1 21059aa9474db6787396bd10a566778ac9df2cf4 SHA256 d2ad9a3aeb376644a76f57d2b275182cb8af0b64bd6a66c1791da60652a81123 -EBUILD ipager-1.1.0.ebuild 907 RMD160 131ab419be8376f77ed54b313cefc461eec134a4 SHA1 f1ea88a634ed4d592a77567a93a7e34644dd811e SHA256 6d6a14cf4172564a7afabd05bdfa29d9865bd7b7fe7a7b310c5c514eebffa7de -MISC ChangeLog 448 RMD160 bbf58488815ffe172338e396ee359a07e3df1d50 SHA1 7b55c70dc854ef518849b4f1e587631f98fe6c64 SHA256 b7b0408c8d54a138ad2ef0eb756dad741659bf2edc0cdd6ad17a03ce9370721e +EBUILD ipager-1.1.0.ebuild 1231 RMD160 2e439a0995e916ce44d9fc95357507332b5cac33 SHA1 7aa3555113a26b64eb5f91ad84ca32a97c0cd804 SHA256 cbe28e273cebedef1ee7f7e2cc46dc1ded26e9a6fd51aad5f833662d437c9138 +MISC ChangeLog 634 RMD160 4401060b25e83aa1803da2d94af4974d991666af SHA1 69e2c9903990d8b26db437d4dfe7a5931327b0c9 SHA256 561125550f715a95969d5a4ac5f91cc4674be4b856bbca8a5d89d7218de55bf2 MISC metadata.xml 359 RMD160 2d4470b49396add0aeac63605516e4eaa20d5ddf SHA1 f6e67f2b20aaf5473b4d96c3da562a65d1f4f030 SHA256 cf46f4b34eef0c0fe33ab0cd4b40c867c7b2abcf6f12ef229ad860857bc901f3 diff --git a/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch b/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch new file mode 100644 index 000000000000..e4fe301a7b89 --- /dev/null +++ b/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch @@ -0,0 +1,29 @@ +Fix ipager to compile with GCC 4.3. + +Patch taken from Gentoo bug #173562. + +X-Gentoo-Bug: 173562 +Signed-off-by: Robin H. Johnson + +--- iconfig.old 2008-08-22 21:35:16.000000000 +0600 ++++ iconfig.cpp 2008-08-22 21:35:20.000000000 +0600 +@@ -30,7 +30,7 @@ + #include + #include + #include +- ++#include + #include + #include + +--- wm.old 2008-08-22 21:52:36.000000000 +0600 ++++ wm.cpp 2008-08-22 21:52:40.000000000 +0600 +@@ -27,7 +27,7 @@ + + #include + #include "atoms.h" +- ++#include + + WM * WM::m_instance = 0; + bool WM::x_error = false; diff --git a/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch b/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch new file mode 100644 index 000000000000..6eb8b1ff4f53 --- /dev/null +++ b/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch @@ -0,0 +1,24 @@ +Make sure Scons takes the CFLAGS/CXXFLAGS/LDFLAGS etc for the system. + +Signed-off-by: Robin H. Johnson + +diff -Nuar ipager-1.1.0.orig/SConstruct ipager-1.1.0/SConstruct +--- ipager-1.1.0.orig/SConstruct 2008-09-08 20:32:23.007016555 -0700 ++++ ipager-1.1.0/SConstruct 2008-09-08 20:32:05.103267940 -0700 +@@ -30,6 +30,16 @@ + # environment + ipager_env = Environment(options = ipager_options, ENV = os.environ) + ++# process env variables ++for K in ['CPPFLAGS', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CC', 'CXX']: ++ if K in os.environ.keys(): ++ dict = ipager_env.ParseFlags(os.environ[K]) ++ # These headers are supposed static. Don't check at each build. ++ for i in dict['CPPPATH']: ++ dict['CCFLAGS'].append('-I' + i) ++ dict['CPPPATH'] = [] ++ ipager_env.MergeFlags(dict) ++ + ipager_env.Append( + CPPFLAGS = [ '-Wall' ], + CPPPATH = [ '/usr/X11R6/include' ], diff --git a/x11-misc/ipager/ipager-1.1.0.ebuild b/x11-misc/ipager/ipager-1.1.0.ebuild index f45f6c4d8e68..10c5a1a7e91f 100644 --- a/x11-misc/ipager/ipager-1.1.0.ebuild +++ b/x11-misc/ipager/ipager-1.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/ipager/ipager-1.1.0.ebuild,v 1.1 2008/09/09 02:26:49 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/ipager/ipager-1.1.0.ebuild,v 1.2 2008/09/09 03:48:26 robbat2 Exp $ inherit eutils @@ -14,22 +14,38 @@ KEYWORDS="~x86 ~amd64" IUSE="xinerama" RDEPEND="media-libs/imlib2 - xinerama? ( x11-libs/libXinerama )" + x11-libs/libXmu + xinerama? ( x11-libs/libXinerama )" DEPEND="dev-util/scons ${RDEPEND}" src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${P}-scons_imlib2.patch" + epatch "${FILESDIR}"/${P}-scons_imlib2.patch + epatch "${FILESDIR}"/${P}-gcc43.patch + epatch "${FILESDIR}"/${P}-scons_flags.patch } src_compile() { CONFIG_OPTS="xinerama=false" - use xinerama && CONFIG_OPTS="xinerama=true" - scons PREFIX="/usr" ${CONFIG_OPTS} || die "scons build failed" + use xinerama && CONFIG_OPTS="${CONFIG_OPTS} xinerama=true" + # FYI: Passing debug=true only adds -ggdb inside the SConstruct + + scons \ + --cache-disable \ + PREFIX="/usr" \ + ${CONFIG_OPTS} \ + || die "scons configure failed" } src_install() { - scons DESTDIR="${D}" install || die "scons install failed" + scons \ + --cache-disable \ + PREFIX="/usr" \ + DESTDIR="${D}" \ + install \ + || die "scons install failed" + dodoc ToDo ChangeLog README + dodoc themes/*.conf } -- cgit v1.2.3-65-gdbad