From 3517852e3b8a68d1e997770fc0650c5053bafc6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 Jan 2022 01:27:12 +0000 Subject: gentoo resync : 04.01.2022 --- kde-apps/Manifest.gz | Bin 37758 -> 37760 bytes kde-apps/kajongg/Manifest | 5 +- .../kajongg/files/kajongg-21.08.3-python3.10.patch | 109 +++++++++++++++++++++ kde-apps/kajongg/kajongg-21.08.3-r1.ebuild | 50 ++++++++++ kde-apps/kajongg/kajongg-21.08.3.ebuild | 48 --------- kde-apps/kajongg/kajongg-21.12.0-r1.ebuild | 50 ++++++++++ kde-apps/kajongg/kajongg-21.12.0.ebuild | 48 --------- 7 files changed, 212 insertions(+), 98 deletions(-) create mode 100644 kde-apps/kajongg/files/kajongg-21.08.3-python3.10.patch create mode 100644 kde-apps/kajongg/kajongg-21.08.3-r1.ebuild delete mode 100644 kde-apps/kajongg/kajongg-21.08.3.ebuild create mode 100644 kde-apps/kajongg/kajongg-21.12.0-r1.ebuild delete mode 100644 kde-apps/kajongg/kajongg-21.12.0.ebuild (limited to 'kde-apps') diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz index 8b462b7fa798..68d6d3ae5ca9 100644 Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest index 4009e3a9f1eb..d5ec96771427 100644 --- a/kde-apps/kajongg/Manifest +++ b/kde-apps/kajongg/Manifest @@ -1,5 +1,6 @@ +AUX kajongg-21.08.3-python3.10.patch 4231 BLAKE2B 52752926e4700f95670f84963577e01297b6b2a3edb8c632a3641aa09692bf59807d4a2c2ef0bef5f056273b52799d864e8ccac94f3429a91273ddb4c0a9309d SHA512 a5f213d14c558321521713924c5b390e3a0644ca40d3db4a63635e708572f1b2f68f313290b065fade9fb2f526a636025f66bae38c1bc62918793dacc6dcf178 DIST kajongg-21.08.3.tar.xz 4558208 BLAKE2B 0f92104be52b61ac107d6530078fd669509d40d39dec2a27f9bf22230e3395e756e7e58f809d8536d98d0d5fb2b2312c0f26ab94de6e216a27fd2408167a514c SHA512 017f687822e5de18466333e70479bfab12b7d22f28ba69479adf16cca99ef102106c2b6aa55dea801edb2299fb2ad5de379bb30942314ff2a195beb54695ae2f DIST kajongg-21.12.0.tar.xz 4560512 BLAKE2B 4380e9827f6adc7e0e5ec5f2368df42355970752d156f1a97214fdcd27cb554ddbe9e85599773771dc3030c9900e755f6f84740830faaeb30a597a9a15af619a SHA512 65f2cea751396ab3e1826133884eea81e96db550dde7c382681f4fc896c5f4c7ba1e222161f2c4250def294e059d8858b29640ceb0b0621567184f38a6bd24ee -EBUILD kajongg-21.08.3.ebuild 1016 BLAKE2B 9b12f817e923616ec2af5ea4d4534efe53a53e3fbd345e3377962ec82a2443d70bddd996d0ae028757c99d22e7cc1ebed67d34fe07fb86f8ba4b2ce5ce48b49c SHA512 fd62b08cbec3f5f57a6d2c88f99ed44e7b0d777ceecf5157ee4fcd7ab2407a3b77b180ccc86072c856ff4ab6f7a9c474469ec26d68cc4ba0aa31b4459847f10b -EBUILD kajongg-21.12.0.ebuild 1019 BLAKE2B 0dcdd3b463d4623d8c5c018072c6142d9727ed5e355ed870dbc7adde80203a721bcb4df8e7a8c0fbfc050a3a57f4a5b7ec92d83134ace32707f4592cb3468195 SHA512 7c2f35769e7685acd3fdb706ccec27edda01f7125dfe949fa7b460f4565b1319ce92bbf9b8cfd5cfa5922b4278866ac7e63a3e38c9af019178e1e119840ae20a +EBUILD kajongg-21.08.3-r1.ebuild 1065 BLAKE2B 550cd500677f8046222316a8411ee84894abcf9969c077966fb68a91180c9b1485058f1ac219a4ec5260090c84b92eb47b2d25c090d612899ed5211731588304 SHA512 08cf5244d4b7af6f5d962d53a7b1e8443494c9aa96f2c4745f8ec5fc4a617fe38c477da3d02ab398c553d5e14486582e1a79e80036276dcb52bfb7be704880bf +EBUILD kajongg-21.12.0-r1.ebuild 1077 BLAKE2B b696845d6688985176467f23ef520fdcf47e43e55c155f6efdc6f51199da989eeb17ec382144b0af849b6a9a6d4817ca0a829083a62c505341174998a46bb531 SHA512 09113a12a306b3a791708ba12b56ab6f1f528f5e039cdf3f29a0dc221ba29c1c596f8e20af1306d52136b7dbe216eb175d377b0f938635bb1a5b566c7f0f5a3c MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-apps/kajongg/files/kajongg-21.08.3-python3.10.patch b/kde-apps/kajongg/files/kajongg-21.08.3-python3.10.patch new file mode 100644 index 000000000000..d9f7e100309d --- /dev/null +++ b/kde-apps/kajongg/files/kajongg-21.08.3-python3.10.patch @@ -0,0 +1,109 @@ +From b647417e16f6146f4ae89608fd0494e7780da862 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Sat, 18 Dec 2021 10:13:32 +0000 +Subject: [PATCH] Fix running with Python 3.10 + +--- + src/board.py | 10 +++++----- + src/genericdelegates.py | 2 +- + src/humanclient.py | 4 ++-- + src/qtreactor.py | 2 +- + src/uitile.py | 4 ++-- + 5 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/src/board.py b/src/board.py +index 2f52a47d..ed432c22 100644 +--- a/src/board.py ++++ b/src/board.py +@@ -102,7 +102,7 @@ class PlayerWind(AnimatedMixin, QGraphicsObject, StrMixin): + """paint the marker""" + with Painter(painter): + painter.setBrush(self.__brush) +- size = Internal.scene.windTileset.faceSize.height() ++ size = int(Internal.scene.windTileset.faceSize.height()) + ellRect = QRectF(QPoint(), QPoint(size, size)) + painter.drawEllipse(ellRect) + renderer = Internal.scene.windTileset.renderer() +@@ -112,7 +112,7 @@ class PlayerWind(AnimatedMixin, QGraphicsObject, StrMixin): + + def boundingRect(self): # pylint: disable=no-self-use + """define the part of the tile we want to see""" +- size = Internal.scene.windTileset.faceSize.height() * 1.1 ++ size = int(Internal.scene.windTileset.faceSize.height() * 1.1) + return QRectF(QPoint(), QPoint(size, size)) + + def __str__(self): +@@ -878,11 +878,11 @@ class FittingView(QGraphicsView): + tRect = uiTile.boundingRect() + tRect = self.viewportTransform().mapRect(tRect) + pmapSize = QSize( +- tRect.width() * uiTile.scale, +- tRect.height() * uiTile.scale) ++ int(tRect.width() * uiTile.scale), ++ int(tRect.height() * uiTile.scale)) + pMap = uiTile.pixmapFromSvg(pmapSize) + drag.setPixmap(pMap) +- drag.setHotSpot(QPoint(pMap.width() / 2, pMap.height() / 2)) ++ drag.setHotSpot(QPoint(int(pMap.width() / 2), int(pMap.height() / 2))) + return drag + + +diff --git a/src/genericdelegates.py b/src/genericdelegates.py +index be99eb57..a4521177 100644 +--- a/src/genericdelegates.py ++++ b/src/genericdelegates.py +@@ -64,7 +64,7 @@ class RichTextColumnDelegate(QStyledItemDelegate): + text = index.model().data(index) + self.document.setDefaultFont(option.font) + self.document.setHtml(text) +- return QSize(self.document.idealWidth() + 5, ++ return QSize(int(self.document.idealWidth()) + 5, + option.fontMetrics.height()) + + +diff --git a/src/humanclient.py b/src/humanclient.py +index 1d3f58f3..8edf848b 100644 +--- a/src/humanclient.py ++++ b/src/humanclient.py +@@ -321,8 +321,8 @@ class ClientDialog(QDialog): + idx if vertical else 0, + idx if not vertical else 0) + +- geometry.setWidth(width) +- geometry.setHeight(height) ++ geometry.setWidth(int(width)) ++ geometry.setHeight(int(height)) + self.setGeometry(geometry) + + def showEvent(self, dummyEvent): +diff --git a/src/qtreactor.py b/src/qtreactor.py +index bda4782f..c24d01d0 100644 +--- a/src/qtreactor.py ++++ b/src/qtreactor.py +@@ -250,7 +250,7 @@ class QtReactor(posixbase.PosixReactorBase): + timeout = 0 + else: + timeout = self.timeout() +- self._timer.setInterval(timeout * 1000) ++ self._timer.setInterval(int(timeout * 1000)) + self._timer.start() + + def runReturn(self, installSignalHandlers=True): +diff --git a/src/uitile.py b/src/uitile.py +index 57e322bb..9e4b3f9d 100644 +--- a/src/uitile.py ++++ b/src/uitile.py +@@ -250,8 +250,8 @@ class UITile(AnimatedMixin, QGraphicsObject, StrMixin): + if self.showFace(): + faceSize = self.tileset.faceSize.toSize() + faceSize = QSize( +- faceSize.width() * xScale, +- faceSize.height() * yScale) ++ int(faceSize.width() * xScale), ++ int(faceSize.height() * yScale)) + painter.translate(self.facePos()) + renderer.render(painter, self.tileset.svgName[self.tile.exposed], + QRectF(QPointF(), QSizeF(faceSize))) +-- +GitLab + diff --git a/kde-apps/kajongg/kajongg-21.08.3-r1.ebuild b/kde-apps/kajongg/kajongg-21.08.3-r1.ebuild new file mode 100644 index 000000000000..254228048ce3 --- /dev/null +++ b/kde-apps/kajongg/kajongg-21.08.3-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +PYTHON_COMPAT=( python3_{8..10} ) +PVCUT=$(ver_cut 1-3) +KFMIN=5.84.0 +QTMIN=5.15.2 +inherit python-single-r1 ecm kde.org + +DESCRIPTION="Classical Mah Jongg for four players" +HOMEPAGE="https://apps.kde.org/kajongg/" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="amd64 arm64 ~riscv x86" +IUSE="" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + dev-db/sqlite:3 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-apps/libkdegames-${PVCUT}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + $(python_gen_cond_dep ' + dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/twisted-16.6.0[${PYTHON_USEDEP}] + ') +" +RDEPEND="${DEPEND} + >=kde-apps/libkmahjongg-${PVCUT}:5 +" + +PATCHES=( "${FILESDIR}/${P}-python3.10.patch" ) + +pkg_setup() { + python-single-r1_pkg_setup + ecm_pkg_setup +} + +src_prepare() { + python_fix_shebang src + ecm_src_prepare +} diff --git a/kde-apps/kajongg/kajongg-21.08.3.ebuild b/kde-apps/kajongg/kajongg-21.08.3.ebuild deleted file mode 100644 index 7bb25ba3b606..000000000000 --- a/kde-apps/kajongg/kajongg-21.08.3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -PYTHON_COMPAT=( python3_{8..10} ) -PVCUT=$(ver_cut 1-3) -KFMIN=5.84.0 -QTMIN=5.15.2 -inherit python-single-r1 ecm kde.org - -DESCRIPTION="Classical Mah Jongg for four players" -HOMEPAGE="https://apps.kde.org/kajongg/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 arm64 ~riscv x86" -IUSE="" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS} - dev-db/sqlite:3 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-apps/libkdegames-${PVCUT}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - $(python_gen_cond_dep ' - dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}] - >=dev-python/twisted-16.6.0[${PYTHON_USEDEP}] - ') -" -RDEPEND="${DEPEND} - >=kde-apps/libkmahjongg-${PVCUT}:5 -" - -pkg_setup() { - python-single-r1_pkg_setup - ecm_pkg_setup -} - -src_prepare() { - python_fix_shebang src - ecm_src_prepare -} diff --git a/kde-apps/kajongg/kajongg-21.12.0-r1.ebuild b/kde-apps/kajongg/kajongg-21.12.0-r1.ebuild new file mode 100644 index 000000000000..698f5a8e9bcd --- /dev/null +++ b/kde-apps/kajongg/kajongg-21.12.0-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +PYTHON_COMPAT=( python3_{8..10} ) +PVCUT=$(ver_cut 1-3) +KFMIN=5.88.0 +QTMIN=5.15.2 +inherit python-single-r1 ecm kde.org + +DESCRIPTION="Classical Mah Jongg for four players" +HOMEPAGE="https://apps.kde.org/kajongg/" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + dev-db/sqlite:3 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-apps/libkdegames-${PVCUT}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + $(python_gen_cond_dep ' + dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/twisted-16.6.0[${PYTHON_USEDEP}] + ') +" +RDEPEND="${DEPEND} + >=kde-apps/libkmahjongg-${PVCUT}:5 +" + +PATCHES=( "${FILESDIR}/${PN}-21.08.3-python3.10.patch" ) + +pkg_setup() { + python-single-r1_pkg_setup + ecm_pkg_setup +} + +src_prepare() { + python_fix_shebang src + ecm_src_prepare +} diff --git a/kde-apps/kajongg/kajongg-21.12.0.ebuild b/kde-apps/kajongg/kajongg-21.12.0.ebuild deleted file mode 100644 index e6e07170fdd6..000000000000 --- a/kde-apps/kajongg/kajongg-21.12.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -PYTHON_COMPAT=( python3_{8..10} ) -PVCUT=$(ver_cut 1-3) -KFMIN=5.88.0 -QTMIN=5.15.2 -inherit python-single-r1 ecm kde.org - -DESCRIPTION="Classical Mah Jongg for four players" -HOMEPAGE="https://apps.kde.org/kajongg/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" -IUSE="" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS} - dev-db/sqlite:3 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-apps/libkdegames-${PVCUT}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - $(python_gen_cond_dep ' - dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}] - >=dev-python/twisted-16.6.0[${PYTHON_USEDEP}] - ') -" -RDEPEND="${DEPEND} - >=kde-apps/libkmahjongg-${PVCUT}:5 -" - -pkg_setup() { - python-single-r1_pkg_setup - ecm_pkg_setup -} - -src_prepare() { - python_fix_shebang src - ecm_src_prepare -} -- cgit v1.2.3