From f29eb0598f62fc3b5f09f2de5a89c0437c6164d9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 21 Jan 2020 18:52:40 +0000 Subject: gentoo resync : 21.01.2020 --- kde-apps/kig/Manifest | 5 +- .../kig/files/kig-19.08.3-scripter-crash.patch | 29 +++++++++ kde-apps/kig/files/kig-4.12.0-boostpython.patch | 2 +- kde-apps/kig/kig-19.08.3-r2.ebuild | 73 ++++++++++++++++++++++ kde-apps/kig/kig-19.12.1-r1.ebuild | 72 +++++++++++++++++++++ 5 files changed, 179 insertions(+), 2 deletions(-) create mode 100644 kde-apps/kig/files/kig-19.08.3-scripter-crash.patch create mode 100644 kde-apps/kig/kig-19.08.3-r2.ebuild create mode 100644 kde-apps/kig/kig-19.12.1-r1.ebuild (limited to 'kde-apps/kig') diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest index 075e6fba9e8a..d5ce5c0adf71 100644 --- a/kde-apps/kig/Manifest +++ b/kde-apps/kig/Manifest @@ -1,8 +1,11 @@ AUX kig-19.08.3-pykig-python3.patch 4617 BLAKE2B 6c10c34462ef5c0387e35cdfe79aa8144474675f0ec565fcefb4c90d6ae182340dfc619afd823a7df8357b529c10a4a68b7bcd99e5d540832574a0a51d41e52b SHA512 c405b90184456066f085563637ec8c6e478d8bcc200e2d17baa32eb7dd3a208ec2f2d79b84777ddc8b0722819a6ac99427e8d5f2db31b89b0a9e37f38eb7fa1b +AUX kig-19.08.3-scripter-crash.patch 829 BLAKE2B f783a2937f4348c928fa40018005a677619ddba477ac6332f92015b9a365ae8a990dce78d3972a1bead3931a6adeb04976bb058039ba48a12c7c4ded9157e94c SHA512 6463b14d7ff5b1884a03b1f6803fdb722524b591ceee5819251ee6e92c4991455d6426b4e42ebf55021820843edff3ab52ac191221f67b9d3def7f51490dedf5 AUX kig-19.08.3-scripter-python3.patch 981 BLAKE2B 66a23977cbcbfaf7965d1264c1806991c8ab1f7636d7e8da83bc218efb011992f63c43b9b2ebadc5b8c21ce114f6a06c93b7c9a531372ac1abaa608ed9288f30 SHA512 a82612a8cb8e95e2a5e839d27bd27fe0f7942df6cf777ea10653791e26a4175fbdd47981c50ab3d5091831f58555c5b3dba94b4b383a916b21482176377bc21c -AUX kig-4.12.0-boostpython.patch 1012 BLAKE2B d2dc90dfbdc0e361faef3506f32b37afae4a35a8c1ed0c16f0e52b9b56b33cb4b355ae313b2699125764508008bd75cb357ea6a9b020773e0faf88f208dea9db SHA512 0e490efcda1d61b9053fd4eec45e872db62b2f1f543378fb397bde65cb79e575a9268a2e2dd18e2b5590f60ba6f72954612191d0cfa1b57a697b627367a7c18f +AUX kig-4.12.0-boostpython.patch 1014 BLAKE2B f860ac552eb6e50040ce7cdcb2891e246a64fa69002790015774ff2080fc6b7e850fdacc775d65ed79fc32e97e57304dcbb149f5089a8ecf981989f0894feb36 SHA512 fb9e9269fc4af850635eb88f5a97f2c61d7419fbaeff4bef0ed9d4ebf410c4cd02ab70733c3f1d0b08444e1a878fa74a9d691268f30c339b7855506e56c34fa8 DIST kig-19.08.3.tar.xz 3497128 BLAKE2B e6611dd70ef47d0c710b5127b01532da4dc0841dbbfd8a151a9a867970389aa3c46d74a1347504beef5ca3c6fbcfaf2521923d7e34306eba580d88ecf002b1f8 SHA512 7e5f315695e9678c3e95822da3e86328dd8d6521d83697c623ac0175ae96fe13490d39e8a338c2112939b6b808fe8a213fafdcad951731b45902d9a2a2807b03 DIST kig-19.12.1.tar.xz 3501216 BLAKE2B d381c11f14762ccfc8d41752b3905630b078bbdd0922c27da3cf90c7fbf836f613171d8f651652c35e298b3e6676b85aaa2d20783a76b8fa518d2b5e81735274 SHA512 f5c681c1f491f2b6e0d34376b12eb75ed85b7f2d159fba3bf26a3e2b2fee15919e5bbe426e0d4021581a71899853c19a65db4f56263874a2a710b53617260784 EBUILD kig-19.08.3-r1.ebuild 1765 BLAKE2B ee2b1f5c40158cc55f9adff63ec3fcd925626a316cca5b8f2ca2f6a605c245da1619af097963baa1f1dd56e0f519f5917f4c5bb2d39ea81271809c98a6728f6d SHA512 9dbf74b471ce5b14900d8d2c0b5817fc70934d04411649785df604030125b9c5bd41a761eedf2c69d725df84ea4102dacac5e4e0fd4b408f314dc674b9322d43 +EBUILD kig-19.08.3-r2.ebuild 1809 BLAKE2B 301d02908444b087bbf968133503ae88003d17156dcbff7b50b5bec3cbd2662a3076fb131b8d2c86f3a5834f5b4726c782a8dc347bd823b377cd608a93d6f9ca SHA512 9ce77b6589f40a5e02e912a50c57e14dd8d85d45139f603e719c6419ca5bdc1b32e5f50bdcd2b5f9d5591424ff99d8794ec645aa071995e9451929d077c34bb1 +EBUILD kig-19.12.1-r1.ebuild 1784 BLAKE2B 7511cfee58b924af29572996a42cdd73f0d2e107fba2a11f512c03594895b1f338670c47c3d99ec3bdd0b04ae2d040371b359e2c54a15c9f5cb3613e8333d950 SHA512 3407cb06861f321f12a9119a7be4335c8870156d89a2f744714c123e05dd44d3cbed20b82e45c82b61da41398001488ce77c9ab757a73dab4c0ed80b15cfe1be EBUILD kig-19.12.1.ebuild 1734 BLAKE2B 3c8392669eee83c11286e2219f907d0be7043dde2f506385b964fdd7cab21a150a02f3a810655cb77f562f41b95e834085048bf1f34e6b25603525910d120be9 SHA512 1396c38819faf25c79964f88ba7fb2da4f06d7c5f1d31795d96c632a8416ffc23de5fe4dc9a93692b8f84bbab0dd73aa0a1558321d135c2fe59a784dda55dc56 MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9 diff --git a/kde-apps/kig/files/kig-19.08.3-scripter-crash.patch b/kde-apps/kig/files/kig-19.08.3-scripter-crash.patch new file mode 100644 index 000000000000..9540e9044f3b --- /dev/null +++ b/kde-apps/kig/files/kig-19.08.3-scripter-crash.patch @@ -0,0 +1,29 @@ +From 211f8501ec4cf77ed68253783d58a662b5513612 Mon Sep 17 00:00:00 2001 +From: Maurizio Paolini +Date: Sat, 11 Jan 2020 19:50:33 +0100 +Subject: Fix crash upon exit after transition python2 -> python3 when using + scripting (bug #416037) + +Reviewed By: kkevin +Differential Revision: https://phabricator.kde.org/D12833 +CCBUG: 416037 +--- + scripting/python_scripter.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripting/python_scripter.cc b/scripting/python_scripter.cc +index bb5db39..3edec77 100644 +--- a/scripting/python_scripter.cc ++++ b/scripting/python_scripter.cc +@@ -427,8 +427,8 @@ PythonScripter::PythonScripter() + PythonScripter::~PythonScripter() + { + PyErr_Clear(); +- Py_Finalize(); + delete d; ++ Py_FinalizeEx(); + } + + class CompiledPythonScript::Private +-- +cgit v1.1 diff --git a/kde-apps/kig/files/kig-4.12.0-boostpython.patch b/kde-apps/kig/files/kig-4.12.0-boostpython.patch index 7a4b878c6bc3..c9ca1b2f9d06 100644 --- a/kde-apps/kig/files/kig-4.12.0-boostpython.patch +++ b/kde-apps/kig/files/kig-4.12.0-boostpython.patch @@ -14,4 +14,4 @@ index 2ccc161..02d9bf6 100644 + pkg_check_modules(_python python-${_pyver}) if(${_pyver}_FOUND) cmake_push_check_state() - set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${${_pyver}_INCLUDE_DIRS}) \ No newline at end of file + set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${${_pyver}_INCLUDE_DIRS}) diff --git a/kde-apps/kig/kig-19.08.3-r2.ebuild b/kde-apps/kig/kig-19.08.3-r2.ebuild new file mode 100644 index 000000000000..e6f4820bb303 --- /dev/null +++ b/kde-apps/kig/kig-19.08.3-r2.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +PYTHON_COMPAT=( python3_{6,7,8} ) +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit python-single-r1 ecm kde.org + +DESCRIPTION="KDE Interactive Geometry tool" +HOMEPAGE="https://kde.org/applications/education/org.kde.kig +https://edu.kde.org/kig/" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="geogebra scripting" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 ) + scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) +" +DEPEND="${RDEPEND} + >=kde-frameworks/ktexteditor-${KFMIN}:5 +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.12.0-boostpython.patch + "${FILESDIR}"/${P}-scripter-python3.patch + "${FILESDIR}"/${P}-scripter-crash.patch + "${FILESDIR}"/${P}-pykig-python3.patch +) + +pkg_setup() { + python-single-r1_pkg_setup + ecm_pkg_setup +} + +src_prepare() { + ecm_src_prepare + python_fix_shebang . +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package geogebra Qt5XmlPatterns) + $(cmake_use_find_package scripting BoostPython) + ) + + ecm_src_configure +} diff --git a/kde-apps/kig/kig-19.12.1-r1.ebuild b/kde-apps/kig/kig-19.12.1-r1.ebuild new file mode 100644 index 000000000000..97c83d4330f9 --- /dev/null +++ b/kde-apps/kig/kig-19.12.1-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +PYTHON_COMPAT=( python3_{6,7,8} ) +KFMIN=5.63.0 +QTMIN=5.12.3 +inherit python-single-r1 ecm kde.org + +DESCRIPTION="KDE Interactive Geometry tool" +HOMEPAGE="https://kde.org/applications/education/org.kde.kig +https://edu.kde.org/kig/" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="geogebra scripting" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 ) + scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] ) +" +DEPEND="${RDEPEND} + >=kde-frameworks/ktexteditor-${KFMIN}:5 +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.12.0-boostpython.patch + "${FILESDIR}"/${PN}-19.08.3-pykig-python3.patch + "${FILESDIR}"/${PN}-19.08.3-scripter-crash.patch +) + +pkg_setup() { + python-single-r1_pkg_setup + ecm_pkg_setup +} + +src_prepare() { + ecm_src_prepare + python_fix_shebang . +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package geogebra Qt5XmlPatterns) + $(cmake_use_find_package scripting BoostPython) + ) + + ecm_src_configure +} -- cgit v1.2.3