CVS commit: pkgsrc/editors/Sigil

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Dec  3 21:59:48 UTC 2022

Modified Files:
        pkgsrc/editors/Sigil: distinfo
Added Files:
        pkgsrc/editors/Sigil/patches: patch-src_EmbedPython_EmbeddedPython.cpp

Log Message:
Sigil: fix build with Python 3.11


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/editors/Sigil/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/Sigil/patches/patch-src_EmbedPython_EmbeddedPython.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/Sigil/distinfo
diff -u pkgsrc/editors/Sigil/distinfo:1.53 pkgsrc/editors/Sigil/distinfo:1.54
--- pkgsrc/editors/Sigil/distinfo:1.53  Fri Sep  9 15:49:32 2022
+++ pkgsrc/editors/Sigil/distinfo       Sat Dec  3 21:59:47 2022
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.53 2022/09/09 15:49:32 wiz Exp $
+$NetBSD: distinfo,v 1.54 2022/12/03 21:59:47 wiz Exp $
 
 BLAKE2s (Sigil-1.9.20.tar.gz) = 7ab49c1da67802d7e80dd799c870d77e8c113201700861f443ea4027d517d186
 SHA512 (Sigil-1.9.20.tar.gz) = 07aff142f65084b7900b25b089fca1d9a36022e690acaf0db3c7b2eb310a847834baff42884e73bbe6b31ff2dd7f73e76819c5c7a4292578fbea2edcebec5ad1
 Size (Sigil-1.9.20.tar.gz) = 25139664 bytes
 SHA1 (patch-3rdparty_minizip_ioapi.c) = a68dead89687529b7022cda3bc8a079e5f5c1459
+SHA1 (patch-src_EmbedPython_EmbeddedPython.cpp) = 128d2857f50acf1fdb29ab0d1c763452bbc19fb2
 SHA1 (patch-src_Misc_Language.cpp) = 5ae2fc9b76b1a706efd05eecad95d5a6760a6357

Added files:

Index: pkgsrc/editors/Sigil/patches/patch-src_EmbedPython_EmbeddedPython.cpp
diff -u /dev/null pkgsrc/editors/Sigil/patches/patch-src_EmbedPython_EmbeddedPython.cpp:1.1
--- /dev/null   Sat Dec  3 21:59:48 2022
+++ pkgsrc/editors/Sigil/patches/patch-src_EmbedPython_EmbeddedPython.cpp       Sat Dec  3 21:59:48 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_EmbedPython_EmbeddedPython.cpp,v 1.1 2022/12/03 21:59:48 wiz Exp $
+
+Fix build with Python 3.11.
+https://github.com/Sigil-Ebook/Sigil/issues/703
+
+--- src/EmbedPython/EmbeddedPython.cpp.orig    2022-08-31 15:13:03.000000000 +0000
++++ src/EmbedPython/EmbeddedPython.cpp
+@@ -480,7 +480,7 @@ QVariant EmbeddedPython::PyObjectToQVari
+ 
+         if (kind == PyUnicode_1BYTE_KIND) {
+             // latin 1 according to PEP 393
+-            res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>PyUnicode_1BYTE_DATA(po), -1));
++            res = QVariant(QString::fromLatin1(reinterpret_cast<const char *>(PyUnicode_1BYTE_DATA(po), -1)));
+ 
+         } else if (kind == PyUnicode_2BYTE_KIND) {
+ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)