* New upstream release.

+ debian/patches/004_gtk_gir_build.patch:
    - Removed, fixed upstream.
  + debian/patches/004_git_dont_setup_timeout_twice.patch:
    - New patch from upstream git, don't setup a timeout in
      gtkspinners twice.
  + debian/patches/070_mandatory-relibtoolize.patch:
    - Updated.
  + debian/libgtk3.0-0.symbols:
    - Updated.
This commit is contained in:
Emilio Pozuelo Monfort
2010-11-30 22:36:45 +00:00
parent 017bd3091b
commit 3b1645f9a1
6 changed files with 4388 additions and 7831 deletions

15
debian/changelog vendored
View File

@ -1,3 +1,18 @@
gtk+3.0 (2.91.5-1) experimental; urgency=low
* New upstream release.
+ debian/patches/004_gtk_gir_build.patch:
- Removed, fixed upstream.
+ debian/patches/004_git_dont_setup_timeout_twice.patch:
- New patch from upstream git, don't setup a timeout in
gtkspinners twice.
+ debian/patches/070_mandatory-relibtoolize.patch:
- Updated.
+ debian/libgtk3.0-0.symbols:
- Updated.
-- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 30 Nov 2010 23:13:17 +0100
gtk+3.0 (2.91.4-2) experimental; urgency=low gtk+3.0 (2.91.4-2) experimental; urgency=low
[ Laurent Bigonville ] [ Laurent Bigonville ]

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,33 @@
From 8076dbfb5c9b358642b43a82bda36e649b0fe038 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue, 30 Nov 2010 15:59:49 +0100
Subject: [PATCH] gtkspinner: don't setup the timeout twice (#636129)
---
gtk/gtkspinner.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index 802689d..2af87b0 100644
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -293,6 +293,7 @@ gtk_spinner_add_timeout (GtkSpinner *spinner)
priv = spinner->priv;
+ g_assert (priv->timeout == 0);
priv->timeout = gdk_threads_add_timeout ((guint) priv->cycle_duration / priv->num_steps, gtk_spinner_timeout, spinner);
}
@@ -315,7 +316,7 @@ gtk_spinner_map (GtkWidget *widget)
GTK_WIDGET_CLASS (gtk_spinner_parent_class)->map (widget);
- if (priv->active)
+ if (priv->active && priv->timeout == 0)
gtk_spinner_add_timeout (spinner);
}
--
1.7.1

View File

@ -1,11 +0,0 @@
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -916,7 +916,7 @@
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
Gtk_3_0_gir_LIBS = $(gtktargetlib)
if USE_X11
-Gtk_3_0_gir_LIBS += $(top_builddir)/gdk/x11/libgdk-x11.la
+Gtk_3_0_gir_LIBS += $(top_builddir)/gdk/libgdk-x11-3.0.la
endif
Gtk_3_0_gir_FILES = $(introspection_files)
INTROSPECTION_GIRS += Gtk-3.0.gir

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
001_static-linking-dont-query-immodules.patch 001_static-linking-dont-query-immodules.patch
002_static-linking-dont-build-perf.patch 002_static-linking-dont-build-perf.patch
003_gdk.pc_privates.patch 003_gdk.pc_privates.patch
004_gtk_gir_build.patch 004_git_dont_setup_timeout_twice.patch
005_support_disabling_x11_extensions.patch 005_support_disabling_x11_extensions.patch
015_default-fallback-icon-theme.patch 015_default-fallback-icon-theme.patch
022_disable-viqr-im-for-vi-locale.patch 022_disable-viqr-im-for-vi-locale.patch