Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mypaint for openSUSE:Factory checked
in at 2023-06-21 22:40:27
Comparing /work/SRC/openSUSE:Factory/mypaint (Old)
and /work/SRC/openSUSE:Factory/.mypaint.new.15902 (New)
Package is "mypaint"
Wed Jun 21 22:40:27 2023 rev:6 rq:1094392 version:2.0.1
Changes:
--- /work/SRC/openSUSE:Factory/mypaint/mypaint.changes 2021-02-21
22:14:55.202137861 +0100
+++ /work/SRC/openSUSE:Factory/.mypaint.new.15902/mypaint.changes
2023-06-21 22:41:20.158904435 +0200
@@ -1,0 +2,5 @@
+Wed Jun 21 11:56:34 UTC 2023 - Dominique Leuenberger
+
+- Add 1193.patch: fix build against python 3.11.
+
+---
New:
1193.patch
Other differences:
--
++ mypaint.spec ++
--- /var/tmp/diff_new_pack.SlFQP5/_old 2023-06-21 22:41:20.818908408 +0200
+++ /var/tmp/diff_new_pack.SlFQP5/_new 2023-06-21 22:41:20.822908432 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mypaint
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,6 +24,7 @@
Group: Productivity/Graphics/Other
URL:http://mypaint.org
Source:
https://github.com/mypaint/mypaint/releases/download/v%{version}/%{name}-%{version}.tar.xz
+Patch0:
https://patch-diff.githubusercontent.com/raw/mypaint/mypaint/pull/1193.patch
BuildRequires: ImageMagick
BuildRequires: fdupes
BuildRequires: gcc-c++
++ 1193.patch ++
>From 032a155b72f2b021f66a994050d83f07342d04af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
Date: Wed, 9 Nov 2022 11:24:33 +0700
Subject: [PATCH] python: fix for Python 3.11
- python 3 always open in universal mode, U is default mode in 3.0,
and removed in 3.11
- mypaint doesn't use ld?n?gettext, so bind_textdomain_codeset isn't
needed, that function is deprecated in 3.8 and is no-ops in 3.10 and
removed in 3.11
---
lib/gettext_setup.py | 25 ++---
setup.py | 2 +-
2 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/lib/gettext_setup.py b/lib/gettext_setup.py
index d4ce60a20..72cfaeddc 100644
--- a/lib/gettext_setup.py
+++ b/lib/gettext_setup.py
@@ -82,13 +82,11 @@ def init_gettext(localepath):
# yanked in over GI.
# https://bugzilla.gnome.org/show_bug.cgi?id=574520#c26
bindtextdomain = None
-bind_textdomain_codeset = None
textdomain = None
# Try the POSIX/Linux way first.
try:
bindtextdomain = locale.bindtextdomain
-bind_textdomain_codeset = locale.bind_textdomain_codeset
textdomain = locale.textdomain
except AttributeError:
logger.warning(
@@ -117,12 +115,6 @@ def init_gettext(localepath):
ctypes.c_char_p,
)
bindtextdomain.restype = ctypes.c_char_p
-bind_textdomain_codeset = libintl.bind_textdomain_codeset
-bind_textdomain_codeset.argtypes = (
-ctypes.c_char_p,
-ctypes.c_char_p,
-)
-bind_textdomain_codeset.restype = ctypes.c_char_p
textdomain = libintl.textdomain
textdomain.argtypes = (
ctypes.c_char_p,
@@ -177,35 +169,22 @@ def init_gettext(localepath):
# complete set from the same source.
# Required for translatable strings in GtkBuilder XML
# to be translated.
-if bindtextdomain and bind_textdomain_codeset and textdomain:
+if bindtextdomain and textdomain:
assert os.path.exists(path)
assert os.path.isdir(path)
if sys.platform == 'win32':
p = bindtextdomain(dom.encode('utf-8'), path.encode('utf-8'))
-c = bind_textdomain_codeset(
-dom.encode('utf-8'), codeset.encode('utf-8')
-)
else:
p = bindtextdomain(dom, path)
-c = bind_textdomain_codeset(dom, codeset)
logger.debug("C bindtextdomain(%r, %r): %r", dom, path, p)
-logger.debug(
-"C bind_textdomain_codeset(%r, %r): %r",
-dom, codeset, c,
-)
# Call the implementations in Python's standard gettext module
# too. This has proper cross-platform support, but it only
# initializes the native Python "gettext" module.
# Required for marked strings in Python
