From ca10030120b0c55735c3d389f87687e2e248d234 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Wed, 7 Mar 2012 18:52:30 +0000 Subject: [PATCH 01/17] * debian/libgtk-3-0.install.in: - install the settings.ini * debian/patches/015_default-fallback-icon-theme.patch: - dropped in favor of the settings.in configuration * debian/settings.in: - define default themes there, it's better than hardcoding --- debian/changelog | 11 +++++++++++ debian/libgtk-3-0.install.in | 1 + .../patches/015_default-fallback-icon-theme.patch | 13 ------------- debian/patches/series | 1 - debian/settings.ini | 4 ++++ 5 files changed, 16 insertions(+), 14 deletions(-) delete mode 100644 debian/patches/015_default-fallback-icon-theme.patch create mode 100644 debian/settings.ini diff --git a/debian/changelog b/debian/changelog index a9127dea6f..0795bca6fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +gtk+3.0 (3.2.3-2) UNRELEASED; urgency=low + + * debian/libgtk-3-0.install.in: + - install the settings.ini + * debian/patches/015_default-fallback-icon-theme.patch: + - dropped in favor of the settings.in configuration + * debian/settings.in: + - define default themes there, it's better than hardcoding + + -- Sebastien Bacher Wed, 07 Mar 2012 19:48:38 +0100 + gtk+3.0 (3.2.3-1) unstable; urgency=low * New upstream release. diff --git a/debian/libgtk-3-0.install.in b/debian/libgtk-3-0.install.in index 0ed121a317..c100a3de23 100644 --- a/debian/libgtk-3-0.install.in +++ b/debian/libgtk-3-0.install.in @@ -5,3 +5,4 @@ debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/imm debian/install/shared/@MODULES_BASE_PATH@/printbackends/*.so @MODULES_BASE_PATH@/printbackends debian/install/shared/@LIBDIR@/libgtk*.so.* @LIBDIR@ debian/install/shared/@LIBDIR@/libgdk*.so.* @LIBDIR@ +debian/settings.ini @CONFDIR@ diff --git a/debian/patches/015_default-fallback-icon-theme.patch b/debian/patches/015_default-fallback-icon-theme.patch deleted file mode 100644 index 689a434029..0000000000 --- a/debian/patches/015_default-fallback-icon-theme.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gtk+-3.2.2/gtk/gtksettings.c -=================================================================== ---- gtk+-3.2.2.orig/gtk/gtksettings.c 2011-11-11 23:39:31.000000000 +0100 -+++ gtk+-3.2.2/gtk/gtksettings.c 2011-11-13 02:59:24.326906185 +0100 -@@ -408,7 +408,7 @@ - g_param_spec_string ("gtk-fallback-icon-theme", - P_("Fallback Icon Theme Name"), - P_("Name of a icon theme to fall back to"), -- NULL, -+ "gnome", - GTK_PARAM_READWRITE), - NULL); - g_assert (result == PROP_FALLBACK_ICON_THEME); diff --git a/debian/patches/series b/debian/patches/series index 86530f2b4b..9aab05bb39 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ 001_static-linking-dont-query-immodules.patch 003_gdk.pc_privates.patch -015_default-fallback-icon-theme.patch 016_no_offscreen_widgets_grabbing.patch 017_no_offscreen_device_grabbing.patch 018_gdkenumtypes.c_location.patch diff --git a/debian/settings.ini b/debian/settings.ini new file mode 100644 index 0000000000..ffcbde4856 --- /dev/null +++ b/debian/settings.ini @@ -0,0 +1,4 @@ +[Settings] +gtk-theme-name = Adwaita +gtk-fallback-icon-theme = gnome + From 9b34bd1a03ff23852399b66d32481f01b62e6fe8 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 19 Apr 2012 00:46:20 +0000 Subject: [PATCH 02/17] Upload to unstable. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 18346494a2..7f3ff5357d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gtk+3.0 (3.4.1-2) UNRELEASED; urgency=low + + * Upload to unstable. + + -- Michael Biebl Thu, 19 Apr 2012 02:46:04 +0200 + gtk+3.0 (3.4.1-1) experimental; urgency=low [ Josselin Mouette ] From 06b8b5bae9fdbb4169376f817691b760435db0b3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 19 Apr 2012 00:46:58 +0000 Subject: [PATCH 03/17] Release version 3.4.1-2 to unstable --- debian/changelog | 4 ++-- debian/control | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f3ff5357d..2aa0c19539 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -gtk+3.0 (3.4.1-2) UNRELEASED; urgency=low +gtk+3.0 (3.4.1-2) unstable; urgency=low * Upload to unstable. - -- Michael Biebl Thu, 19 Apr 2012 02:46:04 +0200 + -- Michael Biebl Thu, 19 Apr 2012 02:46:25 +0200 gtk+3.0 (3.4.1-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 17687ebd5e..1adac1c1b6 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: gtk+3.0 Section: libs Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Josselin Mouette , Michael Biebl , Sjoerd Simons +Uploaders: Michael Biebl , Sjoerd Simons Build-Depends: debhelper (>= 8.1.3), cdbs (>= 0.4.93), gnome-pkg-tools (>= 0.11), From 493f81c312a35ddf47b514d0366a1db0f26a858d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 25 Apr 2012 01:55:01 +0000 Subject: [PATCH 04/17] Simplify shlibs version information for libgail-3-0 and no longer create a dependency on libgail-3-common, this package has been dropped in 3.2. --- debian/changelog | 7 +++++++ debian/rules | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2aa0c19539..63f30bfb3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gtk+3.0 (3.4.1-3) UNRELEASED; urgency=low + + * Simplify shlibs version information for libgail-3-0 and no longer create a + dependency on libgail-3-common, this package has been dropped in 3.2. + + -- Michael Biebl Wed, 25 Apr 2012 03:50:54 +0200 + gtk+3.0 (3.4.1-2) unstable; urgency=low * Upload to unstable. diff --git a/debian/rules b/debian/rules index 8e7adff0e2..b225a9308d 100644 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,6 @@ LDFLAGS += -Wl,-O1 APIVER := 3 SONAME := 0 -SHVER := 3.3.18 LIBDIR := usr/lib/$(DEB_HOST_MULTIARCH) @@ -78,7 +77,7 @@ DEB_INSTALL_DOCS_$(COMMON_PKG) = README NEWS DEB_INSTALL_DOCS_$(DOC_PKG) += -X.in DEB_DH_MAKESHLIBS_ARGS_ALL += -X$(MODULES_BASE_PATH) DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V --add-udeb=$(UDEB_PKG) -- -c4 -DEB_DH_MAKESHLIBS_ARGS_libgail-3-0 += -V"libgail-3-0 (>= $(SHVER)), libgail-3-common (>= $(SHVER))" -- -c4 +DEB_DH_MAKESHLIBS_ARGS_libgail-3-0 += -V -- -c4 DEB_DH_FIXPERMS_ARGS_ALL += -X$(LIBDIR)/$(SHARED_PKG) DEB_DH_STRIP_ARGS = --dbg-package=$(if $(findstring libgail,$(cdbs_curpkg)),libgail-3-0-dbg,$(DEBUG_PKG)) DEB_DH_STRIP_ARGS_$(UDEB_PKG) = From db4b030299e11ad8f6e4801229ad1ddda23ccccb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 10 May 2012 12:10:55 +0000 Subject: [PATCH 05/17] Update to 3.4.2 --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 63f30bfb3c..69eabe302e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -gtk+3.0 (3.4.1-3) UNRELEASED; urgency=low +gtk+3.0 (3.4.2-1) UNRELEASED; urgency=low + * New upstream release. * Simplify shlibs version information for libgail-3-0 and no longer create a dependency on libgail-3-common, this package has been dropped in 3.2. - -- Michael Biebl Wed, 25 Apr 2012 03:50:54 +0200 + -- Michael Biebl Fri, 04 May 2012 04:56:23 +0200 gtk+3.0 (3.4.1-2) unstable; urgency=low From d540451506cc2290afceeda1806e63b7d487de7a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 10 May 2012 12:44:45 +0000 Subject: [PATCH 06/17] Release version 3.4.2-1 to unstable --- debian/changelog | 4 ++-- debian/control | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 69eabe302e..f1465b253b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -gtk+3.0 (3.4.2-1) UNRELEASED; urgency=low +gtk+3.0 (3.4.2-1) unstable; urgency=low * New upstream release. * Simplify shlibs version information for libgail-3-0 and no longer create a dependency on libgail-3-common, this package has been dropped in 3.2. - -- Michael Biebl Fri, 04 May 2012 04:56:23 +0200 + -- Michael Biebl Thu, 10 May 2012 14:44:28 +0200 gtk+3.0 (3.4.1-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 1adac1c1b6..a32c43396d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: gtk+3.0 Section: libs Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Michael Biebl , Sjoerd Simons +Uploaders: Michael Biebl Build-Depends: debhelper (>= 8.1.3), cdbs (>= 0.4.93), gnome-pkg-tools (>= 0.11), From 8c55897c00e776cd8eebe2decf00db78cbae37b9 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 30 Jun 2012 15:00:13 +0000 Subject: [PATCH 07/17] debian/patches/072_statusicon_icon_size.patch: Fix how we determine the icon size for the statusicon. This could lead to a crash in notification-daemon caused by an assertion failure. Closes: #669883 Thanks to Fernando Lemos for the patch and Brad Jorsch for the excellent debugging. --- debian/changelog | 10 ++++ debian/patches/072_statusicon_icon_size.patch | 47 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 58 insertions(+) create mode 100644 debian/patches/072_statusicon_icon_size.patch diff --git a/debian/changelog b/debian/changelog index f1465b253b..7bc8579cc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +gtk+3.0 (3.4.2-2) UNRELEASED; urgency=low + + * debian/patches/072_statusicon_icon_size.patch: Fix how we determine the + icon size for the statusicon. This could lead to a crash in + notification-daemon caused by an assertion failure. Closes: #669883 + Thanks to Fernando Lemos for the patch and Brad Jorsch for the excellent + debugging. + + -- Michael Biebl Sat, 30 Jun 2012 16:48:53 +0200 + gtk+3.0 (3.4.2-1) unstable; urgency=low * New upstream release. diff --git a/debian/patches/072_statusicon_icon_size.patch b/debian/patches/072_statusicon_icon_size.patch new file mode 100644 index 0000000000..4a102f941c --- /dev/null +++ b/debian/patches/072_statusicon_icon_size.patch @@ -0,0 +1,47 @@ +From b4f092f17d93a9343c917e3a20b906b693965bda Mon Sep 17 00:00:00 2001 +From: Fernando Lemos +Date: Tue, 15 May 2012 10:28:37 -0400 +Subject: [PATCH] statusicon: use absolute delta to find the nearest icon size + +Otherwise, if we only look at (pixel_size - stock_size), we miss the +case when the pixel size is smaller than any provided stock size. + +https://bugzilla.gnome.org/show_bug.cgi?id=673749 + +statusicon: Fix implicit declaration warning + +gtkstatusicon.c:1333:4: warning: implicit declaration of function 'abs' [-Wimplicit-function-declaration] + +Added in commit c8378099600e4279cb5c608b546bbe778c451233 +--- + gtk/gtkstatusicon.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c +index 8bcb638..5c8a591 100644 +--- a/gtk/gtkstatusicon.c ++++ b/gtk/gtkstatusicon.c +@@ -28,6 +28,7 @@ + #include "config.h" + + #include ++#include + + #include "gtkstatusicon.h" + +@@ -1328,10 +1329,9 @@ round_pixel_size (GtkWidget *widget, + + for (s = GTK_ICON_SIZE_MENU; s <= GTK_ICON_SIZE_DIALOG; s++) + { +- if (gtk_icon_size_lookup_for_settings (settings, s, &w, &h) && +- w <= pixel_size && h <= pixel_size) ++ if (gtk_icon_size_lookup_for_settings (settings, s, &w, &h)) + { +- d = MAX (pixel_size - w, pixel_size - h); ++ d = MAX (abs (pixel_size - w), abs (pixel_size - h)); + if (d < dist) + { + dist = d; +-- +1.7.10 + diff --git a/debian/patches/series b/debian/patches/series index 6607db83aa..b69590380b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ 061_multiarch_module_fallback.patch 070_revert-widget-set-up-signals-after-initializing.patch 071_fix-installation-of-HTML-images.patch +072_statusicon_icon_size.patch From ef1bd689d4a2d4c4db8c2e37208560f89eefcad0 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 30 Jun 2012 15:03:22 +0000 Subject: [PATCH 08/17] Release version 3.4.2-2 to unstable --- debian/changelog | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7bc8579cc7..3b0d4a8777 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,12 @@ -gtk+3.0 (3.4.2-2) UNRELEASED; urgency=low +gtk+3.0 (3.4.2-2) unstable; urgency=low * debian/patches/072_statusicon_icon_size.patch: Fix how we determine the - icon size for the statusicon. This could lead to a crash in - notification-daemon caused by an assertion failure. Closes: #669883 + icon size for the statusicon. This fixes a crash in notification-daemon + which was caused by an assertion failure. Closes: #669883 Thanks to Fernando Lemos for the patch and Brad Jorsch for the excellent debugging. - -- Michael Biebl Sat, 30 Jun 2012 16:48:53 +0200 + -- Michael Biebl Sat, 30 Jun 2012 17:01:38 +0200 gtk+3.0 (3.4.2-1) unstable; urgency=low From b34e8f698205e5664183fa86521e951e9a6899ed Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Fri, 6 Jul 2012 09:29:07 +0000 Subject: [PATCH 09/17] Update xrandr epoch. --- debian/changelog | 6 ++++++ debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3b0d4a8777..fbc1b36b90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gtk+3.0 (3.4.2-3) UNRELEASED; urgency=low + + * Update xrandr epoch. + + -- Josselin Mouette Fri, 06 Jul 2012 10:45:56 +0200 + gtk+3.0 (3.4.2-2) unstable; urgency=low * debian/patches/072_statusicon_icon_size.patch: Fix how we determine the diff --git a/debian/control b/debian/control index a32c43396d..8b31f32efb 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 8.1.3), libx11-dev (>= 2:1.3.3-2), libxext-dev (>= 2:1.1.1-3), libxi-dev (>= 2:1.3-4), - libxrandr-dev (>= 1:1.2.99), + libxrandr-dev (>= 2:1.2.99), libxt-dev, libxrender-dev (>= 1:0.9.5-2), libxft-dev, diff --git a/debian/control.in b/debian/control.in index 7ac9074b19..d6f48bc90b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 8.1.3), libx11-dev (>= 2:1.3.3-2), libxext-dev (>= 2:1.1.1-3), libxi-dev (>= 2:1.3-4), - libxrandr-dev (>= 1:1.2.99), + libxrandr-dev (>= 2:1.2.99), libxt-dev, libxrender-dev (>= 1:0.9.5-2), libxft-dev, From bf1c205456106fc87a98cd700c07981fe05e5e15 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 6 Aug 2012 16:04:46 +0000 Subject: [PATCH 10/17] debian/libgtk-3-0.postrm.in: Drop "rm -rf /etc/gtk-3.0/" on purge since this removes files owned by libgtk-3-common. Those bits were copied over from the gtk+2.0 package but they are actually obsolete and no longer required. Closes: #681198 --- debian/changelog | 11 +++++++++-- debian/libgtk-3-0.postrm.in | 6 ------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index fbc1b36b90..7db670c881 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,15 @@ -gtk+3.0 (3.4.2-3) UNRELEASED; urgency=low +gtk+3.0 (3.4.2-4) UNRELEASED; urgency=low + [ Josselin Mouette ] * Update xrandr epoch. - -- Josselin Mouette Fri, 06 Jul 2012 10:45:56 +0200 + [ Michael Biebl ] + * debian/libgtk-3-0.postrm.in: Drop "rm -rf /etc/gtk-3.0/" on purge since + this removes files owned by libgtk-3-common. Those bits were copied over + from the gtk+2.0 package but they are actually obsolete and no longer + required. Closes: #681198 + + -- Michael Biebl Mon, 06 Aug 2012 18:00:10 +0200 gtk+3.0 (3.4.2-2) unstable; urgency=low diff --git a/debian/libgtk-3-0.postrm.in b/debian/libgtk-3-0.postrm.in index 1f8bb0f67c..7caff6b607 100644 --- a/debian/libgtk-3-0.postrm.in +++ b/debian/libgtk-3-0.postrm.in @@ -2,12 +2,6 @@ set -e -case "$1" in - purge) - rm -rf /@CONFDIR@ - ;; -esac - #DEBHELPER# if [ -d /@MODULES_BASE_PATH@ ]; then From ba6ec6492a8a791011ffd700bca1aeaab93c27ed Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 6 Aug 2012 16:45:40 +0000 Subject: [PATCH 11/17] debian/patches/073_transparent_colors.patch: Handle transparent colors better in GtkStyle emulation. Patch cherry-picked from upstream Git. Closes: #669694 --- debian/changelog | 3 ++ debian/patches/073_transparent_colors.patch | 33 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 37 insertions(+) create mode 100644 debian/patches/073_transparent_colors.patch diff --git a/debian/changelog b/debian/changelog index 7db670c881..3716c17ab8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ gtk+3.0 (3.4.2-4) UNRELEASED; urgency=low this removes files owned by libgtk-3-common. Those bits were copied over from the gtk+2.0 package but they are actually obsolete and no longer required. Closes: #681198 + * debian/patches/073_transparent_colors.patch: Handle transparent colors + better in GtkStyle emulation. Patch cherry-picked from upstream Git. + Closes: #669694 -- Michael Biebl Mon, 06 Aug 2012 18:00:10 +0200 diff --git a/debian/patches/073_transparent_colors.patch b/debian/patches/073_transparent_colors.patch new file mode 100644 index 0000000000..80ae3e20ec --- /dev/null +++ b/debian/patches/073_transparent_colors.patch @@ -0,0 +1,33 @@ +From 72feb95edb6ab8c3fac27c0c32afeb2b2f61bd1c Mon Sep 17 00:00:00 2001 +From: Alexander Larsson +Date: Thu, 28 Jun 2012 19:30:24 +0000 +Subject: Handle transparent colors better in GtkStyle emulation + +We can't expose colors with alpha in the GtkStyle colors, since +GdkColor has no alpha. Currently we throw away alpha completely, +which fails very badly for completely transparent backgrounds, +which now is the default for most widgets, as it typically +end up with black-on-black. + +We handle this by falling back on the default/previous colors for +transparent colors. This is is simple and avoids complete failure. + +https://bugzilla.gnome.org/show_bug.cgi?id=671437 + +(cherry picked from commit 10423726709539724be0ea19bed76ba4331af774) +--- +diff --git a/gtk/deprecated/gtkstyle.c b/gtk/deprecated/gtkstyle.c +index 5266368..16e3ce4 100644 +--- a/gtk/deprecated/gtkstyle.c ++++ b/gtk/deprecated/gtkstyle.c +@@ -673,7 +673,7 @@ set_color (GtkStyle *style, + break; + } + +- if (color) ++ if (color && color->alpha > 0.01) + { + dest->pixel = 0; + dest->red = CLAMP ((guint) (color->red * 65535), 0, 65535); +-- +cgit v0.9.0.2 diff --git a/debian/patches/series b/debian/patches/series index b69590380b..f1a5079997 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ 070_revert-widget-set-up-signals-after-initializing.patch 071_fix-installation-of-HTML-images.patch 072_statusicon_icon_size.patch +073_transparent_colors.patch From da79680fd43bb635051c0bb20c6b18eb1f74b6c3 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 6 Aug 2012 18:25:34 +0000 Subject: [PATCH 12/17] debian/patches/070_revert-widget-set-up-signals-after-initializing.patch: This patch was a temporary workaround for a bug in mutter which has been fixed in version 3.4. It was not supposed to be shipped as part of wheezy, so drop it again. --- debian/changelog | 4 ++ ...et-set-up-signals-after-initializing.patch | 38 ------------------- debian/patches/series | 1 - 3 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 debian/patches/070_revert-widget-set-up-signals-after-initializing.patch diff --git a/debian/changelog b/debian/changelog index 3716c17ab8..58369e64c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ gtk+3.0 (3.4.2-4) UNRELEASED; urgency=low * debian/patches/073_transparent_colors.patch: Handle transparent colors better in GtkStyle emulation. Patch cherry-picked from upstream Git. Closes: #669694 + * debian/patches/070_revert-widget-set-up-signals-after-initializing.patch: + This patch was a temporary workaround for a bug in mutter which has been + fixed in version 3.4. It was not supposed to be shipped as part of wheezy, + so drop it again. -- Michael Biebl Mon, 06 Aug 2012 18:00:10 +0200 diff --git a/debian/patches/070_revert-widget-set-up-signals-after-initializing.patch b/debian/patches/070_revert-widget-set-up-signals-after-initializing.patch deleted file mode 100644 index c795c43d3e..0000000000 --- a/debian/patches/070_revert-widget-set-up-signals-after-initializing.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 502d6cb9bc75370ed0692849c65c89d52e818a96 Mon Sep 17 00:00:00 2001 -From: Michael Biebl -Date: Wed, 28 Mar 2012 06:10:17 +0200 -Subject: [PATCH] Revert "widget: Set up signals after initializing style - context" - -This reverts commit 5d579811843f81db9866ac81afc5297f776cfb3b. - -This change breaks the window decorations in gnome-shell resp. mutter 3.2. -It can be dropped again, once GNOME 3.4 is in unstable. ---- - gtk/gtkwidget.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -Index: gtk+-3.4.1/gtk/gtkwidget.c -=================================================================== ---- gtk+-3.4.1.orig/gtk/gtkwidget.c 2012-04-13 02:31:42.000000000 +0200 -+++ gtk+-3.4.1/gtk/gtkwidget.c 2012-04-15 20:55:33.278308259 +0200 -@@ -14119,6 +14119,9 @@ - - gtk_style_context_set_direction (priv->context, gtk_widget_get_direction (widget)); - -+ g_signal_connect (widget->priv->context, "changed", -+ G_CALLBACK (style_context_changed), widget); -+ - screen = gtk_widget_get_screen (widget); - if (screen) - gtk_style_context_set_screen (priv->context, screen); -@@ -14127,9 +14130,6 @@ - if (priv->parent) - gtk_style_context_set_parent (priv->context, - gtk_widget_get_style_context (priv->parent)); -- -- g_signal_connect (widget->priv->context, "changed", -- G_CALLBACK (style_context_changed), widget); - } - - return widget->priv->context; diff --git a/debian/patches/series b/debian/patches/series index f1a5079997..0dd583c0b1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,7 +8,6 @@ 044_tracker_fts.patch 060_ignore-random-icons.patch 061_multiarch_module_fallback.patch -070_revert-widget-set-up-signals-after-initializing.patch 071_fix-installation-of-HTML-images.patch 072_statusicon_icon_size.patch 073_transparent_colors.patch From 30913ab94eb1e2e6316a80a03ddd20ff458a29cb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 6 Aug 2012 19:40:25 +0000 Subject: [PATCH 13/17] If the NEWS or README file is larger than 4k in size append a .gz suffix as dh_compress will compress those files. This avoids dangling symlinks. Closes: #679754 --- debian/changelog | 3 +++ debian/libgtk-3-0-dbg.links.in | 4 ++-- debian/libgtk-3-0.links.in | 4 ++-- debian/libgtk-3-bin.links.in | 4 ++-- debian/libgtk-3-dev.links.in | 4 ++-- debian/rules | 7 +++++++ 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 58369e64c3..5ca442b58f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ gtk+3.0 (3.4.2-4) UNRELEASED; urgency=low This patch was a temporary workaround for a bug in mutter which has been fixed in version 3.4. It was not supposed to be shipped as part of wheezy, so drop it again. + * If the NEWS or README file is larger than 4k in size append a .gz suffix + as dh_compress will compress those files. This avoids dangling symlinks. + Closes: #679754 -- Michael Biebl Mon, 06 Aug 2012 18:00:10 +0200 diff --git a/debian/libgtk-3-0-dbg.links.in b/debian/libgtk-3-0-dbg.links.in index bb86f76b08..a3b90537c8 100644 --- a/debian/libgtk-3-0-dbg.links.in +++ b/debian/libgtk-3-0-dbg.links.in @@ -1,2 +1,2 @@ -usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@DEBUG_PKG@/NEWS.gz -usr/share/doc/@COMMON_PKG@/README usr/share/doc/@DEBUG_PKG@/README +usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@DEBUG_PKG@/@NEWS@ +usr/share/doc/@COMMON_PKG@/@README@ usr/share/doc/@DEBUG_PKG@/@README@ diff --git a/debian/libgtk-3-0.links.in b/debian/libgtk-3-0.links.in index 122eee42b5..8c713974da 100644 --- a/debian/libgtk-3-0.links.in +++ b/debian/libgtk-3-0.links.in @@ -1,2 +1,2 @@ -usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@SHARED_PKG@/NEWS.gz -usr/share/doc/@COMMON_PKG@/README usr/share/doc/@SHARED_PKG@/README +usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@SHARED_PKG@/@NEWS@ +usr/share/doc/@COMMON_PKG@/@README@ usr/share/doc/@SHARED_PKG@/@README@ diff --git a/debian/libgtk-3-bin.links.in b/debian/libgtk-3-bin.links.in index a64f0f0fb9..cc7a501dbe 100644 --- a/debian/libgtk-3-bin.links.in +++ b/debian/libgtk-3-bin.links.in @@ -1,3 +1,3 @@ @LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache-3.0 usr/bin/gtk-update-icon-cache-3.0 -usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@BIN_PKG@/NEWS.gz -usr/share/doc/@COMMON_PKG@/README usr/share/doc/@BIN_PKG@/README +usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@BIN_PKG@/@NEWS@ +usr/share/doc/@COMMON_PKG@/@README@ usr/share/doc/@BIN_PKG@/@README@ diff --git a/debian/libgtk-3-dev.links.in b/debian/libgtk-3-dev.links.in index 3fc53d9089..907fd969c2 100644 --- a/debian/libgtk-3-dev.links.in +++ b/debian/libgtk-3-dev.links.in @@ -1,2 +1,2 @@ -usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@DEV_PKG@/NEWS.gz -usr/share/doc/@COMMON_PKG@/README usr/share/doc/@DEV_PKG@/README +usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@DEV_PKG@/@NEWS@ +usr/share/doc/@COMMON_PKG@/@README@ usr/share/doc/@DEV_PKG@/@README@ diff --git a/debian/rules b/debian/rules index b225a9308d..64c1508435 100644 --- a/debian/rules +++ b/debian/rules @@ -49,6 +49,11 @@ BIN_PKG := libgtk-$(APIVER)-bin DEBUG_PKG := $(SHARED_PKG)-dbg EXAMPLES_PKG := gtk-$(APIVER)-examples +# files larger than 4k in size will be compressed by dh_compress +# so append a .gz suffix to avoid dangling symlinks +NEWS := NEWS$(shell find -maxdepth 1 -size +4k -name NEWS -exec echo ".gz" \;) +README := README$(shell find -maxdepth 1 -size +4k -name README -exec echo ".gz" \;) + DEB_DH_INSTALL_ARGS += --sourcedir=debian/install/shared DEB_DH_INSTALL_ARGS_$(UDEB_PKG) += --sourcedir=debian/install/shared_udeb @@ -107,6 +112,8 @@ debian/%: debian/%.in -e 's#@CONFDIR@#$(CONFDIR)#g' \ -e "s#@MODULES_BASE_PATH@#$(MODULES_BASE_PATH)#g" \ -e "s#@OLD_MODULES_BASE_PATH@#$(OLD_MODULES_BASE_PATH)#g" \ + -e "s#@NEWS@#$(NEWS)#g" \ + -e "s#@README@#$(README)#g" \ $@.in > $@ clean:: debian/control From ff0adbc77fa7cfc5cdbcde74e844a5372e8a3145 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 6 Aug 2012 19:41:08 +0000 Subject: [PATCH 14/17] Release version 3.4.2-4 to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ca442b58f..ef6c88e232 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gtk+3.0 (3.4.2-4) UNRELEASED; urgency=low +gtk+3.0 (3.4.2-4) unstable; urgency=low [ Josselin Mouette ] * Update xrandr epoch. @@ -19,7 +19,7 @@ gtk+3.0 (3.4.2-4) UNRELEASED; urgency=low as dh_compress will compress those files. This avoids dangling symlinks. Closes: #679754 - -- Michael Biebl Mon, 06 Aug 2012 18:00:10 +0200 + -- Michael Biebl Mon, 06 Aug 2012 21:40:53 +0200 gtk+3.0 (3.4.2-2) unstable; urgency=low From 52f6305a9f086a654bdcb0f77643302d651d0083 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 6 Aug 2012 20:08:24 +0000 Subject: [PATCH 15/17] Fix debian revision --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ef6c88e232..a5922d5ca8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gtk+3.0 (3.4.2-4) unstable; urgency=low +gtk+3.0 (3.4.2-3) unstable; urgency=low [ Josselin Mouette ] * Update xrandr epoch. From f2dc11801bdc1d9d452ff84108cb16c0726324bd Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 21 Sep 2012 16:30:36 +0000 Subject: [PATCH 16/17] debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch: With xkb-data 2.5.1-2.1 preserving the Shift modifier, GTK+ can properly map F10 and Shift-F10 to different key bindings. Closes: #658392 --- debian/changelog | 8 +++ ...er-to-discriminate-Shift-F10-and-F10.patch | 69 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 78 insertions(+) create mode 100644 debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch diff --git a/debian/changelog b/debian/changelog index a5922d5ca8..c96865e129 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gtk+3.0 (3.4.2-4) UNRELEASED; urgency=low + + * debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch: + With xkb-data 2.5.1-2.1 preserving the Shift modifier, GTK+ can properly + map F10 and Shift-F10 to different key bindings. Closes: #658392 + + -- Michael Biebl Fri, 21 Sep 2012 18:20:47 +0200 + gtk+3.0 (3.4.2-3) unstable; urgency=low [ Josselin Mouette ] diff --git a/debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch b/debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch new file mode 100644 index 0000000000..95ee4b39a7 --- /dev/null +++ b/debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch @@ -0,0 +1,69 @@ +From 314b6abbe8d8daae1e2de50b15cc9b6553af1f3d Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Sat, 1 Sep 2012 22:51:18 -0400 +Subject: [PATCH] Try harder to discriminate Shift-F10 and F10 + +A change in xkeyboard-config 2.4.1 made it so that function keys +now have a shift level which has the same symbol, but 'eats' the +shift modifier. This would ordinarily make it impossible for us +to discriminate between these key combinations. + +This commit tries harder to discriminate in 2 ways: +- XKB has a mechanism to tell us when a modifier should not be + consumed even though it was used in determining the level. + We now respect such 'preserved' modifiers. This does not fix + the Shift-F10 vs F10 problem yet, since xkeyboard-config does + not currently mark Shift as preserved for function keys. +- Don't consume modifiers that do not change the symbol. For + the function keys, the symbol on the shift level is the same + as the base level, so we don't consider Shift consumed. + +For more background on the xkeyboard-config change, see +https://bugs.freedesktop.org/show_bug.cgi?id=45008 + +https://bugzilla.gnome.org/show_bug.cgi?id=661973 +--- + gdk/x11/gdkkeys-x11.c | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) + +Index: gtk+-3.4.2/gdk/x11/gdkkeys-x11.c +=================================================================== +--- gtk+-3.4.2.orig/gdk/x11/gdkkeys-x11.c 2012-05-02 14:05:07.000000000 +0200 ++++ gtk+-3.4.2/gdk/x11/gdkkeys-x11.c 2012-09-04 03:05:24.621782410 +0200 +@@ -1113,6 +1113,8 @@ + int found = 0; + + for (i=0,entry=type->map;imap_count;i++,entry++) { ++ if (!entry->active) ++ continue; + if (mods_rtrn) { + int bits = 0; + unsigned long tmp = entry->mods.mask; +@@ -1123,14 +1125,22 @@ + } + /* We always add one-modifiers levels to mods_rtrn since + * they can't wipe out bits in the state unless the +- * level would be triggered. But return other modifiers +- * ++ * level would be triggered. But not if they don't change ++ * the symbol (otherwise we can't discriminate Shift-F10 ++ * and F10 anymore). And don't add modifiers that are ++ * explicitly marked as preserved, either. + */ +- if (bits == 1 || (mods&type->mods.mask)==entry->mods.mask) +- *mods_rtrn |= entry->mods.mask; ++ if ((bits == 1 && syms[col+entry->level] != syms[col]) || ++ (mods&type->mods.mask) == entry->mods.mask) ++ { ++ if (type->preserve) ++ *mods_rtrn |= (entry->mods.mask & ~type->preserve[i].mask); ++ else ++ *mods_rtrn |= entry->mods.mask; ++ } + } + +- if (!found&&entry->active&&((mods&type->mods.mask)==entry->mods.mask)) { ++ if (!found&&((mods&type->mods.mask)==entry->mods.mask)) { + col+= entry->level; + if (type->preserve) + preserve= type->preserve[i].mask; diff --git a/debian/patches/series b/debian/patches/series index 0dd583c0b1..98b67533af 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ 071_fix-installation-of-HTML-images.patch 072_statusicon_icon_size.patch 073_transparent_colors.patch +074_try-harder-to-discriminate-Shift-F10-and-F10.patch From 629e540945d7e4a88213cd120c251af5ff0b3b17 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 21 Sep 2012 16:30:55 +0000 Subject: [PATCH 17/17] Release version 3.4.2-4 to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c96865e129..882d106ecb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -gtk+3.0 (3.4.2-4) UNRELEASED; urgency=low +gtk+3.0 (3.4.2-4) unstable; urgency=low * debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch: With xkb-data 2.5.1-2.1 preserving the Shift modifier, GTK+ can properly map F10 and Shift-F10 to different key bindings. Closes: #658392 - -- Michael Biebl Fri, 21 Sep 2012 18:20:47 +0200 + -- Michael Biebl Fri, 21 Sep 2012 18:30:41 +0200 gtk+3.0 (3.4.2-3) unstable; urgency=low