* 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).
This commit is contained in:
11
debian/changelog
vendored
11
debian/changelog
vendored
@ -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@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
|
||||
|
||||
26
debian/patches/git_bitmask-dont-hardcode-64bit-size.patch
vendored
Normal file
26
debian/patches/git_bitmask-dont-hardcode-64bit-size.patch
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
From 97293865b5c3e10fa65009e5f787312a17f47b06 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Shachnev <mitya57@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
|
||||
|
||||
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -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
|
||||
|
||||
2
debian/rules
vendored
2
debian/rules
vendored
@ -61,7 +61,7 @@ README := README$(shell find -maxdepth 1 -size +4k -name README -exec echo ".gz"
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user