From 306e33a2f37ddb5c350cb0d9292eabf8704a7542 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Tue, 18 Mar 2025 19:43:52 +0500 Subject: [PATCH] gui-apps/meteo-qt: add 4.0, drop 3.3 Signed-off-by: Anna (cybertailor) Vyalkova --- gui-apps/meteo-qt/Manifest | 2 +- .../meteo-qt/files/meteo-qt-4.0-lrelease.patch | 11 +++++++++++ .../{meteo-qt-3.3.ebuild => meteo-qt-4.0.ebuild} | 14 ++++++++------ 3 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 gui-apps/meteo-qt/files/meteo-qt-4.0-lrelease.patch rename gui-apps/meteo-qt/{meteo-qt-3.3.ebuild => meteo-qt-4.0.ebuild} (72%) diff --git a/gui-apps/meteo-qt/Manifest b/gui-apps/meteo-qt/Manifest index f68e3054a8..47e13c891e 100644 --- a/gui-apps/meteo-qt/Manifest +++ b/gui-apps/meteo-qt/Manifest @@ -1,2 +1,2 @@ -DIST meteo-qt-3.3.gh.tar.gz 931450 BLAKE2B 0f8128ba768510b278862e2dbe33267cb339cb6fb6299e6448f49a6d5efaf98db045bd07833695e2eea936ce78bece4bc62bb62322a1df43767438e72c26dc86 SHA512 e52d05b98b99ecc01b9d584cf15db495f5c1eaa6e3ac1f429542d9d43e3890b03d93e3c7a55059821a32ea614cce7bb104b9353c59da04f164b561c920cca415 DIST meteo-qt-3.4.gh.tar.gz 970247 BLAKE2B 44980c54c4fd746b487192e621b84ec278db22fdea534646535f49535dc1937a815d79ede3870e49f14c95c051c73c90f4e1cdd25099ebf311bc3ecb540d727c SHA512 3e9221ba460a0be874c2e1edb8eac3d363bae68f7d333977196230e3d37f28b12ed1d02b3d729830fbcd68288994cc27d1d940989f36e44475bf8eb01529bbf1 +DIST meteo-qt-4.0.gh.tar.gz 1023640 BLAKE2B b1f81f6e711cd87c556acd50b6b48abff1064c355b8735352bb16edb91365447c2feb5e26e786c74a69cda4afbcc563efee211b2479a11b6ab7c8d43845a213d SHA512 3485e224e46f627341dd9770f756352b4c92e175080d5fa004fffa6bf0514da14e2ecc6e01184ff22390dbc6e9726667ce018e80a8a32b40fd932bfd11c26413 diff --git a/gui-apps/meteo-qt/files/meteo-qt-4.0-lrelease.patch b/gui-apps/meteo-qt/files/meteo-qt-4.0-lrelease.patch new file mode 100644 index 0000000000..61b139080f --- /dev/null +++ b/gui-apps/meteo-qt/files/meteo-qt-4.0-lrelease.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -18,7 +18,7 @@ class BuildQm(build): + return pyproject_files + + subprocess.run(["pylupdate6"] + extract_py_sources() + ["-ts", "translations/meteo-qt_en.ts"]) +- subprocess.run(subprocess.run(["lrelease-pro-qt6", "meteo_qt/meteo_qt.pro"])) ++ subprocess.run(["lrelease-pro", "meteo_qt/meteo_qt.pro"]) + + + PROJECT_PATH = Path(__file__).parent diff --git a/gui-apps/meteo-qt/meteo-qt-3.3.ebuild b/gui-apps/meteo-qt/meteo-qt-4.0.ebuild similarity index 72% rename from gui-apps/meteo-qt/meteo-qt-3.3.ebuild rename to gui-apps/meteo-qt/meteo-qt-4.0.ebuild index ecec26b3da..9cb2ba2fcd 100644 --- a/gui-apps/meteo-qt/meteo-qt-3.3.ebuild +++ b/gui-apps/meteo-qt/meteo-qt-4.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{11..12} ) +PYTHON_COMPAT=( python3_{11..13} ) DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 qmake-utils xdg @@ -18,17 +18,19 @@ KEYWORDS="~amd64" RDEPEND=" $(python_gen_cond_dep ' - dev-python/pyqt5[${PYTHON_USEDEP}] + dev-python/pyqt6[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] ') " BDEPEND=" - dev-python/pyqt5 - dev-qt/linguist-tools + dev-python/pyqt6 + dev-qt/qttools:6[linguist] " +PATCHES=( "${FILESDIR}"/${PN}-4.0-lrelease.patch ) + src_compile() { - local -x PATH="$(qt5_get_bindir):${PATH}" + local -x PATH="${EPREFIX}$(qt6_get_libdir)/qt6/libexec:${PATH}" distutils-r1_src_compile }