gentoo auto-resync : 15:09:2024 - 12:11:38

4 files changed, 160 insertions, 1 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index d6af60adbc1a..1035e9969d81 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index d5a69112ef07..97d7771cb59c 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,7 +1,8 @@
+AUX kajongg-24.08.1-fix-w-o-pyqt6.patch 5064 BLAKE2B 98175c518d56e6ab9757d941646afbe7e0621d96b91d84a796ea8c99defc541408de7355bae1c29eb282a5f08181fde1e2aba8f7ae2a1dacde72248cbd34aa7a SHA512 41a14617142c50bafcb10a0596cb473710a0447af6b75146c01cc7150f139116b70529d37e202618f577f99783b3498778520ce78ece65f92ef57228c90cf996
 DIST kajongg-23.08.5.tar.xz 4592668 BLAKE2B 6155d5e483c5c0e46c2486b445a1e4e73a3a489188ab3eed5178918ab45802eab1a09cbec4d17c27679cd1b677ceda41006a88de7dba0550d346f3893f71cd8b SHA512 3a2eab57e71dc74e9f846705aebf827190d7927993d8442689961f42ec9ca5970f104a9ec14a80cabe8b18ef14fd44df8290eaf34914445ec4e4fdd32c718f10
 DIST kajongg-24.05.2.tar.xz 4601924 BLAKE2B 3c14def1edcc98d672adba7b87706894dfceda2f7b766e30d24b9130c785d0f4eeebc60611895ea97d3254867d3df0670dbc13feb2cdacf8db98a0fd0e597755 SHA512 6c5d1ac85204dd3a7f2e775660a0fbaf6b590d0d4fd64658d200b65b30edb09258a5ce4f7a5484467acef52324b28ed61022697b23100e32f1276c344b134075
 DIST kajongg-24.08.1.tar.xz 4606224 BLAKE2B 64c81b6a1d6e56653a3ab48105e8db7520b0c06d340318060a7d220de76709212bbea35b6a3c0e5d03168279ecdcb18508a51cd4275aa247370fde3b2b18138b SHA512 28f7dd5ba670b4a7e218f168340fa6b68e04a83abdb8060025ba20734131cfa424ff378d68ac3c47d3c31af22473175f55596fe3459dfffa30f9ab94e913d65e
 EBUILD kajongg-23.08.5.ebuild 1029 BLAKE2B 259a092855ee3b7138512f88a35bef4f28856ba1f25916fc293cb0e9c4bbb1a04dce44b24ad0daff2a3e001a7ec9d50cdd95e06df91314a5e7120f5879817cdd SHA512 c3b70b109d5c31f4cdcdd1fdb9ffe3c4f67d4bf87a61e9b60f34a917bd230cbbbfde95e1581d5a7e0b8cb632b735fa87095c844c2cf04cea024341a6368d8fcd
 EBUILD kajongg-24.05.2.ebuild 966 BLAKE2B 2b31bc2b22d3cac1711ce1bcdc7865b161374e87fd52bec45d2d60ef3b37ce3c18b68b932eba29a9038beb341e84374e4fc8ec9cbec0518cd83835ae6690ba5a SHA512 91d54cb8186ba7109f9865afa45d56ed4879c9cb363d9f9a80484fc0615dc2601ff891d3a6729468eb2c746bde9c544ea81428a0d9e3c36a75ca4e48bb45a028
-EBUILD kajongg-24.08.1.ebuild 1012 BLAKE2B 6851838de1bd942d213c8a7742315dd9b08ef01533d2ed5d8a60bb5ba826e0280eec4c59d94a50fc4d0295a5b284d4e0bae36bc23f9a6fa36b424fd5dd4c568c SHA512 23cf4eed07480455d4c47f612f03993a3cd2f07e264488b5634738fe915e10f75e2dac9db2090d930966c79dc618bc564b8e506e15de54c4491f2d9234ecc45f
+EBUILD kajongg-24.08.1-r1.ebuild 1077 BLAKE2B 22cba3ff04030408f60f4baf4b94d800233eb814707a7719ffbe330724e12486d3c9778c376823232a8208cfa8ea57f4356adaeaf3bbcace349ebbad078499b0 SHA512 fd4ac715c37bb310aba0546dba650f5c981941d2fcec7ae3f698a3ad7b6ed7137be5e3376e416bf49759f2de628355aa72b6c5a63e10660f41d6a6e7de85f418
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kajongg/files/kajongg-24.08.1-fix-w-o-pyqt6.patch b/kde-apps/kajongg/files/kajongg-24.08.1-fix-w-o-pyqt6.patch
new file mode 100644
index 000000000000..5ac159bd13c3
--- /dev/null
+++ b/kde-apps/kajongg/files/kajongg-24.08.1-fix-w-o-pyqt6.patch
@@ -0,0 +1,156 @@
+From 2628e367759fab2ff9365b4ebaf1b76cc3e8c301 Mon Sep 17 00:00:00 2001
+From: Wolfgang Rohdewald <wolfgang@rohdewald.de>
+Date: Tue, 10 Sep 2024 22:07:43 +0200
+Subject: [PATCH 1/4] did not work with QT=API=PYSIDE2 anymore
+
+(cherry picked from commit 8354d9b0fda654c0520c6c97d96f8b9a2f1eec34)
+---
+ src/kajongg.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/kajongg.py b/src/kajongg.py
+index 5f369889..139a061c 100755
+--- a/src/kajongg.py
++++ b/src/kajongg.py
+@@ -15,7 +15,7 @@ import os
+ import logging
+ from typing import Tuple, List, Optional, Type, Any
+ 
+-from qtpy import QT5
++from qtpy import QT5, PYSIDE2
+ from qt import QObject, QCommandLineParser, QCommandLineOption, Qt, QGuiApplication
+ from kde import KApplication
+ from mi18n import i18n, MLocale
+@@ -190,4 +190,7 @@ from mainwindow import MainWindow
+ if QT5:
+     QGuiApplication.setAttribute(Qt.ApplicationAttribute.AA_UseHighDpiPixmaps, True)  # type:ignore[attr-defined]
+ MainWindow()
+-Internal.app.exec()
++if PYSIDE2:
++    Internal.app.exec_()
++else:
++    Internal.app.exec()
+-- 
+2.46.0
+
+
+From f47761e86c1c97fcce543437a580051f5bfdf6e1 Mon Sep 17 00:00:00 2001
+From: Wolfgang Rohdewald <wolfgang@rohdewald.de>
+Date: Tue, 10 Sep 2024 22:09:13 +0200
+Subject: [PATCH 2/4] Help/About did not work with QT5 anymore
+
+(cherry picked from commit 7b69cc0a7fd8a999a41b1f874460f9634d1b1bd9)
+---
+ src/kdestub.py | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/kdestub.py b/src/kdestub.py
+index 651137a8..0985b75f 100644
+--- a/src/kdestub.py
++++ b/src/kdestub.py
+@@ -42,7 +42,7 @@ from configparser import ConfigParser, NoSectionError, NoOptionError
+ 
+ # pylint: disable=wildcard-import,unused-wildcard-import
+ from qt import *
+-from qtpy import QT6, PYSIDE2, PYSIDE6, QT_VERSION, API_NAME, PYQT_VERSION
++from qtpy import QT5, QT6, PYSIDE2, PYSIDE6, QT_VERSION, API_NAME, PYQT_VERSION
+ if QT6:
+     # pylint:disable=no-name-in-module
+     from qtpy.QtCore import QKeyCombination  # type: ignore
+@@ -1130,7 +1130,11 @@ class AboutKajonggDialog(KDialog):
+     @staticmethod
+     def licenseFile() ->Optional[str]:
+         """which may currently only be 1: GPL_V2"""
+-        prefix = QLibraryInfo.location(QLibraryInfo.LibraryPath.PrefixPath)  # type:ignore[attr-defined]
++        if QT5:
++            # pyqt 2.3.0 does not seem to handle this
++            prefix = QLibraryInfo.location(QLibraryInfo.LibraryLocation.PrefixPath)  # type:ignore[attr-defined]
++        else:
++            prefix = QLibraryInfo.path(QLibraryInfo.LibraryPath.PrefixPath)  # type:ignore[attr-defined]
+         for path in ('COPYING', '../COPYING',
+                      f'{prefix}/share/kf5/licenses/GPL_V2'):
+             path = os.path.abspath(path)
+-- 
+2.46.0
+
+
+From 534d598b4d19149e984cce22fc5431091dd2d47c Mon Sep 17 00:00:00 2001
+From: Wolfgang Rohdewald <wolfgang@rohdewald.de>
+Date: Tue, 10 Sep 2024 22:10:23 +0200
+Subject: [PATCH 3/4] this should work with PYSIDE6 without PyQt6 being
+ installed
+
+(cherry picked from commit 3f12d305cc56814b72c561b36271494a21cf236d)
+---
+ src/qt.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/qt.py b/src/qt.py
+index 38679abc..b9cf96ca 100644
+--- a/src/qt.py
++++ b/src/qt.py
+@@ -150,6 +150,9 @@ elif QT6:
+         return sip.cast(obj, _type)
+ else:
+     HAVE_SIP = False
++    def sip_cast(obj, _type):
++        """hide not so nice things in qt.py"""
++        raise NotImplementedError
+ 
+ def modeltest_is_supported() ->bool:
+     """Is the QT binding supported."""
+@@ -158,7 +161,7 @@ def modeltest_is_supported() ->bool:
+     try:
+         _ = sip_cast(QSize(), QSize)
+         return True
+-    except TypeError:
++    except (TypeError, NotImplementedError):
+         return False
+ 
+ SIP_VERSION_STR = 'no sip'
+-- 
+2.46.0
+
+
+From b025fef86626f7b3af17924de8ca7ae1cdde6b87 Mon Sep 17 00:00:00 2001
+From: Wolfgang Rohdewald <wolfgang@rohdewald.de>
+Date: Thu, 12 Sep 2024 21:09:54 +0200
+Subject: [PATCH 4/4] workaround: qtpy sometimes uses PYQT6 bindings even if it
+ cannot find module PyQt6. See KDE bug 486171
+
+(cherry picked from commit 88a0beb61b97682307d5cd70aa61dd832759f293)
+---
+ src/qt.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/qt.py b/src/qt.py
+index b9cf96ca..0799f6c2 100644
+--- a/src/qt.py
++++ b/src/qt.py
+@@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-2.0
+ 
+ # pylint: disable=unused-import
+ 
+-from qtpy import uic, QT5, QT6
++from qtpy import uic, QT5, QT6, PYQT5, PYQT6
+ from qtpy.QtCore import QAbstractAnimation
+ from qtpy.QtCore import QAbstractItemModel
+ from qtpy.QtCore import QAbstractTableModel
+@@ -138,12 +138,12 @@ from qtpy.QtSvg import QSvgRenderer
+ # pylint:disable=c-extension-no-member
+ 
+ HAVE_SIP = True
+-if QT5:
++if PYQT5:
+     from PyQt5 import sip
+     def sip_cast(obj, _type):
+         """hide not so nice things in qt.py"""
+         return sip.cast(obj, _type)
+-elif QT6:
++elif PYQT6:
+     from PyQt6 import sip  # type:ignore[no-redef]
+     def sip_cast(obj, _type):
+         """hide not so nice things in qt.py"""
+-- 
+2.46.0
+
diff --git a/kde-apps/kajongg/kajongg-24.08.1.ebuild b/kde-apps/kajongg/kajongg-24.08.1-r1.ebuild
index 806b66ab84db..b33c2a7a6bca 100644
--- a/kde-apps/kajongg/kajongg-24.08.1.ebuild
+++ b/kde-apps/kajongg/kajongg-24.08.1-r1.ebuild
@@ -36,6 +36,8 @@ RDEPEND="${DEPEND}
 	>=kde-apps/libkmahjongg-${PVCUT}:6
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-w-o-pyqt6.patch" ) # bug 939423
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 	ecm_pkg_setup