From 1003ed6c44dcb26e4b2fb3a790c4b8e039340680 Mon Sep 17 00:00:00 2001 From: Andreas Henriksson Date: Wed, 30 Mar 2016 10:35:28 +0000 Subject: [PATCH] * New upstream release. * Drop debian/patches/git_a11y_GTK_CSD_distcheck.patch, included in release. * Add debian/patches/git_fix_emacs.patch, cherry-picked from upstream git. Thanks to Matteo F. Vescovi for verifying the commit fixed the emacs problem. --- debian/changelog | 9 ++++++ .../patches/git_a11y_GTK_CSD_distcheck.patch | 26 --------------- debian/patches/git_fix_emacs.patch | 32 +++++++++++++++++++ debian/patches/series | 2 +- 4 files changed, 42 insertions(+), 27 deletions(-) delete mode 100644 debian/patches/git_a11y_GTK_CSD_distcheck.patch create mode 100644 debian/patches/git_fix_emacs.patch diff --git a/debian/changelog b/debian/changelog index 1f4b955413..8a290d9569 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +gtk+3.0 (3.20.1-1) experimental; urgency=medium + + * New upstream release. + * Drop debian/patches/git_a11y_GTK_CSD_distcheck.patch, included in release. + * Add debian/patches/git_fix_emacs.patch, cherry-picked from upstream git. + Thanks to Matteo F. Vescovi for verifying the commit fixed the emacs problem. + + -- Andreas Henriksson Wed, 30 Mar 2016 11:08:26 +0200 + gtk+3.0 (3.20.0-1) experimental; urgency=medium * New upstream release. diff --git a/debian/patches/git_a11y_GTK_CSD_distcheck.patch b/debian/patches/git_a11y_GTK_CSD_distcheck.patch deleted file mode 100644 index c533506d2e..0000000000 --- a/debian/patches/git_a11y_GTK_CSD_distcheck.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d6ca66b712bcd2810498aec560cd01e42880f647 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Tue, 22 Mar 2016 14:55:55 -0400 -Subject: Run a11y tests with csd for make check - -I've made this change for installed tests a while ago. It doesn't -make sense for distcheck to do it differently. ---- - testsuite/a11y/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testsuite/a11y/Makefile.am b/testsuite/a11y/Makefile.am -index 1d9fc05..9fd1fc0 100644 ---- a/testsuite/a11y/Makefile.am -+++ b/testsuite/a11y/Makefile.am -@@ -25,6 +25,7 @@ LDADD = \ - TESTS_ENVIRONMENT = \ - GIO_USE_VOLUME_MONITOR=unix \ - GSETTINGS_BACKEND=memory \ -+ GTK_CSD=1 \ - G_ENABLE_DIAGNOSTIC=0 - - TEST_PROGS += accessibility-dump --- -cgit v0.12 - diff --git a/debian/patches/git_fix_emacs.patch b/debian/patches/git_fix_emacs.patch new file mode 100644 index 0000000000..1395d029fb --- /dev/null +++ b/debian/patches/git_fix_emacs.patch @@ -0,0 +1,32 @@ +From 8206b824fa3cba5cbc7ddec0a1ccec7828f37dc5 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Sat, 26 Mar 2016 09:32:51 -0400 +Subject: Make gdk_visual_get_*_pixel_details work again + +These functions are supposed to return the numbers of consecutive +1 bits in each components mask as precision. However, due to a +copy-paste mistake when this code was moved around in +commit 70d689cddda0dc616af97e8ed047d0c0acf7c7a6, the precision +was always reported as zero. This affects only a few applications +that directly set window background on X11 windows, such as emacs. + +https://bugzilla.gnome.org/show_bug.cgi?id=764210 +--- + gdk/gdkvisual.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/gdk/gdkvisual.c b/gdk/gdkvisual.c +index d580c6b..356ea19 100644 +--- a/gdk/gdkvisual.c ++++ b/gdk/gdkvisual.c +@@ -371,7 +371,6 @@ gdk_visual_get_pixel_details (GdkVisual *visual, + m >>= 1; + } + +- m = pixel_mask; + while (m & 0x1) + { + p++; +-- +cgit v0.12 + diff --git a/debian/patches/series b/debian/patches/series index ad41ac6c06..7a7693ed2a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,5 +6,5 @@ 032_mips_treeview_row_separator_height.patch 060_ignore-random-icons.patch 071_fix-installation-of-HTML-images.patch -git_a11y_GTK_CSD_distcheck.patch no-accessibility-dump.patch +git_fix_emacs.patch