Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gtkam/files/
Date: Wed, 04 Jan 2017 10:57:54
Message-Id: 1483527446.18593ad598cc0d2a970d9dfe401403e3de58256b.soap@gentoo
1 commit: 18593ad598cc0d2a970d9dfe401403e3de58256b
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Dec 23 15:57:44 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 4 10:57:26 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18593ad5
7
8 media-gfx/gtkam: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/3223
11
12 .../gtkam/files/gtkam-0.2.0-underlinking.patch | 86 ----------------------
13 1 file changed, 86 deletions(-)
14
15 diff --git a/media-gfx/gtkam/files/gtkam-0.2.0-underlinking.patch b/media-gfx/gtkam/files/gtkam-0.2.0-underlinking.patch
16 deleted file mode 100644
17 index c1bacf0..00000000
18 --- a/media-gfx/gtkam/files/gtkam-0.2.0-underlinking.patch
19 +++ /dev/null
20 @@ -1,86 +0,0 @@
21 -diff -ur gtkam-0.2.0/configure.ac gtkam-0.2.0.new/configure.ac
22 ---- gtkam-0.2.0/configure.ac 2012-07-10 09:50:52.000000000 +0200
23 -+++ gtkam-0.2.0.new/configure.ac 2013-12-28 17:10:16.899893905 +0100
24 -@@ -32,7 +32,6 @@
25 - dnl Some programs we need
26 - dnl ---------------------------------------------------------------------------
27 - AC_PROG_CC
28 --AM_PROG_CC_STDC
29 - AC_HEADER_STDC
30 - AM_PROG_LIBTOOL
31 - AC_PROG_INSTALL
32 -@@ -86,9 +85,7 @@
33 - )
34 - LIBS="$save_LIBS"
35 -
36 --PKG_CHECK_MODULES([GTK], [gtk+-2.0])
37 --AC_SUBST([GTK_CFLAGS])
38 --AC_SUBST([GTK_LIBS])
39 -+GP_CHECK_LIBRARY([GTK2], [gtk+-2.0])
40 -
41 -
42 - dnl ---------------------------------------------------------------------------
43 -Sólo en gtkam-0.2.0.new/: configure.ac.orig
44 -diff -ur gtkam-0.2.0/src/Makefile.am gtkam-0.2.0.new/src/Makefile.am
45 ---- gtkam-0.2.0/src/Makefile.am 2009-10-10 11:10:26.000000000 +0200
46 -+++ gtkam-0.2.0.new/src/Makefile.am 2013-12-28 17:10:13.118834763 +0100
47 -@@ -6,7 +6,7 @@
48 - $(LIBEXIF_GTK_CFLAGS) \
49 - $(LIBGPHOTO2_CFLAGS) \
50 - $(GNOME_CFLAGS) \
51 -- $(GTK_CFLAGS) \
52 -+ $(GTK2_CFLAGS) \
53 - $(BONOBO_CFLAGS) \
54 - $(GTKAM_GIMP_CFLAGS)
55 -
56 -@@ -46,14 +46,14 @@
57 - gtkam-exif.c gtkam-exif.h \
58 - gtkam-main.c gtkam-main.h \
59 - i18n.h main.c
60 --gtkam_LDADD = \
61 -- libgtkam.a \
62 -- $(LIBEXIF_LIBS) \
63 -- $(LIBEXIF_GTK_LIBS) \
64 -+gtkam_LDADD = \
65 -+ libgtkam.a \
66 -+ $(LIBEXIF_LIBS) \
67 -+ $(LIBEXIF_GTK_LIBS) \
68 - $(LIBGPHOTO2_LIBS) \
69 -- $(GTKAM_LIBS) \
70 -- $(BONOBO_LIBS) \
71 -- $(GNOME_LIBS) \
72 -+ $(GTK2_LIBS) \
73 -+ $(BONOBO_LIBS) \
74 -+ $(GNOME_LIBS) \
75 - $(INTLLIBS)
76 -
77 - if HAVE_GIMP
78 -@@ -69,6 +69,7 @@
79 - $(LIBEXIF_LIBS) \
80 - $(LIBEXIF_GTK_LIBS) \
81 - $(LIBGPHOTO2_LIBS) \
82 -+ $(GTK2_LIBS) \
83 - $(BONOBO_LIBS) \
84 - $(GNOME_LIBS) \
85 - $(INTLLIBS)
86 -diff -ur gtkam-0.2.0/test/Makefile.am gtkam-0.2.0.new/test/Makefile.am
87 ---- gtkam-0.2.0/test/Makefile.am 2009-10-10 11:10:25.000000000 +0200
88 -+++ gtkam-0.2.0.new/test/Makefile.am 2013-12-28 17:10:13.119834775 +0100
89 -@@ -4,7 +4,7 @@
90 - $(LIBEXIF_GTK_CFLAGS) \
91 - $(LIBGPHOTO2_CFLAGS) \
92 - $(GNOME_CFLAGS) \
93 -- $(GTK_CFLAGS) \
94 -+ $(GTK2_CFLAGS) \
95 - $(BONOBO_CFLAGS) \
96 - $(GTKAM_GIMP_CFLAGS)
97 -
98 -@@ -13,7 +13,7 @@
99 - $(LIBEXIF_LIBS) \
100 - $(LIBEXIF_GTK_LIBS) \
101 - $(LIBGPHOTO2_LIBS) \
102 -- $(GTK_LIBS) \
103 -+ $(GTK2_LIBS) \
104 - $(BONOBO_LIBS) \
105 - $(INTLLIBS)
106 -