Accepting request 732394 from GNOME:Next
- Update to version 2.24.32+62 (boo#1147106): * gtk-builder-convert: Update bug report URL. * gtk-builder-convert: Remove compat code for Python 2.3 and * below. * Make gtk-builder-convert compatible with Python 3. * Fix use-after-free due to unexpected unref of context->default_style. * Visual Studio builds: Fix previous commit. * Visual Studio builds: "Add" Visual Studio 2019 projects. - Drop gtk2-converter-python3.patch: fixed upstream. - Replace shebang in ./gtk/gtk-builder-convert using sed (use python3). OBS-URL: https://build.opensuse.org/request/show/732394 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=276
This commit is contained in:
Git OBS Bridge
parent
90233ec3aa
commit
364bbdae47
@ -3,4 +3,4 @@
|
||||
<param name="url">git://git.gnome.org/gtk+</param>
|
||||
<param name="changesrevision">ed7d3e25f8b6debae6ccc8b50d1329155338cab8</param></service><service name="tar_scm">
|
||||
<param name="url">https://gitlab.gnome.org/GNOME/gtk.git</param>
|
||||
<param name="changesrevision">c505d3fcf8571876fa5767411bbe0229591ce104</param></service></servicedata>
|
||||
<param name="changesrevision">b5ea5a0cf1f12be5072b9f06d1127a8977414916</param></service></servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0733258f347f0737518a78ab2137b1de4a7b6d28469472b8cb8dd8795cd0063c
|
||||
size 9092004
|
||||
3
gtk-2.24.32+62.tar.xz
Normal file
3
gtk-2.24.32+62.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:91917859f735c23cb88ae4ff1aa9414c8653d90e2c73531953ede7b93e8ae6e2
|
||||
size 9092388
|
||||
@ -1,72 +0,0 @@
|
||||
Index: gtk+-2.24.31/gtk/gtk-builder-convert
|
||||
===================================================================
|
||||
--- gtk+-2.24.31.orig/gtk/gtk-builder-convert
|
||||
+++ gtk+-2.24.31/gtk/gtk-builder-convert
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
#
|
||||
# Copyright (C) 2006-2008 Async Open Source
|
||||
# Henrique Romano <henrique@async.com.br>
|
||||
@@ -210,7 +210,7 @@ class GtkBuilderConverter(object):
|
||||
obj.setAttribute('class', obj_class)
|
||||
obj.setAttribute('id', obj_id)
|
||||
if properties:
|
||||
- for name, value in properties.items():
|
||||
+ for name, value in list(properties.items()):
|
||||
if isinstance(value, Node):
|
||||
# Reuse the node, so translatable and context still will be
|
||||
# set when converting nodes. See also #509153
|
||||
@@ -259,7 +259,7 @@ class GtkBuilderConverter(object):
|
||||
for node in objects:
|
||||
self._convert(node.getAttribute("class"), node)
|
||||
if self._get_object(node.getAttribute('id')) is not None:
|
||||
- print "WARNING: duplicate id \"" + node.getAttribute('id') + "\""
|
||||
+ print("WARNING: duplicate id \"" + node.getAttribute('id') + "\"")
|
||||
self.objects[node.getAttribute('id')] = node
|
||||
|
||||
# Convert Gazpachos UI tag
|
||||
@@ -461,8 +461,8 @@ class GtkBuilderConverter(object):
|
||||
if signal_name in ['activate', 'toggled']:
|
||||
action.appendChild(signal)
|
||||
else:
|
||||
- print 'Unhandled signal %s::%s' % (node.getAttribute('class'),
|
||||
- signal_name)
|
||||
+ print('Unhandled signal %s::%s' % (node.getAttribute('class'),
|
||||
+ signal_name))
|
||||
|
||||
if not uimgr.childNodes:
|
||||
child = self._dom.createElement('child')
|
||||
@@ -481,8 +481,8 @@ class GtkBuilderConverter(object):
|
||||
for accelerator in get_accelerator_nodes(node):
|
||||
signal_name = accelerator.getAttribute('signal')
|
||||
if signal_name != 'activate':
|
||||
- print 'Unhandled accelerator signal for %s::%s' % (
|
||||
- node.getAttribute('class'), signal_name)
|
||||
+ print('Unhandled accelerator signal for %s::%s' % (
|
||||
+ node.getAttribute('class'), signal_name))
|
||||
continue
|
||||
accelerator.removeAttribute('signal')
|
||||
child.appendChild(accelerator)
|
||||
@@ -747,7 +747,7 @@ def _indent(output):
|
||||
return s.stdout.read()
|
||||
|
||||
def usage():
|
||||
- print __doc__
|
||||
+ print(__doc__)
|
||||
|
||||
def main(args):
|
||||
try:
|
||||
@@ -788,10 +788,10 @@ def main(args):
|
||||
|
||||
xml = _indent(conv.to_xml())
|
||||
if output_filename == "-":
|
||||
- print xml
|
||||
+ print(xml)
|
||||
else:
|
||||
open(output_filename, 'w').write(xml)
|
||||
- print "Wrote", output_filename
|
||||
+ print("Wrote", output_filename)
|
||||
|
||||
return 0
|
||||
|
||||
15
gtk2.changes
15
gtk2.changes
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 11 10:16:49 UTC 2019 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 2.24.32+62 (boo#1147106):
|
||||
* gtk-builder-convert: Update bug report URL.
|
||||
* gtk-builder-convert: Remove compat code for Python 2.3 and
|
||||
* below.
|
||||
* Make gtk-builder-convert compatible with Python 3.
|
||||
* Fix use-after-free due to unexpected unref of context->default_style.
|
||||
* Visual Studio builds: Fix previous commit.
|
||||
* Visual Studio builds: "Add" Visual Studio 2019 projects.
|
||||
- Drop gtk2-converter-python3.patch: fixed upstream.
|
||||
- Replace shebang in ./gtk/gtk-builder-convert using sed (use
|
||||
python3).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 8 09:32:03 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
%define gtk_binary_version 2.10.0
|
||||
%define _name gtk
|
||||
Name: gtk2
|
||||
Version: 2.24.32+54
|
||||
Version: 2.24.32+62
|
||||
Release: 0
|
||||
# FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
|
||||
Summary: The GTK+ toolkit library (version 2)
|
||||
@ -47,8 +47,6 @@ Patch4: gtk2-default-printer.patch
|
||||
Patch5: gtk2-bgo625202-30-bit-drawables-remain-black.patch
|
||||
# PATCH-FIX-UPSTREAM gtk2-bgo743166-remember-printing-authentication.patch bgo#674264 joschibrauchle@gmx.de -- Credentials from gnome-keyring is not used while printing in GTK 2
|
||||
Patch6: gtk2-bgo743166-remember-printing-authentication.patch
|
||||
# PATCH-FEATURE-OPENSUSE gtk2-converter-python3.patch dimstar@opensuse.org -- Use python3 for gtk-build-converter
|
||||
Patch7: gtk2-converter-python3.patch
|
||||
# PATCH-FEATURE-OPENSUSE gtk2-updateiconcache_sort.patch olh@opensuse.org -- Have gtp-update-icon-cache sort the file list before producing a cache
|
||||
Patch8: gtk2-updateiconcache_sort.patch
|
||||
BuildRequires: atk-devel
|
||||
@ -326,8 +324,8 @@ cp -a %{SOURCE2} .
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
sed -i "s|/usr/bin/env python|%{_bindir}/python3|" ./gtk/gtk-builder-convert
|
||||
gnome-patch-translation-update
|
||||
|
||||
%build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user