Accepting request 554779 from home:dimstar:branches:GNOME:Factory

Resubmit, fixed bgo ref

OBS-URL: https://build.opensuse.org/request/show/554779
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=350

glib2-gtester-report-py3.patch

@@ -0,0 +1,33 @@
+From 54347e52f4e0f1fcb5f361715caf3600b48c05bb Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Wed, 6 Dec 2017 08:58:41 +0100
+Subject: [PATCH] gtester-report: fix range usage when running as python3 app
+
+When using python3 as interpreter, range only takes integer arguments or
+it results in errors like:
+
+   File "/usr/bin/gtester-report", line 78, in html_indent_string
+     for i in range (0, (n + 1) / 2):
+ TypeError: 'float' object cannot be interpreted as an integer
+
+https://bugzilla.gnome.org/show_bug.cgi?id=791296
+---
+ glib/gtester-report | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glib/gtester-report b/glib/gtester-report
+index d11b255bc..c4790adbb 100755
+--- a/glib/gtester-report
++++ b/glib/gtester-report
+@@ -75,7 +75,7 @@ def attribute_as_text (node, aname, node_name = None):
+ def html_indent_string (n):
+   uncollapsible_space = ' &nbsp;' # HTML won't compress alternating sequences of ' ' and '&nbsp;'
+   string = ''
+-  for i in range (0, (n + 1) / 2):
++  for i in range (0, int((n + 1) / 2)):
+     string += uncollapsible_space
+   return string
+ 
+-- 
+2.15.0
+

glib2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Dec  6 08:03:38 UTC 2017 - dimstar@opensuse.org
+
+- Add glib2-gtester-report-py3.patch: gtester-reporter fails to
+  run with python3 (bgo#791296, boo#1071378).
+
 -------------------------------------------------------------------
 Wed Nov 29 11:13:02 UTC 2017 - dimstar@opensuse.org
 

glib2.spec

@@ -51,6 +51,8 @@ Patch13:        glib2-suppress-schema-deprecated-path-warning.patch
 Patch14:        glib2-dbus-socket-path.patch
 # PATCH-FIX-OPENSUSE glib2-gdbus-codegen-version.patch  olaf@aepfle.de -- Remove version string from files generated by gdbus-codegen
 Patch16:        glib2-gdbus-codegen-version.patch
+# PATCH-FIX-UPSTREAM glib2-gtester-report-py3.patch bgo#791298 boo#1071378 dimstar@opensuse.org -- gtester-reporter fails to run with python3
+Patch17:        glib2-gtester-report-py3.patch
 BuildRequires:  automake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
@@ -265,6 +267,7 @@ translation-update-upstream
 %patch13 -p1
 %patch14 -p1
 %patch16 -p1
+%patch17 -p1
 cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} .
 cp -a %{SOURCE4} gnome_defaults.conf
 if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then