tags 834812 + pending thanks On Fri, Aug 19, 2016 at 09:58:13AM +0100, Iain Lane wrote: > This looks like it's fixed upstream with > 1feb3abbe56661d83ee798d9ad98e49cfd525267. Going to test that now.
Yeah, that works. I've attached the patch and uploaded this to DELAYED/7. Feel free to reschedule (e.g. to upload it straight away, or to cancel it). Cheers, -- Iain Lane [ i...@orangesquash.org.uk ] Debian Developer [ la...@debian.org ] Ubuntu Developer [ la...@ubuntu.com ]
From 260e87bbf76aaa435e83bc34f892f2289c728b78 Mon Sep 17 00:00:00 2001
From: Iain Lane <i...@orangesquash.org.uk>
Date: Fri, 19 Aug 2016 10:11:12 +0100
Subject: [PATCH] Cherry-pick a patch from upstream to fix the
AsAppSubsumeFlags enumeration on 32-bit architectures.
---
debian/changelog | 9 ++
...ix-gcc-shift-warnings-on-32-bit-platforms.patch | 104 +++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 114 insertions(+)
create mode 100644 debian/patches/0001-Fix-gcc-shift-warnings-on-32-bit-platforms.patch
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index 473b043..8e81a6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+appstream-glib (0.6.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/0001-Fix-gcc-shift-warnings-on-32-bit-platforms.patch:
+ Cherry-pick a patch from upstream to fix the AsAppSubsumeFlags enumeration
+ on 32-bit architectures. (Closes: #834812)
+
+ -- Iain Lane <i...@orangesquash.org.uk> Fri, 19 Aug 2016 10:46:53 +0100
+
appstream-glib (0.6.1-1) unstable; urgency=medium
* New upstream release: 0.6.1
diff --git a/debian/patches/0001-Fix-gcc-shift-warnings-on-32-bit-platforms.patch b/debian/patches/0001-Fix-gcc-shift-warnings-on-32-bit-platforms.patch
new file mode 100644
index 0000000..f54657d
--- /dev/null
+++ b/debian/patches/0001-Fix-gcc-shift-warnings-on-32-bit-platforms.patch
@@ -0,0 +1,104 @@
+From 1feb3abbe56661d83ee798d9ad98e49cfd525267 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klem...@redhat.com>
+Date: Wed, 17 Aug 2016 16:04:21 +0200
+Subject: [PATCH] Fix gcc shift warnings on 32 bit platforms
+
+Unsure if > 32 bit enums actually work on 32 bit platforms, but let's
+try and fix the shift overflow first. Fix suggested by mclasen on irc.
+
+as-app.h:162:44: warning: left shift count >= width of type [-Wshift-count-overflow]
+ AS_APP_SUBSUME_FLAG_PROJECT_LICENSE = 1lu << 32, /* Since: 0.6.1 */
+ ^~
+as-app.h:163:42: warning: left shift count >= width of type [-Wshift-count-overflow]
+ AS_APP_SUBSUME_FLAG_PROJECT_GROUP = 1lu << 33, /* Since: 0.6.1 */
+ ^~
+as-app.h:164:41: warning: left shift count >= width of type [-Wshift-count-overflow]
+ AS_APP_SUBSUME_FLAG_SOURCE_KIND = 1lu << 34, /* Since: 0.6.1 */
+---
+ libappstream-glib/as-app.h | 70 +++++++++++++++++++++++-----------------------
+ 1 file changed, 35 insertions(+), 35 deletions(-)
+
+diff --git a/libappstream-glib/as-app.h b/libappstream-glib/as-app.h
+index 0c130fa..7a20c55 100644
+--- a/libappstream-glib/as-app.h
++++ b/libappstream-glib/as-app.h
+@@ -127,41 +127,41 @@ typedef enum {
+ **/
+ typedef enum {
+ AS_APP_SUBSUME_FLAG_NONE = 0,
+- AS_APP_SUBSUME_FLAG_NO_OVERWRITE = 1lu << 0, /* Since: 0.1.4 */
+- AS_APP_SUBSUME_FLAG_BOTH_WAYS = 1lu << 1, /* Since: 0.1.4 */
+- AS_APP_SUBSUME_FLAG_PARTIAL = 1lu << 2, /* Since: 0.2.2 */
+- AS_APP_SUBSUME_FLAG_KIND = 1lu << 3, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_STATE = 1lu << 4, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_BUNDLES = 1lu << 5, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_TRANSLATIONS = 1lu << 6, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_RELEASES = 1lu << 7, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_KUDOS = 1lu << 8, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_CATEGORIES = 1lu << 9, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_PERMISSIONS = 1lu << 10, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_EXTENDS = 1lu << 11, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_COMPULSORY = 1lu << 12, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_SCREENSHOTS = 1lu << 13, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_REVIEWS = 1lu << 14, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_CONTENT_RATINGS = 1lu << 15, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_PROVIDES = 1lu << 16, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_ICONS = 1lu << 17, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_MIMETYPES = 1lu << 18, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_VETOS = 1lu << 19, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_LANGUAGES = 1lu << 20, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_NAME = 1lu << 21, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_COMMENT = 1lu << 22, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_DEVELOPER_NAME = 1lu << 23, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_DESCRIPTION = 1lu << 24, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_METADATA = 1lu << 25, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_URL = 1lu << 26, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_KEYWORDS = 1lu << 27, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_SOURCE_FILE = 1lu << 28, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_BRANCH = 1lu << 29, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_ORIGIN = 1lu << 30, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_METADATA_LICENSE = 1lu << 31, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_PROJECT_LICENSE = 1lu << 32, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_PROJECT_GROUP = 1lu << 33, /* Since: 0.6.1 */
+- AS_APP_SUBSUME_FLAG_SOURCE_KIND = 1lu << 34, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_NO_OVERWRITE = 1ull << 0, /* Since: 0.1.4 */
++ AS_APP_SUBSUME_FLAG_BOTH_WAYS = 1ull << 1, /* Since: 0.1.4 */
++ AS_APP_SUBSUME_FLAG_PARTIAL = 1ull << 2, /* Since: 0.2.2 */
++ AS_APP_SUBSUME_FLAG_KIND = 1ull << 3, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_STATE = 1ull << 4, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_BUNDLES = 1ull << 5, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_TRANSLATIONS = 1ull << 6, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_RELEASES = 1ull << 7, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_KUDOS = 1ull << 8, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_CATEGORIES = 1ull << 9, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_PERMISSIONS = 1ull << 10, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_EXTENDS = 1ull << 11, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_COMPULSORY = 1ull << 12, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_SCREENSHOTS = 1ull << 13, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_REVIEWS = 1ull << 14, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_CONTENT_RATINGS = 1ull << 15, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_PROVIDES = 1ull << 16, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_ICONS = 1ull << 17, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_MIMETYPES = 1ull << 18, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_VETOS = 1ull << 19, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_LANGUAGES = 1ull << 20, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_NAME = 1ull << 21, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_COMMENT = 1ull << 22, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_DEVELOPER_NAME = 1ull << 23, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_DESCRIPTION = 1ull << 24, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_METADATA = 1ull << 25, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_URL = 1ull << 26, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_KEYWORDS = 1ull << 27, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_SOURCE_FILE = 1ull << 28, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_BRANCH = 1ull << 29, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_ORIGIN = 1ull << 30, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_METADATA_LICENSE = 1ull << 31, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_PROJECT_LICENSE = 1ull << 32, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_PROJECT_GROUP = 1ull << 33, /* Since: 0.6.1 */
++ AS_APP_SUBSUME_FLAG_SOURCE_KIND = 1ull << 34, /* Since: 0.6.1 */
+ /*< private >*/
+ AS_APP_SUBSUME_FLAG_LAST,
+ } AsAppSubsumeFlags;
+--
+2.8.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..be33f8e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-gcc-shift-warnings-on-32-bit-platforms.patch
--
2.8.1
signature.asc
Description: PGP signature
