r26095 - in /desktop/experimental/gtk+2.0/debian: changelog patches/007-Revert-some-over-eager-deprecation-removal.patch patches/008-Don-t-use-deprecated-API.patch patches/series
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Tue Dec 28 17:48:00 UTC 2010
Author: pochu
Date: Tue Dec 28 17:47:58 2010
New Revision: 26095
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26095
Log:
* debian/patches/007-Revert-some-over-eager-deprecation-removal.patch,
debian/patches/008-Don-t-use-deprecated-API.patch:
+ Two more patches from upstream git, fix more regressions in 2.23.3.
Closes: #608028, 608009.
Added:
desktop/experimental/gtk+2.0/debian/patches/007-Revert-some-over-eager-deprecation-removal.patch
desktop/experimental/gtk+2.0/debian/patches/008-Don-t-use-deprecated-API.patch
Modified:
desktop/experimental/gtk+2.0/debian/changelog
desktop/experimental/gtk+2.0/debian/patches/series
Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=26095&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/changelog [utf-8] Tue Dec 28 17:47:58 2010
@@ -1,3 +1,12 @@
+gtk+2.0 (2.23.3-3) experimental; urgency=low
+
+ * debian/patches/007-Revert-some-over-eager-deprecation-removal.patch,
+ debian/patches/008-Don-t-use-deprecated-API.patch:
+ + Two more patches from upstream git, fix more regressions in 2.23.3.
+ Closes: #608028, 608009.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Tue, 28 Dec 2010 14:30:44 +0000
+
gtk+2.0 (2.23.3-2) experimental; urgency=low
* 006-Reinstate-the-implementation-of-gdk_window_foreign_n.patch:
Added: desktop/experimental/gtk+2.0/debian/patches/007-Revert-some-over-eager-deprecation-removal.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/007-Revert-some-over-eager-deprecation-removal.patch?rev=26095&op=file
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/007-Revert-some-over-eager-deprecation-removal.patch (added)
+++ desktop/experimental/gtk+2.0/debian/patches/007-Revert-some-over-eager-deprecation-removal.patch [utf-8] Tue Dec 28 17:47:58 2010
@@ -1,0 +1,56 @@
+From c76b247da5194b165591a765b85e19dafba9c956 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Mon, 27 Dec 2010 18:16:14 -0500
+Subject: [PATCH] Revert some over-eager deprecation removal
+
+We can't replace drawable api with window api when the object
+is actually a pixmap.
+---
+ gdk/gdkdrawable.h | 4 +++-
+ gtk/gtkdnd.c | 7 +++----
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
+index bb92571..b363d49 100644
+--- a/gdk/gdkdrawable.h
++++ b/gdk/gdkdrawable.h
+@@ -255,14 +255,16 @@ void gdk_drawable_set_colormap (GdkDrawable *drawable,
+ GdkColormap* gdk_drawable_get_colormap (GdkDrawable *drawable);
+ gint gdk_drawable_get_depth (GdkDrawable *drawable);
+
+-#ifndef GDK_DISABLE_DEPRECATED
++#if !defined (GDK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
+ void gdk_drawable_get_size (GdkDrawable *drawable,
+ gint *width,
+ gint *height);
+ GdkVisual* gdk_drawable_get_visual (GdkDrawable *drawable);
+ GdkScreen* gdk_drawable_get_screen (GdkDrawable *drawable);
+ GdkDisplay* gdk_drawable_get_display (GdkDrawable *drawable);
++#endif /* GDK_DISABLE_DEPRECATED || GTK_COMPILATION */
+
++#ifndef GDK_DISABLE_DEPRECATED
+ GdkDrawable* gdk_drawable_ref (GdkDrawable *drawable);
+ void gdk_drawable_unref (GdkDrawable *drawable);
+ #endif /* GDK_DISABLE_DEPRECATED */
+diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
+index 7d4ea21..c378668 100644
+--- a/gtk/gtkdnd.c
++++ b/gtk/gtkdnd.c
+@@ -3268,11 +3268,10 @@ gtk_drag_set_icon_pixmap (GdkDragContext *context,
+
+ screen = gdk_colormap_get_screen (colormap);
+
+- g_return_if_fail (gdk_window_get_screen (pixmap) == screen);
++ g_return_if_fail (gdk_drawable_get_screen (pixmap) == screen);
+ g_return_if_fail (!mask || gdk_window_get_screen (mask) == screen);
+-
+- width = gdk_window_get_width (pixmap);
+- height = gdk_window_get_height (pixmap);
++
++ gdk_drawable_get_size (pixmap, &width, &height);
+
+ gtk_widget_push_colormap (colormap);
+
+--
+1.7.2.3
+
Added: desktop/experimental/gtk+2.0/debian/patches/008-Don-t-use-deprecated-API.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/008-Don-t-use-deprecated-API.patch?rev=26095&op=file
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/008-Don-t-use-deprecated-API.patch (added)
+++ desktop/experimental/gtk+2.0/debian/patches/008-Don-t-use-deprecated-API.patch [utf-8] Tue Dec 28 17:47:58 2010
@@ -1,0 +1,67 @@
+From f9dd531bc9ccec1a407fe7b78c74f6fac242a05e Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Mon, 27 Dec 2010 19:06:02 -0500
+Subject: [PATCH] Don't use deprecated API
+
+This should fix copy/paste problems observed with 2.23.3, as seen
+eg in http://bugzilla.gnome.org/show_bug.cgi?id=637973
+---
+ gtk/gtkselection.c | 28 ++++++++++++++--------------
+ 1 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
+index 5b3ae1d..fa20852 100644
+--- a/gtk/gtkselection.c
++++ b/gtk/gtkselection.c
+@@ -1316,18 +1316,19 @@ selection_set_compound_text (GtkSelectionData *selection_data,
+ gint format;
+ gint new_length;
+ gboolean result = FALSE;
+-
++
++#ifdef GDK_WINDOWING_X11
+ tmp = g_strndup (str, len);
+- if (gdk_utf8_to_compound_text_for_display (selection_data->display, tmp,
+- &encoding, &format, &text, &new_length))
++ if (gdk_x11_display_utf8_to_compound_text (selection_data->display, tmp,
++ &encoding, &format, &text, &new_length))
+ {
+ gtk_selection_data_set (selection_data, encoding, format, text, new_length);
+- gdk_free_compound_text (text);
+-
++ gdk_x11_free_compound_text (text);
++
+ result = TRUE;
+ }
+-
+ g_free (tmp);
++#endif
+
+ return result;
+ }
+@@ -2273,15 +2274,14 @@ _gtk_selection_request (GtkWidget *widget,
+
+ info->selection = event->selection;
+ info->num_incrs = 0;
+-
++
+ /* Create GdkWindow structure for the requestor */
+-
+- info->requestor = gdk_window_lookup_for_display (display,
+- event->requestor);
+- if (!info->requestor)
+- info->requestor = gdk_window_foreign_new_for_display (display,
+- event->requestor);
+-
++#ifdef GDK_WINDOWING_X11
++ info->requestor = gdk_x11_window_foreign_new_for_display (display, event->requestor);
++#else
++ info->requestor = NULL;
++#endif
++
+ /* Determine conversions we need to perform */
+
+ if (event->target == gtk_selection_atoms[MULTIPLE])
+--
+1.7.2.3
+
Modified: desktop/experimental/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/series?rev=26095&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/series [utf-8] Tue Dec 28 17:47:58 2010
@@ -4,6 +4,8 @@
004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
005_support_disabling_x11_extensions.patch
006-Reinstate-the-implementation-of-gdk_window_foreign_n.patch
+007-Revert-some-over-eager-deprecation-removal.patch
+008-Don-t-use-deprecated-API.patch
009_gtk-export-filechooser.patch
011_immodule-cache-dir.patch
015_default-fallback-icon-theme.patch
More information about the pkg-gnome-commits
mailing list