r46147 - in /desktop/experimental/gtk+3.0/debian: changelog patches/git_bitmask-dont-hardcode-64bit-size.patch patches/series rules

[ah at users.alioth.debian.org]

Author: ah
Date: Sun Sep 27 13:36:24 2015
New Revision: 46147

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46147
Log:
* Add debian/patches/git_bitmask-dont-hardcode-64bit-size.patch
  - from upstream git. should fix test failure on i386, mips, mipsel.
* debian/rules: move --fail-missing to binary target instead of
  binary-indep to use it on full builds only. This should avoid
  breaking source-only uploads as the binary-indep (only) builds
  more then it needs to do (which is not installed anywhere).

Added:
    desktop/experimental/gtk+3.0/debian/patches/git_bitmask-dont-hardcode-64bit-size.patch
Modified:
    desktop/experimental/gtk+3.0/debian/changelog
    desktop/experimental/gtk+3.0/debian/patches/series
    desktop/experimental/gtk+3.0/debian/rules

Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=46147&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog	[utf-8] Sun Sep 27 13:36:24 2015
@@ -1,3 +1,14 @@
+gtk+3.0 (3.18.0-2) experimental; urgency=medium
+
+  * Add debian/patches/git_bitmask-dont-hardcode-64bit-size.patch
+    - from upstream git. should fix test failure on i386, mips, mipsel.
+  * debian/rules: move --fail-missing to binary target instead of
+    binary-indep to use it on full builds only. This should avoid
+    breaking source-only uploads as the binary-indep (only) builds
+    more then it needs to do (which is not installed anywhere).
+
+ -- Andreas Henriksson <andreas at fatal.se>  Sun, 27 Sep 2015 15:29:19 +0200
+
 gtk+3.0 (3.18.0-1) experimental; urgency=medium
 
   * Drop debian/patches/061_multiarch_module_fallback.patch

Added: desktop/experimental/gtk+3.0/debian/patches/git_bitmask-dont-hardcode-64bit-size.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/git_bitmask-dont-hardcode-64bit-size.patch?rev=46147&op=file
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/git_bitmask-dont-hardcode-64bit-size.patch	(added)
+++ desktop/experimental/gtk+3.0/debian/patches/git_bitmask-dont-hardcode-64bit-size.patch	[utf-8] Sun Sep 27 13:36:24 2015
@@ -0,0 +1,26 @@
+From 97293865b5c3e10fa65009e5f787312a17f47b06 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57 at ubuntu.com>
+Date: Sun, 27 Sep 2015 15:10:15 +0200
+Subject: bitmask: Don't hardcode 64bit size
+
+This looks like an oversight from "quickly testing a potential fix" and
+then forgetting to make a production-ready when it works.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=755691
+
+diff --git a/gtk/gtkallocatedbitmask.c b/gtk/gtkallocatedbitmask.c
+index f95e312..f655e9d 100644
+--- a/gtk/gtkallocatedbitmask.c
++++ b/gtk/gtkallocatedbitmask.c
+@@ -312,7 +312,7 @@ _gtk_allocated_bitmask_invert_range (GtkBitmask *mask,
+   for (i = start_word; i <= end_word; i++)
+     mask->data[i] ^= ALL_BITS;
+   mask->data[start_word] ^= (((VALUE_TYPE) 1) << start_bit) - 1;
+-  if (end_bit != 63)
++  if (end_bit != VALUE_SIZE_BITS - 1)
+     mask->data[end_word] ^= ALL_BITS << (end_bit + 1);
+ 
+   return gtk_allocated_bitmask_shrink (mask);
+-- 
+cgit v0.10.2
+

Modified: desktop/experimental/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/series?rev=46147&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/series	[utf-8] Sun Sep 27 13:36:24 2015
@@ -7,3 +7,4 @@
 060_ignore-random-icons.patch
 071_fix-installation-of-HTML-images.patch
 reftest-known-fail.patch
+git_bitmask-dont-hardcode-64bit-size.patch

Modified: desktop/experimental/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/rules?rev=46147&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/rules	[utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/rules	[utf-8] Sun Sep 27 13:36:24 2015
@@ -61,7 +61,7 @@
 FAIL_MISSING :=
 
 # When building all packages, run dh_install with --fail-missing
-binary-indep: FAIL_MISSING=--fail-missing
+binary: FAIL_MISSING=--fail-missing
 
 DEB_DH_INSTALL_ARGS += --sourcedir=debian/install/shared $(FAIL_MISSING) -X.la
 DEB_DH_INSTALL_ARGS_$(UDEB_PKG) += --sourcedir=debian/install/shared_udeb