Fix compilation with glibc-2.8, thanks to Diego E. 'Flameeyes' Pettenò <flameeyes AT gentoo DOT org> for reporting; bug #247722

Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.27.1 x86_64

5 files changed, 50 insertions, 6 deletions

diff --git a/media-gfx/flphoto/ChangeLog b/media-gfx/flphoto/ChangeLog
index 4dd37e69dd7b..d73451f18d66 100644
--- a/media-gfx/flphoto/ChangeLog
+++ b/media-gfx/flphoto/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for media-gfx/flphoto
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/ChangeLog,v 1.12 2008/11/14 18:54:20 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/ChangeLog,v 1.13 2008/11/23 20:25:34 halcy0n Exp $
 
 26 Jul 2003; Jared Hudson <jhhudso@gentoo.org> : Fixed flphoto so that it only
   depends on a specific version of fltk, since the other versions cause
   compile errors.
 
+  23 Nov 2008; Mark Loeser <halcy0n@gentoo.org>
+  +files/flphoto-1.3.1-glibc28.patch, flphoto-1.2.ebuild,
+  flphoto-1.3.1.ebuild:
+  Fix compilation with glibc-2.8, thanks to Diego E. 'Flameeyes' Pettenò
+  <flameeyes AT gentoo DOT org> for reporting; bug #247722
+
   14 Nov 2008; Santiago M. Mola <coldwind@gentoo.org> flphoto-1.2.ebuild,
   flphoto-1.3.1.ebuild:
   Restrict fltk dependency to SLOT 1.1 (bug #246445).
diff --git a/media-gfx/flphoto/Manifest b/media-gfx/flphoto/Manifest
index 71c16c094378..1f340ec62ae5 100644
--- a/media-gfx/flphoto/Manifest
+++ b/media-gfx/flphoto/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX flphoto-1.3.1-glibc28.patch 394 RMD160 bfe4f8d82c2990b4ecc4be6138fd0b4206960956 SHA1 02c4640a56da12207c4adb97c45e41523fc336c3 SHA256 8452038decbd3a81c73e42e0cb07781de48a1268b92741c02eff8c298454172f
 DIST flphoto-1.2-source.tar.gz 526336 RMD160 7c0bca33ca51adb19e17c4c86b9bc335296b282e SHA1 d5203155e49d2cd5c2867ba57cc71d93ff2aa661 SHA256 9095bdd4ac1410f1ad7ae2e6c039f5f2e35f3fd1353e73eef1462f194c8e6fb7
 DIST flphoto-1.3.1-source.tar.gz 797714 RMD160 d8c99e6dbaa448f3590de3f961ba28a1cc3d706e SHA1 3486233c94a74d7f2ec9d325590c1d0191c91952 SHA256 c9e41fd45c584923bd749e6ff52ef39ceb3800f3122d8fd48904a980f6e2b9b3
-EBUILD flphoto-1.2.ebuild 686 RMD160 4a5b36f0d9bfede9acac08c358f556f505af0d7c SHA1 30321002676dd3c3108d826705cfb8301f2b3769 SHA256 b88281b932b0fb172b6a7a12f4878d75f492c3c01f06dbb1b68d06d808f087fa
-EBUILD flphoto-1.3.1.ebuild 725 RMD160 93126e485bd5e2abff5ac85677572d4adc982a2b SHA1 34a91b3561036d644b5927647d35d6ab87c0fd1b SHA256 795904bce1d59c9af6b4fb1297a84cac6de62535ae0b29c98004d21562c16c7f
-MISC ChangeLog 1527 RMD160 060d81674ab9f71658a5728648cf4a1f5aec1fd9 SHA1 e38530d43453aed82453aacbb7715bb6c6990ff3 SHA256 af068d0b3a4737d1342da423c1924ffe25912b5e4b0e0543e997b1026c04036a
+EBUILD flphoto-1.2.ebuild 793 RMD160 ab7f34ef6f4534df510b48289106d325311592fd SHA1 f97abe472c7b3c9ef35b03d2748c76c9e8c82141 SHA256 563d371e4de2f273d4f1ef217b6acfdc4e75603a430fa579fde40561acd3a171
+EBUILD flphoto-1.3.1.ebuild 832 RMD160 0935e6b0374f0125d89392184fefb87d69157e83 SHA1 569a639fc52a094d264074af1612e386c2777bfb SHA256 692b944b420482f9c38d007296abdfe1a43f716f9e0041caa1d51888c83d0dcb
+MISC ChangeLog 1790 RMD160 309750498da63bc05005b8444c05446442651cea SHA1 1f9e51f64ff84aea369fb7988445753d9d78cca4 SHA256 b27377c194e80a3426b8107e6b6dd6bc79b4337dd66f83f77e4f12f1ddc248c5
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkpvEgACgkQCRZPokWLroQmvwCeLMGyAZ/jyo1atzP21F54emUC
+n0AAniN+P6votPoNKnhtueUwrh+VpvPb
+=4W8l
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/flphoto/files/flphoto-1.3.1-glibc28.patch b/media-gfx/flphoto/files/flphoto-1.3.1-glibc28.patch
new file mode 100644
index 000000000000..e22c2dddb8ee
--- /dev/null
+++ b/media-gfx/flphoto/files/flphoto-1.3.1-glibc28.patch
@@ -0,0 +1,11 @@
+diff -ur flphoto-1.3.1-orig/camera.cxx flphoto-1.3.1/camera.cxx
+--- flphoto-1.3.1-orig/camera.cxx	2008-11-23 15:15:54.000000000 -0500
++++ flphoto-1.3.1/camera.cxx	2008-11-23 15:18:34.000000000 -0500
+@@ -42,6 +42,7 @@
+ #  define fl_mkdir(p)	mkdir(p)
+ #else
+ #  include <unistd.h>
++#  include <sys/stat.h>
+ #  define fl_mkdir(p)	mkdir(p, 0777)
+ #endif // WIN32 && !__CYGWIN__
+ #include <errno.h>
diff --git a/media-gfx/flphoto/flphoto-1.2.ebuild b/media-gfx/flphoto/flphoto-1.2.ebuild
index fd3a8549da74..5827fda07cec 100644
--- a/media-gfx/flphoto/flphoto-1.2.ebuild
+++ b/media-gfx/flphoto/flphoto-1.2.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.2.ebuild,v 1.7 2008/11/14 18:54:20 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.2.ebuild,v 1.8 2008/11/23 20:25:34 halcy0n Exp $
 
 EAPI=1
 
+inherit eutils
+
 DESCRIPTION="Basic image management and display program based on the FLTK toolkit"
 HOMEPAGE="http://www.easysw.com/~mike/flphoto/"
 SRC_URI="mirror://sourceforge/fltk/${P}-source.tar.gz"
@@ -17,6 +19,12 @@ DEPEND=">=x11-libs/fltk-1.1.4:1.1
 	cups? ( net-print/cups )
 	gphoto2? ( media-gfx/gphoto2 )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/flphoto-1.3.1-glibc28.patch
+}
+
 src_compile() {
 	econf || die
 	emake -j1 || die
diff --git a/media-gfx/flphoto/flphoto-1.3.1.ebuild b/media-gfx/flphoto/flphoto-1.3.1.ebuild
index bf9c84bb4590..99786625cc33 100644
--- a/media-gfx/flphoto/flphoto-1.3.1.ebuild
+++ b/media-gfx/flphoto/flphoto-1.3.1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.3.1.ebuild,v 1.2 2008/11/14 18:54:20 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.3.1.ebuild,v 1.3 2008/11/23 20:25:34 halcy0n Exp $
 
 EAPI=1
 
+inherit eutils
+
 DESCRIPTION="Basic image management and display program based on the FLTK toolkit"
 HOMEPAGE="http://www.easysw.com/~mike/flphoto/"
 SRC_URI="mirror://sourceforge/fltk/${P}-source.tar.gz"
@@ -17,6 +19,12 @@ DEPEND=">=x11-libs/fltk-1.1.4:1.1
 	cups? ( net-print/cups )
 	gphoto2? ( media-gfx/gphoto2 )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/flphoto-1.3.1-glibc28.patch
+}
+
 src_compile() {
 	econf --with-docdir=/usr/share/doc/${P} || die
 	emake -j1 || die