r30732 - /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 18:44:54 UTC 2011


Author: biebl
Date: Tue Oct 18 18:44:54 2011
New Revision: 30732

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30732
Log:
More fixes for 065_gir_set_packages.patch to apply without 064_

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=30732&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 18:44:54 2011
@@ -1,21 +1,8 @@
-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(-)
-
+=== modified file 'gdk/Makefile.am'
 Index: gtk+-2.24.7/gdk/Makefile.am
 ===================================================================
 --- 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 19:11:08.000000000 +0200
++++ gtk+-2.24.7/gdk/Makefile.am	2011-10-18 20:15:07.000000000 +0200
 @@ -3,6 +3,7 @@
  -include $(INTROSPECTION_MAKEFILE)
  INTROSPECTION_GIRS =
@@ -33,12 +20,19 @@
  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_PACKAGES = gdk-2.0
++Gdk_2_0_gir_EXPORT_PACKAGES = gdk-2.0
  Gdk_2_0_gir_CFLAGS = $(INCLUDES)
  INTROSPECTION_GIRS += Gdk-2.0.gir
  
-@@ -243,6 +244,7 @@
- GdkX11_2_0_gir_INCLUDES = Gio-2.0 Gdk-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
+@@ -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
@@ -48,7 +42,7 @@
 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 19:11:08.000000000 +0200
++++ gtk+-2.24.7/gtk/Makefile.am	2011-10-18 20:15:07.000000000 +0200
 @@ -3,6 +3,7 @@
  -include $(INTROSPECTION_MAKEFILE)
  INTROSPECTION_GIRS =
@@ -75,7 +69,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_PACKAGES = gtk-2.0
++Gtk_2_0_gir_EXPORT_PACKAGES = gtk+-2.0
  INTROSPECTION_GIRS += Gtk-2.0.gir
  
  girdir = $(datadir)/gir-1.0




More information about the pkg-gnome-commits mailing list