r31786 - in /desktop/unstable/gtk+3.0/debian: changelog patches/018_gdkenumtypes.c_location.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Tue Nov 22 09:03:47 2011
New Revision: 31786

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31786
Log:
Add 018_gdkenumtypes.c_location.patch: Always generate gdk/gdkenumtypes.c
in the source tree, and fix path in the introspection sources. With this,
gdkenumtypes.c is correctly included with separate build trees, too.  This
fixes missing GTypes in the .gir when using a separate build tree.
(LP: #769256, GNOME #647729)

Added:
    desktop/unstable/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch
Modified:
    desktop/unstable/gtk+3.0/debian/changelog
    desktop/unstable/gtk+3.0/debian/patches/series

Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=31786&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog [utf-8] Tue Nov 22 09:03:47 2011
@@ -9,6 +9,11 @@
     (LP: #512427, GNOME #607668)
   * Add 017_no_offscreen_device_grabbing.patch: Do not allow devices in an
     offscreen hierarchy to take grabs. (LP: #804009, GNOME #658563)
+  * Add 018_gdkenumtypes.c_location.patch: Always generate gdk/gdkenumtypes.c
+    in the source tree, and fix path in the introspection sources. With this,
+    gdkenumtypes.c is correctly included with separate build trees, too.  This
+    fixes missing GTypes in the .gir when using a separate build tree.
+    (LP: #769256, GNOME #647729)
 
  -- Martin Pitt <mpitt at debian.org>  Tue, 22 Nov 2011 09:34:45 +0100
 

Added: desktop/unstable/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/018_gdkenumtypes.c_location.patch?rev=31786&op=file
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch (added)
+++ desktop/unstable/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch [utf-8] Tue Nov 22 09:03:47 2011
@@ -1,0 +1,70 @@
+From 7785c99603e754d6c20a7923450d7a19eed0cd07 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt at ubuntu.com>
+Date: Thu, 8 Sep 2011 09:14:02 +0200
+Subject: [PATCH] Consistently treat gdkenumtypes.[hc] as source files
+
+Always generate gdk/gdkenumtypes.c in the source tree, and fix path in the
+introspection sources. With this, gdkenumtypes.c is correctly included with
+separate build trees, too. This fixes missing GTypes in the .gir when using a
+separate build tree.
+
+Also remove the gdk/stamp-gdkenumtypes.h target. It was forcing the
+regeneration of gdk/gdkenumtypes.h even if it was already present and current
+in the source tree.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=647729
+Bug-Ubuntu: https://launchpad.net/bugs/769256
+---
+ gdk/Makefile.am |   17 +++++++----------
+ 1 files changed, 7 insertions(+), 10 deletions(-)
+
+diff --git a/gdk/Makefile.am b/gdk/Makefile.am
+index c7f24af..d918db0 100644
+--- a/gdk/Makefile.am
++++ b/gdk/Makefile.am
+@@ -185,8 +185,8 @@ if HAVE_INTROSPECTION
+ introspection_files = 		\
+ 	$(filter-out gdkkeysyms-compat.h, $(gdk_public_h_sources))	\
+ 	$(gdk_c_sources)	\
+-        gdkenumtypes.c		\
+-        gdkenumtypes.h
++        $(srcdir)/gdkenumtypes.c	\
++        $(srcdir)/gdkenumtypes.h
+ 
+ Gdk-3.0.gir: libgdk-3.la Makefile
+ Gdk_3_0_gir_SCANNERFLAGS = 	\
+@@ -303,7 +303,7 @@ endif
+ 
+ lib_LTLIBRARIES = libgdk-3.la
+ 
+-MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
++MAINTAINERCLEANFILES = $(gdk_built_sources)
+ EXTRA_DIST += $(gdk_built_sources)
+ 
+ install-exec-hook:
+@@ -315,18 +315,15 @@ BUILT_SOURCES = \
+ 	$(gdk_built_sources)			\
+ 	gdkconfig.h
+ 
+-gdkenumtypes.h: stamp-gdkenumtypes.h
+-	@true
+-stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.h.template
++gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) $(srcdir)/gdkenumtypes.h.template
+ 	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \
+ 		$(gdk_public_h_sources) ) >> xgen-geth \
+-	&& (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \
+-	&& rm -f xgen-geth \
+-	&& echo timestamp > $(@F)
++	&& (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth $(srcdir)/gdkenumtypes.h ) \
++	&& rm -f xgen-geth 
+ gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.c.template
+ 	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \
+ 		$(gdk_public_h_sources) ) > xgen-getc \
+-	&& cp xgen-getc gdkenumtypes.c  \
++	&& cp xgen-getc $(srcdir)/gdkenumtypes.c  \
+ 	&& rm -f xgen-getc
+ 
+ #
+-- 
+1.7.5.4
+

Modified: desktop/unstable/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/series?rev=31786&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series [utf-8] Tue Nov 22 09:03:47 2011
@@ -4,6 +4,7 @@
 015_default-fallback-icon-theme.patch
 016_no_offscreen_widgets_grabbing.patch
 017_no_offscreen_device_grabbing.patch
+018_gdkenumtypes.c_location.patch
 022_disable-viqr-im-for-vi-locale.patch
 041_ia32-libs.patch
 042_treeview_single-focus.patch