[gentoo-commits] proj/kde:master commit in: kde-frameworks/ki18n/files/, kde-frameworks/ki18n/

[gentoo-commits] proj/kde:master commit in: kde-frameworks/ki18n/files/, kde-frameworks/ki18n/

[Andreas Sturmlechner]

commit:     bcc04eaf5bb1c60b1739bfb217e4037e53988ffd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 19:04:17 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 11:13:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bcc04eaf

kde-frameworks/ki18n: Fix build with python2_7

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch | 11 +++++++++++
 kde-frameworks/ki18n/ki18n-9999.ebuild               |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch b/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch
new file mode 100644
index 0000000000..8b863e4e0f
--- /dev/null
+++ b/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch
@@ -0,0 +1,11 @@
+--- a/cmake/KF5I18nMacros.cmake.in	2019-04-07 09:28:26.000000000 +0200
++++ b/cmake/KF5I18nMacros.cmake.in	2019-04-20 20:56:41.628484762 +0200
+@@ -31,7 +31,7 @@
+ # solution if it cannot be found in $PATH when building applications.
+ set(_KI18N_PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@")
+ 
+-find_program(KI18N_PYTHON_EXECUTABLE NAMES python3 python2 python)
++find_program(KI18N_PYTHON_EXECUTABLE NAMES python)
+ if(NOT KI18N_PYTHON_EXECUTABLE)
+     set(KI18N_PYTHON_EXECUTABLE "${_KI18N_PYTHON_EXECUTABLE}")
+ endif()

diff --git a/kde-frameworks/ki18n/ki18n-9999.ebuild b/kde-frameworks/ki18n/ki18n-9999.ebuild
index b452e1b707..0efa337e88 100644
--- a/kde-frameworks/ki18n/ki18n-9999.ebuild
+++ b/kde-frameworks/ki18n/ki18n-9999.ebuild
@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
 	test? ( $(add_qt_dep qtconcurrent) )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.57.0-python.patch" )
+
 pkg_setup() {
 	kde5_pkg_setup
 	python-single-r1_pkg_setup

[gentoo-commits] proj/kde:master commit in: kde-frameworks/ki18n/files/, kde-frameworks/ki18n/

[Andreas Sturmlechner]

commit:     1a04bc9b79f045dce8ffede909b949d6bc1cf141
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 19:34:18 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 20:27:34 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a04bc9b

kde-frameworks/ki18n: Drop long obsolete python patch

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch | 11 -----------
 kde-frameworks/ki18n/ki18n-5.9999.ebuild             |  2 --
 2 files changed, 13 deletions(-)

diff --git a/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch b/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch
deleted file mode 100644
index 8b863e4e0f..0000000000
--- a/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/KF5I18nMacros.cmake.in	2019-04-07 09:28:26.000000000 +0200
-+++ b/cmake/KF5I18nMacros.cmake.in	2019-04-20 20:56:41.628484762 +0200
-@@ -31,7 +31,7 @@
- # solution if it cannot be found in $PATH when building applications.
- set(_KI18N_PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@")
- 
--find_program(KI18N_PYTHON_EXECUTABLE NAMES python3 python2 python)
-+find_program(KI18N_PYTHON_EXECUTABLE NAMES python)
- if(NOT KI18N_PYTHON_EXECUTABLE)
-     set(KI18N_PYTHON_EXECUTABLE "${_KI18N_PYTHON_EXECUTABLE}")
- endif()

diff --git a/kde-frameworks/ki18n/ki18n-5.9999.ebuild b/kde-frameworks/ki18n/ki18n-5.9999.ebuild
index 9401be9304..9c4cc7a4aa 100644
--- a/kde-frameworks/ki18n/ki18n-5.9999.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.9999.ebuild
@@ -26,8 +26,6 @@ RDEPEND="${COMMON_DEPEND}
 	app-text/iso-codes
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.57.0-python.patch" )
-
 pkg_setup() {
 	ecm_pkg_setup
 	python-single-r1_pkg_setup