diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2010-10-02 18:40:09 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2010-10-02 18:40:09 +0000 |
| commit | 30c4dcfdaa04bf7714d7efabbc4fea70e8daa864 (patch) | |
| tree | 201ef0b17fee167608762cf2d4338baf35dc3d9f /media-libs/libgphoto2 | |
| parent | Updated LDFLAGS and EAPI for QA bug 336736. (diff) | |
| download | gentoo-2-30c4dcfdaa04bf7714d7efabbc4fea70e8daa864.tar.gz gentoo-2-30c4dcfdaa04bf7714d7efabbc4fea70e8daa864.tar.bz2 gentoo-2-30c4dcfdaa04bf7714d7efabbc4fea70e8daa864.zip | |
Re-add no-test-build patch and remove the one intended in the first place, bug #339488.
(Portage version: 2.2_rc88/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libgphoto2')
| -rw-r--r-- | media-libs/libgphoto2/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/libgphoto2/files/libgphoto2-2.4.7-extra-dist.patch | 12 | ||||
| -rw-r--r-- | media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch | 34 |
3 files changed, 41 insertions, 13 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index 7ce2c619a3de..e76e5acfc21c 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/libgphoto2 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.173 2010/10/02 14:16:28 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.174 2010/10/02 18:40:09 eva Exp $ + + 02 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org> + -files/libgphoto2-2.4.7-extra-dist.patch, + +files/libgphoto2-2.4.7-no-test-build.patch: + Re-add no-test-build patch and remove the one intended in the first place, + bug #339488. 02 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org> libgphoto2-2.4.6.ebuild, -libgphoto2-2.4.7-r2.ebuild, diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.7-extra-dist.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.7-extra-dist.patch deleted file mode 100644 index 7407630ea864..000000000000 --- a/media-libs/libgphoto2/files/libgphoto2-2.4.7-extra-dist.patch +++ /dev/null @@ -1,12 +0,0 @@ -# Fix re-definition of EXTRA_DIST ---- a/libgphoto2_port/usb/Makefile.am 2010-01-07 00:25:35.000000000 +0100 -+++ b/libgphoto2_port/usb/Makefile.am 2010-01-07 00:25:28.000000000 +0100 -@@ -8,7 +8,7 @@ - check_mtp_device_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBUSB_CFLAGS) - check_mtp_device_LDADD = $(LIBUSB_LIBS) - else --EXTRA_DIST = check-mtp-device.c -+EXTRA_DIST += check-mtp-device.c - endif - - usb_la_LDFLAGS = -module -no-undefined -avoid-version \ diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch new file mode 100644 index 000000000000..9fcabd9e8b0a --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch @@ -0,0 +1,34 @@ +# Do not build tests if not running make check +# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=226241 +--- a/libgphoto2_port/test/Makefile.am 2010-01-07 01:04:40.000000000 +0100 ++++ b/libgphoto2_port/test/Makefile.am 2010-01-07 01:04:57.000000000 +0100 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = test-gp-port ++check_PROGRAMS = test-gp-port + + test_gp_port_CPPFLAGS = \ + $(AM_CPPFLAGS) $(CPPFLAGS) \ +--- a/tests/Makefile.am 2010-01-07 00:56:14.000000000 +0100 ++++ b/tests/Makefile.am 2010-01-07 00:56:40.000000000 +0100 +@@ -2,7 +2,9 @@ + + check_PROGRAMS = \ + test-camera-list \ +- test-pedantic-c ++ test-pedantic-c \ ++ test-gphoto2 \ ++ test-filesys + + if HAVE_CXX + check_PROGRAMS += test-pedantic-cxx +@@ -22,10 +24,6 @@ + + CLEANFILES = $(check_SCRIPTS) + +-noinst_PROGRAMS = \ +- test-gphoto2 \ +- test-filesys +- + test_gphoto2_SOURCE = test-gphoto2.c + test_gphoto2_LDADD = \ + $(top_builddir)/libgphoto2/libgphoto2.la \ |