diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2011-08-30 22:08:17 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2011-08-30 22:08:17 +0000 |
| commit | 47e6866b121ff47731f3701d41f5179f529cdd64 (patch) | |
| tree | 5c6d18d9d003e1bdd56d3e772f5a9fb00f770517 /media-gfx | |
| parent | Version bump (bug #375959). Add myself as a maintainer. (diff) | |
| download | gentoo-2-47e6866b121ff47731f3701d41f5179f529cdd64.tar.gz gentoo-2-47e6866b121ff47731f3701d41f5179f529cdd64.tar.bz2 gentoo-2-47e6866b121ff47731f3701d41f5179f529cdd64.zip | |
Fix tests (bug #379745) and underlinking issue (bug #370107).
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
4 files changed, 39 insertions, 3 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/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 |