| 1 |
eva 08/12/27 12:55:39 |
| 2 |
|
| 3 |
Added: gpp-0.7.0-as-needed.patch |
| 4 |
Log: |
| 5 |
Fix failure with --as-needed and tests, bug #247729. |
| 6 |
(Portage version: 2.2_rc18/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-gfx/gpp/files/gpp-0.7.0-as-needed.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/gpp/files/gpp-0.7.0-as-needed.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/gpp/files/gpp-0.7.0-as-needed.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: gpp-0.7.0-as-needed.patch |
| 15 |
=================================================================== |
| 16 |
--- |
| 17 |
configure.ac | 51 ++++++++++++--------------------------------------- |
| 18 |
po/POTFILES.in | 2 +- |
| 19 |
src/Makefile.am | 5 +++-- |
| 20 |
3 files changed, 16 insertions(+), 42 deletions(-) |
| 21 |
|
| 22 |
--- a/configure.ac |
| 23 |
+++ b/configure.ac |
| 24 |
@@ -4,7 +4,7 @@ |
| 25 |
dnl (Process this file with autoconf to produce a configure script.) |
| 26 |
AC_REVISION($Revision: 1.1 $)dnl |
| 27 |
|
| 28 |
-AC_INIT(gnome-photo-printer,0.7.0,sv@××××××.de,gpp) |
| 29 |
+AC_INIT(gnome-photo-printer, 0.7.0, sv@××××××.de, gpp) |
| 30 |
AC_PREREQ(2.57) |
| 31 |
AC_CONFIG_SRCDIR(src/gpp.c) |
| 32 |
AM_CONFIG_HEADER(config.h) |
| 33 |
@@ -16,52 +16,25 @@ |
| 34 |
|
| 35 |
IT_PROG_INTLTOOL([0.35.0]) |
| 36 |
|
| 37 |
-AC_PATH_PROG(PKGCONFIG, pkg-config, no) |
| 38 |
-if test "$PKGCONFIG" = no ; then |
| 39 |
- AC_MSG_ERROR(pkg-config was not found. Please install version 0.6.0 or newer from http://www.freedesktop.org/software.) |
| 40 |
-fi |
| 41 |
+PKG_PROG_PKG_CONFIG([0.16.0]) |
| 42 |
|
| 43 |
-AC_MSG_CHECKING(for pkg-config >= 0.6.0) |
| 44 |
-vers=`$PKGCONFIG --version | awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 1000 + $3}'` |
| 45 |
-if test "$vers" -ge 6000; then |
| 46 |
- AC_MSG_RESULT(found) |
| 47 |
-else |
| 48 |
- 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.) |
| 49 |
-fi |
| 50 |
+PKG_CHECK_MODULES(GNOME, [ |
| 51 |
+ libgnomeui-2.0 |
| 52 |
+ libglade-2.0 |
| 53 |
+ libgnomeprint-2.2 |
| 54 |
+ libgnomeprintui-2.2 |
| 55 |
+ gnome-vfs-module-2.0 |
| 56 |
+ gmodule-2.0 |
| 57 |
+]) |
| 58 |
|
| 59 |
-gnome_modules="\ |
| 60 |
- libgnomeui-2.0 \ |
| 61 |
- libglade-2.0 \ |
| 62 |
- libgnomeprint-2.2 \ |
| 63 |
- libgnomeprintui-2.2 \ |
| 64 |
- gnome-vfs-module-2.0 \ |
| 65 |
- gmodule-2.0 \ |
| 66 |
-" |
| 67 |
- |
| 68 |
-for module in $gnome_modules |
| 69 |
-do |
| 70 |
- AC_MSG_CHECKING(for $module) |
| 71 |
- if $PKGCONFIG --exists $module; then |
| 72 |
- AC_MSG_RESULT(found) |
| 73 |
- else |
| 74 |
- AC_MSG_ERROR(You need to have $module installed to compile & run this software.) |
| 75 |
- fi |
| 76 |
-done |
| 77 |
- |
| 78 |
-EXTRA_GNOME_CFLAGS=`pkg-config --cflags $gnome_modules` |
| 79 |
-EXTRA_GNOME_LIBS=`pkg-config --libs $gnome_modules` |
| 80 |
- |
| 81 |
-CFLAGS="$CFLAGS $EXTRA_GNOME_CFLAGS -g -O0 -Wall" |
| 82 |
-LDFLAGS="$LDFLAGS $EXTRA_GNOME_LIBS" |
| 83 |
+AC_SUBST(GNOME_CFLAGS) |
| 84 |
+AC_SUBST(GNOME_LIBS) |
| 85 |
|
| 86 |
dnl These should be $pkgdatadir & pkglibdir, but that would make the |
| 87 |
dnl last part 'gpp' rather thann 'gnome-photo-printer' |
| 88 |
GPP_DATADIR=$datadir/gnome-photo-printer |
| 89 |
GPP_LIBDIR=$libdir/gnome-photo-printer |
| 90 |
|
| 91 |
-AC_SUBST(CFLAGS) |
| 92 |
-AC_SUBST(CPPFLAGS) |
| 93 |
-AC_SUBST(LDFLAGS) |
| 94 |
AC_SUBST(GPP_DATADIR) |
| 95 |
AC_SUBST(GPP_LIBDIR) |
| 96 |
|
| 97 |
--- a/src/Makefile.am |
| 98 |
+++ b/src/Makefile.am |
| 99 |
@@ -2,7 +2,8 @@ |
| 100 |
-DSYSCONFDIR=\"$(sysconfdir)\" \ |
| 101 |
-DDATADIR=\"@GPP_DATADIR@\" \ |
| 102 |
-DLOCALDIR=\"$(localdir)\" \ |
| 103 |
- -DLIBDIR=\"@GPP_LIBDIR@\" |
| 104 |
+ -DLIBDIR=\"@GPP_LIBDIR@\" \ |
| 105 |
+ $(GNOME_CFLAGS) |
| 106 |
|
| 107 |
bin_PROGRAMS = gnome-photo-printer |
| 108 |
|
| 109 |
@@ -14,4 +15,4 @@ |
| 110 |
gpp_print.c gpp_print.h \ |
| 111 |
gpp_widget.c gpp_widget.h |
| 112 |
|
| 113 |
-gnome_photo_printer_LDADD = |
| 114 |
+gnome_photo_printer_LDADD = $(GNOME_LIBS) |
| 115 |
--- a/po/POTFILES.in |
| 116 |
+++ b/po/POTFILES.in |
| 117 |
@@ -3,4 +3,4 @@ |
| 118 |
src/gpp_callbacks.c |
| 119 |
src/gpp_functions.c |
| 120 |
src/gpp_print.c |
| 121 |
-glade/gpp.glade |
| 122 |
+data/glade/gpp.glade |
Archives