add patch to build against newer glibc from Dennis 'dlan' Lan (bug #403051)

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64

4 files changed, 56 insertions, 9 deletions

diff --git a/media-gfx/gqview/ChangeLog b/media-gfx/gqview/ChangeLog
index c560b3041794..bd99fb48d457 100644
--- a/media-gfx/gqview/ChangeLog
+++ b/media-gfx/gqview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gqview
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gqview/ChangeLog,v 1.100 2012/07/26 18:41:29 blueness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gqview/ChangeLog,v 1.101 2013/09/06 17:40:43 mr_bones_ Exp $
+
+  06 Sep 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/gqview-2.1.5-glibc.patch, gqview-2.1.5.ebuild:
+  add patch to build against newer glibc from  Dennis 'dlan' Lan (bug #403051)
 
   26 Jul 2012; Anthony G. Basile <blueness@gentoo.org> gqview-2.1.5.ebuild:
   Keyword ~arm
diff --git a/media-gfx/gqview/Manifest b/media-gfx/gqview/Manifest
index 6a50f9430c7f..22948083ebfc 100644
--- a/media-gfx/gqview/Manifest
+++ b/media-gfx/gqview/Manifest
@@ -1,5 +1,6 @@
+AUX gqview-2.1.5-glibc.patch 1113 SHA256 f811ab6c389fa614ea7a6e23950fb2301724a1b33116b51d7c61ca0802b28a44 SHA512 c2605aa15c6515fab27e494cc05fd41196bd36ce696831d10b078680836546e8cd1252837712cecc10d6dc2635819babb37b85820b12cc9bf060796d3bc63c67 WHIRLPOOL c1de1852424478623f50b5145f58d6626ac86c8e5fdee6a0d4e02a468b1e033da88ede7eaf7af4ba8ce0d73a59fd3258bf874e57f8243eccecab0f37654d1da8
 AUX gqview-2.1.5-windows.patch 561 SHA256 d464db032e62fb7d356a215bf5912bf89d6e710136c2a64807640de14943cd2f SHA512 f4382d81362efca9decd18f93ffcabc5eeb36251b67377d35a6de87eb0672b24e15d82610b64865415fa23f6e26090c557b7f1df8092cf34b38f7106dd7a33c3 WHIRLPOOL 5a44d9804d43efe8d4a1c09e21529d15ad02b48e6d5c8ad10703e44b7db3f4e6f47d0578f122dea2b803196bfcfb82865171ff3811580764d6c1aa811b6e50f7
-DIST gqview-2.1.5.tar.gz 1685061 RMD160 c671779b2094b854a24dcfcde04754ead9cf1f4b SHA1 42fbbe4bcd8ad87a1b976cc8a4433750cac7b116 SHA256 12fea494e607a69eff31cdca13d306ef1b0b3b7850be0f8b236f267d8f2e9546
-EBUILD gqview-2.1.5.ebuild 1088 SHA256 d41aeb001e103531375e7895fcdd8f7b3e7a9e3d2ff916f9f4352b09c054055b SHA512 5849956316b4d3af4e1c8561f4caa8c8e05c9b166e6f16076a675c04a91fda8581440984900ae21fc60d57a1524ad51450316baabb9663f14de42e0bcadd1e1f WHIRLPOOL dee51c8e50b0f8c25517e7dbde8731039b79da200e1622de1de79e3b756cbdb2f9a51f5a0daf0407733413fe2096753ee01e08f8fe88a72093c2a9220354a721
-MISC ChangeLog 13046 SHA256 e36b512da7f95366f6d20cb0a70682695706c97621257116d15bbeaa9d210e28 SHA512 1c5fe6681672848af34e56c5267021df4ca35f82b30d2eb3731df928de5d5346344051d1022d22546606661fa714323809cb8d49228733c4f1f08b2f974f3e1c WHIRLPOOL 4bc41be8399b1bbdf5d16a15efac52bb97dc831242b5773bfed864d88d55884c463ef61926e99954e88d5b4e95bcac6ee531e82d5b9bd1e80477f9597277d3ca
+DIST gqview-2.1.5.tar.gz 1685061 SHA256 12fea494e607a69eff31cdca13d306ef1b0b3b7850be0f8b236f267d8f2e9546 SHA512 a9e184f9bfbcb789fa732f490b5b1883aaa4c153fb924e2995f36ddef2d170ad9d0695689221d7a0ccae587f5de07b34ca03fa407f774ed3505d0183bf44b555 WHIRLPOOL 04c0adab83e6a0114dd7d73c1dc6705122dfd44d5851532c59ac9c3b1a231d4110069978ba85a6f98c8675cac59c72b0304667b4e967daef4d4e9a9475d07083
+EBUILD gqview-2.1.5.ebuild 1151 SHA256 551963fd755c668c8dbfdbdf3a50c4ab248d352ebd12c0d02184e30ed307041e SHA512 20ce00aa3274aeed579e9daa8ab8b5f617c71be64f247a3cd54976f2f48e6c2c5e023a266b07afae410c361c44ca4c0c3acc48acd5954a1bc3df0536797ec238 WHIRLPOOL e668b16810c20746dcaada63c247fe73a8e8e8c6362d3cb4dad1ec2c28682c09aa2a19283303eb5516007d13064f1efb84a6b1cffb3d2a5c5e456d9fee5e821f
+MISC ChangeLog 13238 SHA256 6d4e00303139f05ddc32fa616fe1faf76030d8774463e94a7df5f978897f197f SHA512 cd0e244377a168485e6a542bf91369d80e0d01306b3ef237f906b72c4c8c9550a29512f15354212b2f106d24a6244421c252d2b1427c7b6ab99b30bb17adb2a1 WHIRLPOOL eb29a4e0ca841e6713642f4b2dd57b38f69669d598345421e809086c66dca1734c7b312ab1e121ba6e0156c828a696b6c45adfb688922df6494325d576bb8314
 MISC metadata.xml 254 SHA256 1c5d86246e75b0a4d026bfe1c8fd08231dfd7c0c2397e4b196b6a1941a046a13 SHA512 2e90614c1b25a65b0605f30561086f6f49f79693308f3299076f7bd3ca329fa4c57ad88327533ebe125b5ef23564c5469fc594aaf6b0da78dc55e899876fed48 WHIRLPOOL 942eca722cf346f97998f779af0c5b092b89b2c9d70839308914f38b7c3eac68bc612137205b69b96c1fef9cb435acce598d2fa28a7d33b288bdb4d7c4b059b2
diff --git a/media-gfx/gqview/files/gqview-2.1.5-glibc.patch b/media-gfx/gqview/files/gqview-2.1.5-glibc.patch
new file mode 100644
index 000000000000..957080737040
--- /dev/null
+++ b/media-gfx/gqview/files/gqview-2.1.5-glibc.patch
@@ -0,0 +1,39 @@
+diff --git a/Makefile.in b/Makefile.in
+index 38f6b25..4d7ad2c 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -123,6 +123,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+ LCMS_LIBS = @LCMS_LIBS@
++LIBM = @LIBM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+diff --git a/configure.in b/configure.in
+index 9335493..2299b4a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -52,6 +52,9 @@ fi
+ AC_SUBST(LCMS_LIBS)
+ AM_CONDITIONAL(HAVE_LCMS, test "$have_lcms" = "yes")
+ 
++AC_CHECK_LIB(m, ceil, LIBM="-lm")
++AC_SUBST(LIBM)
++
+ ALL_LINGUAS="ar be bg ca cs da de eo es et eu fi fr hu id it ja ko nl no pl pt_BR ro ru sk sl sv th tr uk vi zh_CN.GB2312 zh_TW"
+ GETTEXT_PACKAGE=$PACKAGE
+ AC_SUBST(GETTEXT_PACKAGE)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7ce4702..5005877 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -166,7 +166,7 @@ gqview_SOURCES = \
+ 	view_file_icon.c	\
+ 	view_file_icon.h
+ 
+-gqview_LDADD = $(GTK_LIBS) $(INTLLIBS) $(LCMS_LIBS)
++gqview_LDADD = $(GTK_LIBS) $(INTLLIBS) $(LCMS_LIBS) $(LIBM)
+ 
+ EXTRA_DIST = \
+ 	$(extra_SLIK)
diff --git a/media-gfx/gqview/gqview-2.1.5.ebuild b/media-gfx/gqview/gqview-2.1.5.ebuild
index 7c214c7a3f10..fec04a6b6cce 100644
--- a/media-gfx/gqview/gqview-2.1.5.ebuild
+++ b/media-gfx/gqview/gqview-2.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gqview/gqview-2.1.5.ebuild,v 1.16 2012/07/26 18:41:29 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gqview/gqview-2.1.5.ebuild,v 1.17 2013/09/06 17:40:43 mr_bones_ Exp $
 
 EAPI=2
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="A GTK-based image browser"
 HOMEPAGE="http://gqview.sourceforge.net/"
@@ -22,13 +22,16 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-windows.patch"
+	epatch \
+		"${FILESDIR}/${P}-windows.patch" \
+		"${FILESDIR}/${P}-glibc.patch"
 	sed -i \
 		-e '/^Encoding/d' \
 		-e '/^Icon/s/\.png//' \
 		-e '/^Categories/s/Application;//' \
 		gqview.desktop \
 		|| die
+	eautoreconf
 }
 
 src_configure() {