diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2008-12-27 12:55:39 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2008-12-27 12:55:39 +0000 |
commit | 5ab7d5587409454522e33d25adf74c89c3e6808b (patch) | |
tree | c4485e385679f23fbe6995bd3ddaeb23fef77306 /media-gfx | |
parent | Version bump, #228803 (diff) | |
download | historical-5ab7d5587409454522e33d25adf74c89c3e6808b.tar.gz historical-5ab7d5587409454522e33d25adf74c89c3e6808b.tar.bz2 historical-5ab7d5587409454522e33d25adf74c89c3e6808b.zip |
Fix failure with --as-needed and tests, bug #247729.
Package-Manager: portage-2.2_rc18/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/gpp/ChangeLog | 6 | ||||
-rw-r--r-- | media-gfx/gpp/Manifest | 17 | ||||
-rw-r--r-- | media-gfx/gpp/files/gpp-0.7.0-as-needed.patch | 107 | ||||
-rw-r--r-- | media-gfx/gpp/gpp-0.6.5.ebuild | 26 | ||||
-rw-r--r-- | media-gfx/gpp/gpp-0.7.0.ebuild | 20 |
5 files changed, 141 insertions, 35 deletions
diff --git a/media-gfx/gpp/ChangeLog b/media-gfx/gpp/ChangeLog index 544a92dfef85..5f0d5c204e5f 100644 --- a/media-gfx/gpp/ChangeLog +++ b/media-gfx/gpp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/gpp # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gpp/ChangeLog,v 1.14 2008/11/04 01:46:45 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gpp/ChangeLog,v 1.15 2008/12/27 12:55:39 eva Exp $ + + 27 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org> + +files/gpp-0.7.0-as-needed.patch, -gpp-0.6.5.ebuild, gpp-0.7.0.ebuild: + Fix failure with --as-needed and tests, bug #247729. 04 Nov 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> metadata.xml: diff --git a/media-gfx/gpp/Manifest b/media-gfx/gpp/Manifest index ddcf715bac01..00b0726ee635 100644 --- a/media-gfx/gpp/Manifest +++ b/media-gfx/gpp/Manifest @@ -1,6 +1,15 @@ -DIST gpp-0.6.5.tar.gz 148478 RMD160 4d99bd2ee3adf737ad9a78b94fce68abd5053d72 SHA1 19ebc3bfe4e93001d80c4265e6d204bdfe62a95f SHA256 736200b2dff7137e6c69a85b853ed349c40bbc41ac2ca5eee7ecd7062e6d6180 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX gpp-0.7.0-as-needed.patch 2903 RMD160 6e2876203c8edacda87a59e295078a0b9a9f62d9 SHA1 59841b05574f2f8697f3480631f4e17e5f05c458 SHA256 402bffdcc8ddebb68ea8a08a855cecd5829e968af87c83b325ae0844a8d28e87 DIST gpp-0.7.0.tar.gz 332256 RMD160 7a96e9b5cd05f2c6ce8017888aa2751934283a80 SHA1 e79ee69c7fb3961f1c8fb28e00f88f4d4ecedb97 SHA256 0176e1adf21a2ef18a1c96b2c71b4ff3a0f34a73fbbb2380a1f3fedd5cdd175b -EBUILD gpp-0.6.5.ebuild 688 RMD160 6263dd6739d3a09e7f6d588e063a9d41d2a1fcda SHA1 03195f9f473cbb743f7fdea3145fe7b0bdab81e5 SHA256 974f809dc5cce7026dd05129c8c00c3678aa1e83a26bde725c678397d1e14d24 -EBUILD gpp-0.7.0.ebuild 717 RMD160 b43ab36ffe0c2c7c308f58296d2f8e2854520b56 SHA1 cab986c996477c526380351ab91a5245f611fa69 SHA256 1e6f10cf9f300c121d3fb0d78786cd5d0957cb5d7f4d4a5585217b153fadf9b2 -MISC ChangeLog 1993 RMD160 6d5b7c6460664a2b42cdff36750936f83c038153 SHA1 fa85a83282bf35b5d54759faab6f7d555d7dd5b8 SHA256 b7f9e30627098d3893461b11edb4e2771271baeb509a9bd3b158a73e27aaa2ce +EBUILD gpp-0.7.0.ebuild 951 RMD160 a129b7fa8fe2232d33fbf0f77f8b9b8f13d7ca26 SHA1 0c60a70060f9d191393c621a2ccaa08d626802ee SHA256 99e13c29cee59172a74b3c520230531edf0259e90ceb98e8cdbade43e08972ce +MISC ChangeLog 2168 RMD160 a36e20a971ba86d33bbf9f6b7b01bb5776c1d350 SHA1 9974f25b7803f364aaa164a824ad9bda064bfd9c SHA256 94b512502561bf8a208533dbcceaaeb547963cf5e4a7e5fbe2534be78608f532 MISC metadata.xml 457 RMD160 1e65e4598c32ed344cb25a88cc5a45066dc3f0ce SHA1 3fa602ef320ffc4edc6bf5f731ba6fb2f3238664 SHA256 fa9eedc905a444923666604701be28c377e669de7e45e2cb01cfe3dba31cc11e +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAklWJdAACgkQ1fmVwcYIWAbRxACfdV1AhsOhhATONaehyMnoxV3W +x5AAn16FVNzKpvNYEXKfUoG6s6dn8zt8 +=9q7Y +-----END PGP SIGNATURE----- diff --git a/media-gfx/gpp/files/gpp-0.7.0-as-needed.patch b/media-gfx/gpp/files/gpp-0.7.0-as-needed.patch new file mode 100644 index 000000000000..ae001ce5517a --- /dev/null +++ b/media-gfx/gpp/files/gpp-0.7.0-as-needed.patch @@ -0,0 +1,107 @@ +--- + configure.ac | 51 ++++++++++++--------------------------------------- + po/POTFILES.in | 2 +- + src/Makefile.am | 5 +++-- + 3 files changed, 16 insertions(+), 42 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -4,7 +4,7 @@ + dnl (Process this file with autoconf to produce a configure script.) + AC_REVISION($Revision: 1.1 $)dnl + +-AC_INIT(gnome-photo-printer,0.7.0,sv@fogman.de,gpp) ++AC_INIT(gnome-photo-printer, 0.7.0, sv@fogman.de, gpp) + AC_PREREQ(2.57) + AC_CONFIG_SRCDIR(src/gpp.c) + AM_CONFIG_HEADER(config.h) +@@ -16,52 +16,25 @@ + + IT_PROG_INTLTOOL([0.35.0]) + +-AC_PATH_PROG(PKGCONFIG, pkg-config, no) +-if test "$PKGCONFIG" = no ; then +- AC_MSG_ERROR(pkg-config was not found. Please install version 0.6.0 or newer from http://www.freedesktop.org/software.) +-fi ++PKG_PROG_PKG_CONFIG([0.16.0]) + +-AC_MSG_CHECKING(for pkg-config >= 0.6.0) +-vers=`$PKGCONFIG --version | awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 1000 + $3}'` +-if test "$vers" -ge 6000; then +- AC_MSG_RESULT(found) +-else +- AC_MSG_ERROR(You need at least pkg-config 0.6.0 or greater for this version of gnome-photo-printer. Please install a newer version from http://www.freedesktop.org/software.) +-fi ++PKG_CHECK_MODULES(GNOME, [ ++ libgnomeui-2.0 ++ libglade-2.0 ++ libgnomeprint-2.2 ++ libgnomeprintui-2.2 ++ gnome-vfs-module-2.0 ++ gmodule-2.0 ++]) + +-gnome_modules="\ +- libgnomeui-2.0 \ +- libglade-2.0 \ +- libgnomeprint-2.2 \ +- libgnomeprintui-2.2 \ +- gnome-vfs-module-2.0 \ +- gmodule-2.0 \ +-" +- +-for module in $gnome_modules +-do +- AC_MSG_CHECKING(for $module) +- if $PKGCONFIG --exists $module; then +- AC_MSG_RESULT(found) +- else +- AC_MSG_ERROR(You need to have $module installed to compile & run this software.) +- fi +-done +- +-EXTRA_GNOME_CFLAGS=`pkg-config --cflags $gnome_modules` +-EXTRA_GNOME_LIBS=`pkg-config --libs $gnome_modules` +- +-CFLAGS="$CFLAGS $EXTRA_GNOME_CFLAGS -g -O0 -Wall" +-LDFLAGS="$LDFLAGS $EXTRA_GNOME_LIBS" ++AC_SUBST(GNOME_CFLAGS) ++AC_SUBST(GNOME_LIBS) + + dnl These should be $pkgdatadir & pkglibdir, but that would make the + dnl last part 'gpp' rather thann 'gnome-photo-printer' + GPP_DATADIR=$datadir/gnome-photo-printer + GPP_LIBDIR=$libdir/gnome-photo-printer + +-AC_SUBST(CFLAGS) +-AC_SUBST(CPPFLAGS) +-AC_SUBST(LDFLAGS) + AC_SUBST(GPP_DATADIR) + AC_SUBST(GPP_LIBDIR) + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2,7 +2,8 @@ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DDATADIR=\"@GPP_DATADIR@\" \ + -DLOCALDIR=\"$(localdir)\" \ +- -DLIBDIR=\"@GPP_LIBDIR@\" ++ -DLIBDIR=\"@GPP_LIBDIR@\" \ ++ $(GNOME_CFLAGS) + + bin_PROGRAMS = gnome-photo-printer + +@@ -14,4 +15,4 @@ + gpp_print.c gpp_print.h \ + gpp_widget.c gpp_widget.h + +-gnome_photo_printer_LDADD = ++gnome_photo_printer_LDADD = $(GNOME_LIBS) +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -3,4 +3,4 @@ + src/gpp_callbacks.c + src/gpp_functions.c + src/gpp_print.c +-glade/gpp.glade ++data/glade/gpp.glade diff --git a/media-gfx/gpp/gpp-0.6.5.ebuild b/media-gfx/gpp/gpp-0.6.5.ebuild deleted file mode 100644 index 8be01e050a8e..000000000000 --- a/media-gfx/gpp/gpp-0.6.5.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gpp/gpp-0.6.5.ebuild,v 1.3 2005/07/22 20:00:38 dholm Exp $ - -inherit gnome2 - -DESCRIPTION="GNOME Photo Printer" -HOMEPAGE="http://www.fogman.de/?GnomePhotoPrinter" -SRC_URI="http://www.fogman.de/${PN}/${P}.tar.gz" - -IUSE="" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -LICENSE="GPL-2" - -RDEPEND=">=gnome-base/libgnomeui-2 - >=gnome-base/libglade-2 - >=gnome-base/libgnomeprint-2.2 - >=gnome-base/libgnomeprintui-2.2 - >=gnome-base/gnome-vfs-2" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.6" - -USE_DESTDIR="1" -DOCS="AUTHORS ChangeLog COPYRIGHT NEWS README" diff --git a/media-gfx/gpp/gpp-0.7.0.ebuild b/media-gfx/gpp/gpp-0.7.0.ebuild index 51334e0964b5..961a085285d3 100644 --- a/media-gfx/gpp/gpp-0.7.0.ebuild +++ b/media-gfx/gpp/gpp-0.7.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gpp/gpp-0.7.0.ebuild,v 1.1 2007/03/13 22:36:02 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gpp/gpp-0.7.0.ebuild,v 1.2 2008/12/27 12:55:39 eva Exp $ -inherit gnome2 +inherit autotools eutils gnome2 DESCRIPTION="GNOME Photo Printer" HOMEPAGE="http://www.fogman.de/?GnomePhotoPrinter" @@ -21,7 +21,19 @@ RDEPEND=">=gnome-base/libgnomeui-2 >=dev-libs/glib-2" DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.6 + >=dev-util/pkgconfig-0.16 >=dev-util/intltool-0.35" DOCS="AUTHORS COPYRIGHT ChangeLog README" + +src_unpack() { + gnome2_src_unpack + + mkdir "m4" + + # Fix compilation with as-needed, bug #247729 + epatch "${FILESDIR}/${P}-as-needed.patch" + + intltoolize --force --copy --automake || die "intltoolize failed" + eautoreconf +} |