r52736 - in /desktop/unstable/glib2.0/debian: changelog patches/git_glib-mkenums-flags.patch patches/series

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Thu Aug  3 16:20:36 2017
New Revision: 52736

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52736
Log:
Backport commit to fix mate-panel FTBFS (Closes: #870212)

Added:
    desktop/unstable/glib2.0/debian/patches/git_glib-mkenums-flags.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/series

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=52736&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog	[utf-8] Thu Aug  3 16:20:36 2017
@@ -8,6 +8,8 @@
   * Add git_glib-mkenums-utf8.patch:
     - Backport commit to fix "glib-mkenums: UnicodeDecodeError"
       (Closes: #870310)
+  * Add git_glib-mkenums-flags.patch:
+    - Backport commit to fix mate-panel FTBFS (Closes: #870212)
 
  -- Matthias Klumpp <mak at debian.org>  Sun, 30 Jul 2017 14:07:26 +0200
 

Added: desktop/unstable/glib2.0/debian/patches/git_glib-mkenums-flags.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/git_glib-mkenums-flags.patch?rev=52736&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/git_glib-mkenums-flags.patch	(added)
+++ desktop/unstable/glib2.0/debian/patches/git_glib-mkenums-flags.patch	[utf-8] Thu Aug  3 16:20:36 2017
@@ -0,0 +1,59 @@
+From 8cc99502022944917f5dd78ce1d1427582081396 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels at gmail.com>
+Date: Tue, 1 Aug 2017 12:18:42 +0300
+Subject: glib-mkenums: fix parsing of flags annotation
+
+https://bugzilla.gnome.org/show_bug.cgi?id=779332
+---
+ gobject/glib-mkenums.in |   15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+--- a/gobject/glib-mkenums.in
++++ b/gobject/glib-mkenums.in
+@@ -74,7 +74,7 @@ def write_output(output):
+ 
+ # glib-mkenums.py
+ # Information about the current enumeration
+-flags = False               # Is enumeration a bitmask?
++flags = None # Is enumeration a bitmask?
+ option_underscore_name = '' # Overriden underscore variant of the enum name
+                             # for example to fix the cases we don't get the
+                             # mixed-case -> underscorized transform right.
+@@ -187,7 +187,7 @@ def parse_entries(file, file_name):
+                 value = groups[1]
+             if len(groups) > 2:
+                 options = groups[2]
+-            if not flags and value is not None and '<<' in value:
++            if flags is None and value is not None and '<<' in value:
+                 seenbitshift = 1
+ 
+             if options is not None:
+@@ -436,12 +436,17 @@ def process_file(curfilename):
+                 if 'skip' in options:
+                     continue
+                 enum_prefix = options.get('prefix', None)
+-                flags = 'flags' in options
++                flags = options.get('flags', None)
++                if 'flags' in options:
++                    if flags is None:
++                        flags = 1
++                    else:
++                        flags = int(flags)
+                 option_lowercase_name = options.get('lowercase_name', None)
+                 option_underscore_name = options.get('underscore_name', None)
+             else:
+                 enum_prefix = None
+-                flags = False
++                flags = None
+                 option_lowercase_name = None
+                 option_underscore_name = None
+ 
+@@ -466,7 +471,7 @@ def process_file(curfilename):
+             parse_entries(curfile, curfilename)
+ 
+             # figure out if this was a flags or enums enumeration
+-            if not flags:
++            if flags is None:
+                 flags = seenbitshift
+ 
+             # Autogenerate a prefix

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=52736&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series	[utf-8] Thu Aug  3 16:20:36 2017
@@ -12,3 +12,4 @@
 skip-broken-timer-test.patch
 0001-Fix-trashing-on-overlayfs.patch
 git_glib-mkenums-utf8.patch
+git_glib-mkenums-flags.patch