r23124 - in /desktop/experimental/gtk+2.0/debian: changelog patches/090_directfb-map-virtual-modifiers.patch rules

[slomo at users.alioth.debian.org]

Author: slomo
Date: Wed Feb 24 13:48:55 2010
New Revision: 23124

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23124
Log:
* debian/patches/090_directfb-map-virtual-modifiers.patch:
  + Update to add just another stub to fix the build.

Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/patches/090_directfb-map-virtual-modifiers.patch
    desktop/experimental/gtk+2.0/debian/rules

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=23124&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/changelog [utf-8] Wed Feb 24 13:48:55 2010
@@ -3,6 +3,8 @@
   * New upstream development release:
     + debian/patches/070_mandatory-relibtoolize.patch:
       - Regenerated for the new version.
+  * debian/patches/090_directfb-map-virtual-modifiers.patch:
+    + Update to add just another stub to fix the build.
 
  -- Sebastian Dröge <slomo at debian.org>  Wed, 24 Feb 2010 10:01:31 +0100
 

Modified: desktop/experimental/gtk+2.0/debian/patches/090_directfb-map-virtual-modifiers.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/090_directfb-map-virtual-modifiers.patch?rev=23124&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/090_directfb-map-virtual-modifiers.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/090_directfb-map-virtual-modifiers.patch [utf-8] Wed Feb 24 13:48:55 2010
@@ -1,9 +1,16 @@
---- a/gdk/directfb/gdkkeys-directfb.c.old	2010-01-04 11:25:17.400521020 +0100
-+++ b/gdk/directfb/gdkkeys-directfb.c	2010-01-04 11:25:24.572521710 +0100
-@@ -1999,5 +1999,13 @@
+--- gdk/directfb/gdkkeys-directfb.c.old	2010-02-24 14:46:25.924954435 +0100
++++ gdk/directfb/gdkkeys-directfb.c	2010-02-24 14:47:03.199594370 +0100
+@@ -1998,6 +1998,20 @@
+ 	return 0;
  }
  
- 
++void
++gdk_keymap_add_virtual_modifiers (GdkKeymap       *keymap,
++                                  GdkModifierType *state)
++{
++  /* FIXME: For now, we've mimiced the Windows backend. */
++}
++
 +gboolean
 +gdk_keymap_map_virtual_modifiers (GdkKeymap       *keymap,
 +                                  GdkModifierType *state)
@@ -11,15 +18,18 @@
 +  /* FIXME: For now, we've mimiced the Windows backend. */
 +  return TRUE;
 +}
-+
+ 
  #define __GDK_KEYS_DIRECTFB_C__
  #include "gdkaliasdef.c"
---- a/gdk/gdkaliasdef.c.old	2010-01-04 12:33:17.664522053 +0100
-+++ b/gdk/gdkaliasdef.c	2010-01-04 12:34:37.804526027 +0100
-@@ -1842,6 +1842,9 @@
+--- gdk/gdkaliasdef.c.old	2010-02-24 14:46:30.529155696 +0100
++++ gdk/gdkaliasdef.c	2010-02-24 14:47:36.460953699 +0100
+@@ -1845,6 +1845,12 @@
  #undef gdk_keymap_lookup_key 
  extern __typeof (gdk_keymap_lookup_key) gdk_keymap_lookup_key __attribute((alias("IA__gdk_keymap_lookup_key"), visibility("default")));
  
++#undef gdk_keymap_add_virtual_modifiers 
++extern __typeof (gdk_keymap_add_virtual_modifiers) gdk_keymap_add_virtual_modifiers __attribute((alias("IA__gdk_keymap_add_virtual_modifiers"), visibility("default")));
++
 +#undef gdk_keymap_map_virtual_modifiers 
 +extern __typeof (gdk_keymap_map_virtual_modifiers) gdk_keymap_map_virtual_modifiers __attribute((alias("IA__gdk_keymap_map_virtual_modifiers"), visibility("default")));
 +

Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=23124&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/rules [utf-8] Wed Feb 24 13:48:55 2010
@@ -123,6 +123,7 @@
 			--infodir=\$${prefix}/share/info \
 			--sysconfdir=/etc \
 			--enable-test-print-backend \
+			--enable-introspection=no \
 			--build=$(DEB_BUILD_GNU_TYPE)
 ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 	configure_flags += --host=$(DEB_HOST_GNU_TYPE)