| 1 |
pacho 13/12/28 16:14:30 |
| 2 |
|
| 3 |
Added: gtkam-0.2.0-underlinking.patch |
| 4 |
Log: |
| 5 |
Fix underlinking (#496136 by kalle) |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-gfx/gtkam/files/gtkam-0.2.0-underlinking.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gtkam/files/gtkam-0.2.0-underlinking.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gtkam/files/gtkam-0.2.0-underlinking.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gtkam-0.2.0-underlinking.patch |
| 16 |
=================================================================== |
| 17 |
diff -ur gtkam-0.2.0/configure.ac gtkam-0.2.0.new/configure.ac |
| 18 |
--- gtkam-0.2.0/configure.ac 2012-07-10 09:50:52.000000000 +0200 |
| 19 |
+++ gtkam-0.2.0.new/configure.ac 2013-12-28 17:10:16.899893905 +0100 |
| 20 |
@@ -32,7 +32,6 @@ |
| 21 |
dnl Some programs we need |
| 22 |
dnl --------------------------------------------------------------------------- |
| 23 |
AC_PROG_CC |
| 24 |
-AM_PROG_CC_STDC |
| 25 |
AC_HEADER_STDC |
| 26 |
AM_PROG_LIBTOOL |
| 27 |
AC_PROG_INSTALL |
| 28 |
@@ -86,9 +85,7 @@ |
| 29 |
) |
| 30 |
LIBS="$save_LIBS" |
| 31 |
|
| 32 |
-PKG_CHECK_MODULES([GTK], [gtk+-2.0]) |
| 33 |
-AC_SUBST([GTK_CFLAGS]) |
| 34 |
-AC_SUBST([GTK_LIBS]) |
| 35 |
+GP_CHECK_LIBRARY([GTK2], [gtk+-2.0]) |
| 36 |
|
| 37 |
|
| 38 |
dnl --------------------------------------------------------------------------- |
| 39 |
Sólo en gtkam-0.2.0.new/: configure.ac.orig |
| 40 |
diff -ur gtkam-0.2.0/src/Makefile.am gtkam-0.2.0.new/src/Makefile.am |
| 41 |
--- gtkam-0.2.0/src/Makefile.am 2009-10-10 11:10:26.000000000 +0200 |
| 42 |
+++ gtkam-0.2.0.new/src/Makefile.am 2013-12-28 17:10:13.118834763 +0100 |
| 43 |
@@ -6,7 +6,7 @@ |
| 44 |
$(LIBEXIF_GTK_CFLAGS) \ |
| 45 |
$(LIBGPHOTO2_CFLAGS) \ |
| 46 |
$(GNOME_CFLAGS) \ |
| 47 |
- $(GTK_CFLAGS) \ |
| 48 |
+ $(GTK2_CFLAGS) \ |
| 49 |
$(BONOBO_CFLAGS) \ |
| 50 |
$(GTKAM_GIMP_CFLAGS) |
| 51 |
|
| 52 |
@@ -46,14 +46,14 @@ |
| 53 |
gtkam-exif.c gtkam-exif.h \ |
| 54 |
gtkam-main.c gtkam-main.h \ |
| 55 |
i18n.h main.c |
| 56 |
-gtkam_LDADD = \ |
| 57 |
- libgtkam.a \ |
| 58 |
- $(LIBEXIF_LIBS) \ |
| 59 |
- $(LIBEXIF_GTK_LIBS) \ |
| 60 |
+gtkam_LDADD = \ |
| 61 |
+ libgtkam.a \ |
| 62 |
+ $(LIBEXIF_LIBS) \ |
| 63 |
+ $(LIBEXIF_GTK_LIBS) \ |
| 64 |
$(LIBGPHOTO2_LIBS) \ |
| 65 |
- $(GTKAM_LIBS) \ |
| 66 |
- $(BONOBO_LIBS) \ |
| 67 |
- $(GNOME_LIBS) \ |
| 68 |
+ $(GTK2_LIBS) \ |
| 69 |
+ $(BONOBO_LIBS) \ |
| 70 |
+ $(GNOME_LIBS) \ |
| 71 |
$(INTLLIBS) |
| 72 |
|
| 73 |
if HAVE_GIMP |
| 74 |
@@ -69,6 +69,7 @@ |
| 75 |
$(LIBEXIF_LIBS) \ |
| 76 |
$(LIBEXIF_GTK_LIBS) \ |
| 77 |
$(LIBGPHOTO2_LIBS) \ |
| 78 |
+ $(GTK2_LIBS) \ |
| 79 |
$(BONOBO_LIBS) \ |
| 80 |
$(GNOME_LIBS) \ |
| 81 |
$(INTLLIBS) |
| 82 |
diff -ur gtkam-0.2.0/test/Makefile.am gtkam-0.2.0.new/test/Makefile.am |
| 83 |
--- gtkam-0.2.0/test/Makefile.am 2009-10-10 11:10:25.000000000 +0200 |
| 84 |
+++ gtkam-0.2.0.new/test/Makefile.am 2013-12-28 17:10:13.119834775 +0100 |
| 85 |
@@ -4,7 +4,7 @@ |
| 86 |
$(LIBEXIF_GTK_CFLAGS) \ |
| 87 |
$(LIBGPHOTO2_CFLAGS) \ |
| 88 |
$(GNOME_CFLAGS) \ |
| 89 |
- $(GTK_CFLAGS) \ |
| 90 |
+ $(GTK2_CFLAGS) \ |
| 91 |
$(BONOBO_CFLAGS) \ |
| 92 |
$(GTKAM_GIMP_CFLAGS) |
| 93 |
|
| 94 |
@@ -13,7 +13,7 @@ |
| 95 |
$(LIBEXIF_LIBS) \ |
| 96 |
$(LIBEXIF_GTK_LIBS) \ |
| 97 |
$(LIBGPHOTO2_LIBS) \ |
| 98 |
- $(GTK_LIBS) \ |
| 99 |
+ $(GTK2_LIBS) \ |
| 100 |
$(BONOBO_LIBS) \ |
| 101 |
$(INTLLIBS) |
Archives