[v1 resend][oe-core][PATCH 1/1] gconf: use python3

2020-07-24 Thread Joe Slater
Modify gsettings-schema-convert to use python3.  Also
add RDEPEND on python3-xml.

Signed-off-by: Joe Slater 
---
 meta/recipes-gnome/gnome/gconf/python3.patch | 60 
 meta/recipes-gnome/gnome/gconf_3.2.6.bb  |  3 ++
 2 files changed, 63 insertions(+)
 create mode 100644 meta/recipes-gnome/gnome/gconf/python3.patch

diff --git a/meta/recipes-gnome/gnome/gconf/python3.patch 
b/meta/recipes-gnome/gnome/gconf/python3.patch
new file mode 100644
index 000..7c022a2
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gconf/python3.patch
@@ -0,0 +1,60 @@
+gconf: use python3
+
+Convert gsettings-schema-convert to use python3.
+
+Upstream-Status: Inappropriate [gconf is deprecated]
+
+Signed-off-by: Joe Slater 
+
+
+--- a/gsettings/gsettings-schema-convert
 b/gsettings/gsettings-schema-convert
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # vim: set ts=4 sw=4 et: coding=UTF-8
+ #
+ # Copyright (c) 2010, Novell, Inc.
+@@ -603,7 +603,7 @@ class SimpleSchemaParser:
+ for line in lines:
+ current_line_nb += 1
+ self.parse_line(line)
+-except GSettingsSchemaConvertException, e:
++except GSettingsSchemaConvertException as e:
+ raise GSettingsSchemaConvertException('%s:%s: %s' % 
(os.path.basename(self.file), current_line_nb, e))
+ 
+ return self.root
+@@ -1095,7 +1095,7 @@ def main(args):
+ try:
+ parser = GConfSchemaParser(argfile, options.gettext_domain, 
options.schema_id, options.keep_underscores)
+ schema_root = parser.parse()
+-except SyntaxError, e:
++except SyntaxError as e:
+ raise GSettingsSchemaConvertException('\'%s\' does not look 
like a valid gconf schema file: %s' % (argfile, e))
+ else:
+ # autodetect if file is XML or not
+@@ -1104,7 +1104,7 @@ def main(args):
+ schema_root = parser.parse()
+ if not options.simple and not options.xml:
+ options.simple = True
+-except SyntaxError, e:
++except SyntaxError as e:
+ parser = SimpleSchemaParser(argfile)
+ schema_root = parser.parse()
+ if not options.simple and not options.xml:
+@@ -1127,13 +1127,13 @@ def main(args):
+ fout = open(options.output, 'w')
+ fout.write(output)
+ fout.close()
+-except GSettingsSchemaConvertException, e:
++except GSettingsSchemaConvertException as e:
+ fout.close()
+ if os.path.exists(options.output):
+ os.unlink(options.output)
+ raise e
+ 
+-except GSettingsSchemaConvertException, e:
++except GSettingsSchemaConvertException as e:
+ print >> sys.stderr, '%s' % e
+ return 1
+ 
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.6.bb 
b/meta/recipes-gnome/gnome/gconf_3.2.6.bb
index b8466d4..ff36555 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.6.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.6.bb
@@ -15,6 +15,7 @@ SRC_URI = 
"${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;na
file://remove_plus_from_invalid_characters_list.patch \
file://unable-connect-dbus.patch \
file://create_config_directory.patch \
+   file://python3.patch \
 "
 
 SRC_URI[archive.md5sum] = "2b16996d0e4b112856ee5c59130e822c"
@@ -52,6 +53,8 @@ FILES_${PN} += "${libdir}/GConf/* \
 ${datadir}/dbus-1/services/*.service \
 ${datadir}/dbus-1/system-services/*.service \
"
+RDEPENDS_${PN} = "python3-xml"
+
 FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd"
 
 BBCLASSEXTEND = "native"
-- 
2.7.4

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#140938): 
https://lists.openembedded.org/g/openembedded-core/message/140938
Mute This Topic: https://lists.openembedded.org/mt/75776521/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-


[oe-core][PATCH 1/1] gconf: use python3

2020-06-18 Thread Joe Slater
Modify gsettings-schema-convert to use python3.  Also
add RDEPEND on python3-xml.

Signed-off-by: Joe Slater 
---
 meta/recipes-gnome/gnome/gconf/python3.patch | 60 
 meta/recipes-gnome/gnome/gconf_3.2.6.bb  |  3 ++
 2 files changed, 63 insertions(+)
 create mode 100644 meta/recipes-gnome/gnome/gconf/python3.patch

diff --git a/meta/recipes-gnome/gnome/gconf/python3.patch 
b/meta/recipes-gnome/gnome/gconf/python3.patch
new file mode 100644
index 000..7c022a2
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gconf/python3.patch
@@ -0,0 +1,60 @@
+gconf: use python3
+
+Convert gsettings-schema-convert to use python3.
+
+Upstream-Status: Inappropriate [gconf is deprecated]
+
+Signed-off-by: Joe Slater 
+
+
+--- a/gsettings/gsettings-schema-convert
 b/gsettings/gsettings-schema-convert
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # vim: set ts=4 sw=4 et: coding=UTF-8
+ #
+ # Copyright (c) 2010, Novell, Inc.
+@@ -603,7 +603,7 @@ class SimpleSchemaParser:
+ for line in lines:
+ current_line_nb += 1
+ self.parse_line(line)
+-except GSettingsSchemaConvertException, e:
++except GSettingsSchemaConvertException as e:
+ raise GSettingsSchemaConvertException('%s:%s: %s' % 
(os.path.basename(self.file), current_line_nb, e))
+ 
+ return self.root
+@@ -1095,7 +1095,7 @@ def main(args):
+ try:
+ parser = GConfSchemaParser(argfile, options.gettext_domain, 
options.schema_id, options.keep_underscores)
+ schema_root = parser.parse()
+-except SyntaxError, e:
++except SyntaxError as e:
+ raise GSettingsSchemaConvertException('\'%s\' does not look 
like a valid gconf schema file: %s' % (argfile, e))
+ else:
+ # autodetect if file is XML or not
+@@ -1104,7 +1104,7 @@ def main(args):
+ schema_root = parser.parse()
+ if not options.simple and not options.xml:
+ options.simple = True
+-except SyntaxError, e:
++except SyntaxError as e:
+ parser = SimpleSchemaParser(argfile)
+ schema_root = parser.parse()
+ if not options.simple and not options.xml:
+@@ -1127,13 +1127,13 @@ def main(args):
+ fout = open(options.output, 'w')
+ fout.write(output)
+ fout.close()
+-except GSettingsSchemaConvertException, e:
++except GSettingsSchemaConvertException as e:
+ fout.close()
+ if os.path.exists(options.output):
+ os.unlink(options.output)
+ raise e
+ 
+-except GSettingsSchemaConvertException, e:
++except GSettingsSchemaConvertException as e:
+ print >> sys.stderr, '%s' % e
+ return 1
+ 
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.6.bb 
b/meta/recipes-gnome/gnome/gconf_3.2.6.bb
index b8466d4..ff36555 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.6.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.6.bb
@@ -15,6 +15,7 @@ SRC_URI = 
"${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;na
file://remove_plus_from_invalid_characters_list.patch \
file://unable-connect-dbus.patch \
file://create_config_directory.patch \
+   file://python3.patch \
 "
 
 SRC_URI[archive.md5sum] = "2b16996d0e4b112856ee5c59130e822c"
@@ -52,6 +53,8 @@ FILES_${PN} += "${libdir}/GConf/* \
 ${datadir}/dbus-1/services/*.service \
 ${datadir}/dbus-1/system-services/*.service \
"
+RDEPENDS_${PN} = "python3-xml"
+
 FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd"
 
 BBCLASSEXTEND = "native"
-- 
2.7.4

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#139672): 
https://lists.openembedded.org/g/openembedded-core/message/139672
Mute This Topic: https://lists.openembedded.org/mt/74966005/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-