r30706 - in /desktop/unstable/gtk+2.0/debian: changelog patches/065_gir_set_packages.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Oct 18 06:29:22 2011
New Revision: 30706

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30706
Log:
* debian/patches/065_gir_set_packages.patch
  - Specify packages when generating GIR. Closes: #622759

Added:
    desktop/unstable/gtk+2.0/debian/patches/065_gir_set_packages.patch
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/patches/series

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=30706&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog [utf-8] Tue Oct 18 06:29:22 2011
@@ -16,6 +16,8 @@
       filechooser API, this patch has become obsolete. Drop
       hildon_gtk_file_chooser_install_properties from the symbols file
       accordingly.
+  * debian/patches/065_gir_set_packages.patch
+    - Specify packages when generating GIR. Closes: #622759
 
  -- Michael Biebl <biebl at debian.org>  Tue, 18 Oct 2011 07:47:45 +0200
 

Added: desktop/unstable/gtk+2.0/debian/patches/065_gir_set_packages.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/065_gir_set_packages.patch?rev=30706&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/065_gir_set_packages.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/065_gir_set_packages.patch [utf-8] Tue Oct 18 06:29:22 2011
@@ -1,0 +1,75 @@
+=== modified file 'gdk/Makefile.am'
+Index: gtk+-2.24.7/gdk/Makefile.am
+===================================================================
+--- gtk+-2.24.7.orig/gdk/Makefile.am	2011-10-18 08:21:07.400198233 +0200
++++ gtk+-2.24.7/gdk/Makefile.am	2011-10-18 08:21:08.728181538 +0200
+@@ -3,6 +3,7 @@
+ -include $(INTROSPECTION_MAKEFILE)
+ INTROSPECTION_GIRS =
+ INTROSPECTION_SCANNER_ARGS = \
++   --warn-all \
+    --add-include-path=../gdk
+ INTROSPECTION_COMPILER_ARGS = \
+    --includedir=$(srcdir) \
+@@ -198,10 +199,11 @@
+         gdkenumtypes.h
+ 
+ Gdk-2.0.gir: $(gdktargetlib) Makefile
+-Gdk_2_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk
++Gdk_2_0_gir_SCANNERFLAGS = --c-include="gdk/gdk.h"
+ Gdk_2_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
+ Gdk_2_0_gir_LIBS = $(gdktargetlib)
+ Gdk_2_0_gir_FILES = $(introspection_files)
++Gdk_2_0_gir_EXPORT_PACKAGES = gdk-2.0
+ Gdk_2_0_gir_CFLAGS = $(INCLUDES)
+ INTROSPECTION_GIRS += Gdk-2.0.gir
+ 
+@@ -239,10 +241,12 @@
+         x11/gdkx.h
+ 
+ GdkX11-2.0.gir: $(gdktargetlib) Gdk-2.0.gir Makefile
+-GdkX11_2_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk
+-GdkX11_2_0_gir_INCLUDES = Gio-2.0 Gdk-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
++GdkX11_2_0_gir_SCANNERFLAGS = --identifier-prefix=Gdk --include-uninstalled=Gdk-2.0.gir
++GdkX11_2_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
++
+ GdkX11_2_0_gir_LIBS = $(gdktargetlib)
+ GdkX11_2_0_gir_FILES = $(x11_introspection_files)
++GdkX11_2_0_gir_EXPORT_PACKAGES = gdk-x11-2.0
+ GdkX11_2_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk -I.. -I$(srcdir)
+ INTROSPECTION_GIRS += GdkX11-2.0.gir
+ 
+Index: gtk+-2.24.7/gtk/Makefile.am
+===================================================================
+--- gtk+-2.24.7.orig/gtk/Makefile.am	2011-10-18 00:38:28.000000000 +0200
++++ gtk+-2.24.7/gtk/Makefile.am	2011-10-18 08:21:08.732181488 +0200
+@@ -3,6 +3,7 @@
+ -include $(INTROSPECTION_MAKEFILE)
+ INTROSPECTION_GIRS =
+ INTROSPECTION_SCANNER_ARGS = \
++	--warn-all \
+ 	--add-include-path=../gdk
+ INTROSPECTION_COMPILER_ARGS = \
+ 	--includedir=$(srcdir) \
+@@ -1010,11 +1011,11 @@
+     gtktypebuiltins.c
+ 
+ Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-2.0.gir Makefile
+-Gtk_2_0_gir_SCANNERFLAGS = --warn-all --add-include-path=$(top_builddir)/gdk
++Gtk_2_0_gir_SCANNERFLAGS = --include-uninstalled=$(top_builddir)/gdk/Gdk-2.0.gir
+ if USE_X11
+ Gtk_2_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
+ endif
+-Gtk_2_0_gir_INCLUDES = Atk-1.0 Gdk-2.0
++Gtk_2_0_gir_INCLUDES = Atk-1.0
+ Gtk_2_0_gir_CFLAGS = \
+ 		$(INCLUDES) \
+ 		-UGDK_DISABLE_DEPRECATED \
+@@ -1022,6 +1023,7 @@
+ 		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
+ Gtk_2_0_gir_LIBS = $(gtktargetlib)
+ Gtk_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
++Gtk_2_0_gir_EXPORT_PACKAGES = gtk+-2.0
+ INTROSPECTION_GIRS += Gtk-2.0.gir
+ 
+ girdir = $(datadir)/gir-1.0

Modified: desktop/unstable/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/series?rev=30706&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series [utf-8] Tue Oct 18 06:29:22 2011
@@ -12,5 +12,6 @@
 060_ignore-random-icons.patch
 061_use_pdf_as_default_printing_standard.patch
 064_gir_build_workaround.patch
-065_tracker.patch
+065_gir_set_packages.patch
+070_tracker.patch
 098_multiarch_module_path.patch