[arch-commits] Commit in libexif-gtk/repos (3 files)

[Eric Bélanger]

    Date: Monday, November 9, 2009 @ 11:20:32
  Author: eric
Revision: 58584

Merged revisions 58583 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/libexif-gtk/trunk

........
  r58583 | andrea | 2009-11-09 10:52:32 -0500 (Mon, 09 Nov 2009) | 1 line
  
  added patch
........

Added:
  libexif-gtk/repos/extra-i686/gtk2-2.12.patch
    (from rev 58583, libexif-gtk/trunk/gtk2-2.12.patch)
Modified:
  libexif-gtk/repos/extra-i686/	(properties)
Deleted:
  libexif-gtk/repos/extra-i686/gtk2-fix.patch

-----------------+
 gtk2-2.12.patch |   45 +++++++++++++++++++++++++++++++++++++++++++++
 gtk2-fix.patch  |   13 -------------
 2 files changed, 45 insertions(+), 13 deletions(-)


Property changes on: libexif-gtk/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /libexif-gtk/trunk:1-58570
   + /libexif-gtk/trunk:1-58583

Copied: libexif-gtk/repos/extra-i686/gtk2-2.12.patch (from rev 58583, libexif-gtk/trunk/gtk2-2.12.patch)
===================================================================
--- extra-i686/gtk2-2.12.patch	                        (rev 0)
+++ extra-i686/gtk2-2.12.patch	2009-11-09 16:20:32 UTC (rev 58584)
@@ -0,0 +1,45 @@
+libexif-gtk needs deprecated GTK API.
+--- a/gtk-extensions/Makefile.in
++++ b/gtk-extensions/Makefile.in
+@@ -219,7 +219,6 @@
+ INCLUDES = \
+ 	-I$(top_srcdir)			\
+ 	-I$(top_srcdir)/intl		\
+-	-DGTK_DISABLE_DEPRECATED	\
+ 	$(GTK_CFLAGS)
+ 
+ noinst_LTLIBRARIES = libgtk-extensions.la
+--- a/libexif-gtk/Makefile.in
++++ b/libexif-gtk/Makefile.in
+@@ -251,8 +251,7 @@
+ 	-I$(top_srcdir)/intl				\
+ 	-I$(top_srcdir)/gtk-extensions			\
+ 	$(LIBEXIF_GTK_CFLAGS)				\
+-	-DG_LOG_DOMAIN=\"libexif\"			\
+-	-DGTK_DISABLE_DEPRECATED
++	-DG_LOG_DOMAIN=\"libexif\"
+ 
+ lib_LTLIBRARIES = libexif-gtk.la
+ libexif_gtkincludedir = $(includedir)/libexif-gtk
+--- a/gtk-extensions/Makefile.am
++++ b/gtk-extensions/Makefile.am
+@@ -1,7 +1,6 @@
+ INCLUDES =				\
+ 	-I$(top_srcdir)			\
+ 	-I$(top_srcdir)/intl		\
+-	-DGTK_DISABLE_DEPRECATED	\
+ 	$(GTK_CFLAGS)
+ 
+ noinst_LTLIBRARIES = libgtk-extensions.la
+--- a/libexif-gtk/Makefile.am
++++ b/libexif-gtk/Makefile.am
+@@ -3,8 +3,7 @@
+ 	-I$(top_srcdir)/intl				\
+ 	-I$(top_srcdir)/gtk-extensions			\
+ 	$(LIBEXIF_GTK_CFLAGS)				\
+-	-DG_LOG_DOMAIN=\"libexif\"			\
+-	-DGTK_DISABLE_DEPRECATED
++	-DG_LOG_DOMAIN=\"libexif\"
+ 
+ lib_LTLIBRARIES = libexif-gtk.la
+ 

Deleted: extra-i686/gtk2-fix.patch
===================================================================
--- extra-i686/gtk2-fix.patch	2009-11-09 15:52:32 UTC (rev 58583)
+++ extra-i686/gtk2-fix.patch	2009-11-09 16:20:32 UTC (rev 58584)
@@ -1,13 +0,0 @@
-diff -ur libexif-gtk-0.3.5.orig/libexif-gtk/Makefile.in libexif-gtk-0.3.5/libexif-gtk/Makefile.in
---- libexif-gtk-0.3.5.orig/libexif-gtk/Makefile.in	2007-10-30 12:57:42.000000000 +0000
-+++ libexif-gtk-0.3.5/libexif-gtk/Makefile.in	2007-10-30 13:02:47.000000000 +0000
-@@ -251,8 +251,7 @@
- 	-I$(top_srcdir)/intl				\
- 	-I$(top_srcdir)/gtk-extensions			\
- 	$(LIBEXIF_GTK_CFLAGS)				\
--	-DG_LOG_DOMAIN=\"libexif\"			\
--	-DGTK_DISABLE_DEPRECATED
-+	-DG_LOG_DOMAIN=\"libexif\"
- 
- lib_LTLIBRARIES = libexif-gtk.la
- libexif_gtkincludedir = $(includedir)/libexif-gtk