Fix tests (bug #379745) and underlinking issue (bug #370107).

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

5 files changed, 52 insertions, 14 deletions

diff --git a/media-gfx/photoprint/ChangeLog b/media-gfx/photoprint/ChangeLog
index 001419eb167b..a828f5db4153 100644
--- a/media-gfx/photoprint/ChangeLog
+++ b/media-gfx/photoprint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/photoprint
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/photoprint/ChangeLog,v 1.1 2011/02/28 07:07:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/photoprint/ChangeLog,v 1.2 2011/08/30 22:08:17 radhermit Exp $
+
+  30 Aug 2011; Tim Harder <radhermit@gentoo.org> photoprint-0.4.2_pre2.ebuild,
+  +files/photoprint-0.4.2_pre2-tests.patch,
+  +files/photoprint-0.4.2_pre2-underlinking.patch:
+  Fix tests (bug #379745) and underlinking issue (bug #370107).
 
 *photoprint-0.4.2_pre2 (28 Feb 2011)
 
diff --git a/media-gfx/photoprint/Manifest b/media-gfx/photoprint/Manifest
index c214bf301ca2..b2d16704bb21 100644
--- a/media-gfx/photoprint/Manifest
+++ b/media-gfx/photoprint/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX photoprint-0.4.2_pre2-cups-automagic.patch 402 RMD160 931fb023421220fe6a09cdf0edf07da3a34cac72 SHA1 075dd9398d6f5a9c5f7feade3e062dc19af816ae SHA256 004c93e33537a0a72aafd715fc64ce202b8a3f02b7b653959dd2c9ff2434f9a3
+AUX photoprint-0.4.2_pre2-tests.patch 182 RMD160 74d35b0e2229aeb685dea4af9bf7ef4f23a887d0 SHA1 3792698a48cdc43f1e73f8565ae8d9b7407b2143 SHA256 65ef4fc176db4bd3ef64a7086a54e3108b795225493096eb51b5a1899cd3fa21
+AUX photoprint-0.4.2_pre2-underlinking.patch 879 RMD160 ad0f5e1447dac5f64b16cb2e7e426181dd57f6de SHA1 aad6ebb093c60be689acefb2162a40c8e077e621 SHA256 39bb76f4b216f798008ccc1379592f72befe7f1da96506de984f4492cef061b2
 DIST photoprint-0.4.2-pre2.tar.gz 2002424 RMD160 a70c5ada6843cab494da82b68c1e0fdfcc4823b3 SHA1 9dbda510b399b9205de80e1273257fa36d0497e3 SHA256 d7fdaac4928083c499164ca676fe08eac5d9f4c8763309af03b6a2a3c53dab7d
-EBUILD photoprint-0.4.2_pre2.ebuild 1122 RMD160 27a20236ef95c1446b52c53d0bbf203d909b2e4e SHA1 3a0f444dcd10b4c4b3807b4d4053baa5e2bf5288 SHA256 dbc4309cf0b4f85c4434750584253a11abffe90403f964dcfce271f6ed9e2a3a
-MISC ChangeLog 449 RMD160 8ea9c6316e13990a75e1ba41e706584dd8e6369e SHA1 b2b26b1472a567f199dec2a501c017a931138153 SHA256 259b5e92a78d24dd66de622b9ce210c5d4ad8f5de587fc601ba3267171aa7f36
+EBUILD photoprint-0.4.2_pre2.ebuild 1199 RMD160 ba90ef74de0fc9131025f02fdfdc953b410accbb SHA1 a4ef3dca91378193b7a2de4ea863aaf2f5210edd SHA256 fd90c576f72bfc44d9119a102f445a2106cfc174dd1100ecc45002bd2832e919
+MISC ChangeLog 688 RMD160 55b14f4d261c928917f9b9a630381c04906d453d SHA1 3e72ffd9783f626f35e93ca6ef6e5caefb0722bd SHA256 af7ac65931e56ba9b03976f6d1122a7fa7fee5faa918a3504e00458b3c44c31b
 MISC metadata.xml 255 RMD160 a880a2d72fc5e1ebff7ca2f6fe1d896425e90b7b SHA1 a127da6c4f1aa34c7765f76027feede649d4f99b SHA256 c4740a15be5c532f468b21b12d8ee5d05b81f2398616fd7ae4b264cea59bc817
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNa0m8AAoJEEqz6FtPBkyjJf4H/1wa/1zbR5IrB9tVmKFGimyl
-NPE2JCxqrF5o9kvuXmG9k8LSJc1uHiawmLuPfuCzUTKHuBJ0u08ohXI9cg4Idpvi
-O9/7sz1guclPiLH5pEuE9GQakWL9j7NOXX+5jBEjAbzwggh5x0Jusn2ReOwuSJ5z
-R8ixKxHFCBS/+58l+SWujubEVTHtR15cJG4XX7SrUpRHJwD1tTLJn/Vw1JIX4q5h
-w9ZoJGeq+JEhIoomNRcDvItSpmBTlBP21Dejj7ZlU79dA4pnI8VdqFLXiGV3AjHS
-FemkHL9gAJZ8pLxttx+RfGijMc0dWH4cOoZeW+3M6jj2r162Zxr6MpnzZC5XsSQ=
-=xU4G
+iQEcBAEBCgAGBQJOXV9WAAoJEEqz6FtPBkyjTowH/juP1N/dbBurt6mx2u7cSphV
+vArFNvdXxdn63M0thSf8cHLJ0Fxm43tVy1y5U6+Xq+CcD1O7DHhV32NUTqEJUvfA
+ForwWWvELXygXoZkKRi0e+U8r+dkf6yfXXW76RmdJi3LJ4kp6qgU4nLjcHwR29hD
+r5NUqcu+5xgve9FB+otccMWdLkvcNLNY/tM+jqb978gVW52qIYKY7cXvFVyGdqIJ
+KAzyZNKjIrY1+4MtoVvC9rDCzrYrsIgZ8uIILz7D4JNvbKjji52EY7S8JSntllTP
+3QQ2sLYxX9+SMyg6uq0bBaV53xA6pL0ztoQfG2S4aUmznWWCF5iluKsh2c1p4Jc=
+=vt5c
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/photoprint/files/photoprint-0.4.2_pre2-tests.patch b/media-gfx/photoprint/files/photoprint-0.4.2_pre2-tests.patch
new file mode 100644
index 000000000000..e9c604d1492a
--- /dev/null
+++ b/media-gfx/photoprint/files/photoprint-0.4.2_pre2-tests.patch
@@ -0,0 +1,8 @@
+--- photoprint-0.4.2-pre2.orig/menucheck.cpp
++++ photoprint-0.4.2-pre2/menucheck.cpp
+@@ -1,4 +1,5 @@
+ #include <iostream>
++#include <cstring>
+ 
+ #include <gutenprint/gutenprint.h>
+ 
diff --git a/media-gfx/photoprint/files/photoprint-0.4.2_pre2-underlinking.patch b/media-gfx/photoprint/files/photoprint-0.4.2_pre2-underlinking.patch
new file mode 100644
index 000000000000..0a77ccdb02e1
--- /dev/null
+++ b/media-gfx/photoprint/files/photoprint-0.4.2_pre2-underlinking.patch
@@ -0,0 +1,21 @@
+--- photoprint-0.4.2-pre2.orig/configure.ac
++++ photoprint-0.4.2-pre2/configure.ac
+@@ -30,6 +30,7 @@
+ PKG_CHECK_MODULES([GDKPIXBUF2], [gdk-pixbuf-2.0])
+ PKG_CHECK_MODULES([GP], [gutenprint])
+ PKG_CHECK_MODULES([LCMS], [lcms])
++PKG_CHECK_MODULES([X11], [x11])
+ AC_CHECK_LIB(m,pow, LIBM_LIBS="-lm")
+ AC_SUBST([LIBM_LIBS])
+ AC_CHECK_LIB([pnm], [pnm_readpaminit],,,[-lm])
+--- photoprint-0.4.2-pre2.orig/Makefile.am
++++ photoprint-0.4.2-pre2/Makefile.am
+@@ -97,7 +97,7 @@
+ 	stp_support/libstp_support.la \
+ 	pixbufthumbnail/libpixbufthumbnail.la	\
+ 	splashscreen/libsplashscreen.la	\
+-	$(LIBINTL) $(LIBM_LIBS) $(GETOPT_LIBS) $(JPEG_LIBS) $(PNM_LIBS) $(TIFF_LIBS) $(LCMS_LIBS) $(GP_LIBS) $(GTK2_LIBS)
++	$(LIBINTL) $(LIBM_LIBS) $(GETOPT_LIBS) $(JPEG_LIBS) $(PNM_LIBS) $(TIFF_LIBS) $(LCMS_LIBS) $(GP_LIBS) $(GTK2_LIBS) $(X11_LIBS)
+ 
+ check_PROGRAMS = menucheck carouselcheck misccheck
+ 
diff --git a/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild b/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild
index f4eae9b3cec4..887240a8d3c4 100644
--- a/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild
+++ b/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild,v 1.1 2011/02/28 07:07:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild,v 1.2 2011/08/30 22:08:17 radhermit Exp $
 
 EAPI=4
 
@@ -33,7 +33,9 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cups-automagic.patch
+	epatch "${FILESDIR}"/${P}-cups-automagic.patch \
+		"${FILESDIR}"/${P}-tests.patch \
+		"${FILESDIR}"/${P}-underlinking.patch
 
 	# Ships with po/Makefile.in.in from gettext-0.17
 	# which fails with >=gettext-0.18