r30722 - /desktop/unstable/gtk+2.0/debian/patches/065_gir_set_packages.patch

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Tue Oct 18 15:48:13 UTC 2011


Author: biebl
Date: Tue Oct 18 15:48:12 2011
New Revision: 30722

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30722
Log:
Refresh debian/patches/065_gir_set_packages.patch

based on what is in the upstream bug report.

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

Modified: 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=30722&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/065_gir_set_packages.patch [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/065_gir_set_packages.patch [utf-8] Tue Oct 18 15:48:12 2011
@@ -1,75 +1,46 @@
-=== modified file 'gdk/Makefile.am'
+From a63c5b109f03d0119822592455ba9c2bc1f709d9 Mon Sep 17 00:00:00 2001
+From: Ken VanDine <ken.vandine at canonical.com>
+Date: Fri, 19 Nov 2010 13:37:01 -0500
+Subject: [PATCH] Include <package/> tag in generated GIR
+
+Specify pkg-config name when generating GIR files, used for mapping GIR
+name to pkg-config names
+
+https://bugzilla.gnome.org/show_bug.cgi?id=635287
+---
+ gdk/Makefile.am |    2 ++
+ gtk/Makefile.am |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
 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"
+--- gtk+-2.24.7.orig/gdk/Makefile.am	2011-08-16 04:30:51.000000000 +0200
++++ gtk+-2.24.7/gdk/Makefile.am	2011-10-18 17:47:04.649297799 +0200
+@@ -202,6 +202,7 @@
  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_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
-+
+@@ -243,6 +244,7 @@
+ GdkX11_2_0_gir_INCLUDES = Gio-2.0 Gdk-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)
++GdkX11_2_0_gir_PACKAGES = gdk-x11-2.0
+ GdkX11_2_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
  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 @@
++++ gtk+-2.24.7/gtk/Makefile.am	2011-10-18 17:47:04.653297749 +0200
+@@ -1022,6 +1022,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
++Gtk_2_0_gir_PACKAGES = gtk-2.0
  INTROSPECTION_GIRS += Gtk-2.0.gir
  
  girdir = $(datadir)/gir-1.0




More information about the pkg-gnome-commits mailing list