diff options
Diffstat (limited to 'dev-libs/kosmindoormap')
| -rw-r--r-- | dev-libs/kosmindoormap/Manifest | 1 | ||||
| -rw-r--r-- | dev-libs/kosmindoormap/files/kosmindoormap-24.05.1-cmake.patch | 82 | ||||
| -rw-r--r-- | dev-libs/kosmindoormap/kosmindoormap-24.05.2.ebuild | 51 |
3 files changed, 0 insertions, 134 deletions
diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest index 18ef3e10689c..5a8eb6bd159b 100644 --- a/dev-libs/kosmindoormap/Manifest +++ b/dev-libs/kosmindoormap/Manifest @@ -1,2 +1 @@ -DIST kosmindoormap-24.05.2.tar.xz 647752 BLAKE2B 9464b424669a412b4b32958ced91c0dae9980e9387cc97b823bcdaecffca850d29f25e9b437fc1d3b4d8b0d8022c6fc7b0a8e176a20f72ee2714da1691207838 SHA512 2bf2998be61893d651dbd1a9a0e509c6cf83a122e9ee95c265bf0507706c77b20b7e64d462840d76c7b1aa6f9d884305812e32dc4058c09a0f724994d2e073b1 DIST kosmindoormap-24.08.0.tar.xz 691616 BLAKE2B f325622978ac6054b4523cb90e692087005412fd5e420e2e1e8f1940bd71bbc49a9777e5d2b66b7d995c024819f5f368e3111f9ae807182f86a5dbc18fbbf4db SHA512 926561007d47ec4ba60d488431785762f78835f0202c6f87b1ca7e5f0d38c6928a56181dd79d852140f1d54cae6d9f964ffa8c518f587c3b29a8c9f11ef61c25 diff --git a/dev-libs/kosmindoormap/files/kosmindoormap-24.05.1-cmake.patch b/dev-libs/kosmindoormap/files/kosmindoormap-24.05.1-cmake.patch deleted file mode 100644 index 77d51d1da9be..000000000000 --- a/dev-libs/kosmindoormap/files/kosmindoormap-24.05.1-cmake.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 88cdec4c0bc40f4e98105a0b69c968fdd94ac7f4 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 30 Jun 2024 23:17:00 +0200 -Subject: [PATCH 1/3] Fix/simplify BUILD_STANDALONE_APP decisionmaking - -BUILD_STANDALONE_APP=ON guarantees Qt::Widgets so no need for this check. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 79f07df..cdd99e1 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -10,7 +10,7 @@ if (TARGET Qt::Quick) - add_subdirectory(map-quick) - add_subdirectory(map-publictransport-integration) - endif() --if ((NOT ANDROID AND TARGET Qt::Widgets) OR BUILD_STANDALONE_APP) -+if (BUILD_STANDALONE_APP) - add_subdirectory(app) - endif() - if (NOT CROSS_COMPILING) --- -2.45.2 - - -From 09d0bda83e6de957ad8883926d8b9f9b3adfe762 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 30 Jun 2024 23:23:22 +0200 -Subject: [PATCH 2/3] Use more QT_MIN_VERSION - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bbf417f..6da25de 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -54,7 +54,7 @@ if (NOT BUILD_TOOLS_ONLY) - endif() - - if (BUILD_TESTING) -- find_package(Qt6 6.5 REQUIRED COMPONENTS Test Widgets) -+ find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Test Widgets) - endif() - - if (BUILD_STANDALONE_APP) --- -2.45.2 - - -From 74c3516e698a4fc53e45585a5846a170a8f25e2f Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 30 Jun 2024 23:25:46 +0200 -Subject: [PATCH 3/3] Add missing KF6I18n dependency for BUILD_STANDALONE_APP - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6da25de..dd55077 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -61,7 +61,7 @@ if (BUILD_STANDALONE_APP) - if (NOT ANDROID) - find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS Widgets) - else() -- find_package(KF6 REQUIRED COMPONENTS Kirigami2) -+ find_package(KF6 6.3 REQUIRED COMPONENTS I18n Kirigami) - find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS QuickControls2 Svg) - find_package(OpenSSL REQUIRED) - if (NOT DEFINED BREEZEICONS_DIR AND EXISTS ${CMAKE_SOURCE_DIR}/../breeze-icons) --- -2.45.2 - diff --git a/dev-libs/kosmindoormap/kosmindoormap-24.05.2.ebuild b/dev-libs/kosmindoormap/kosmindoormap-24.05.2.ebuild deleted file mode 100644 index 5dc6d3d36d64..000000000000 --- a/dev-libs/kosmindoormap/kosmindoormap-24.05.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -PVCUT=$(ver_cut 1-3) -KFMIN=6.3.0 -QTMIN=6.6.2 -inherit ecm gear.kde.org - -DESCRIPTION="Data Model and Extraction System for Travel Reservation information" -HOMEPAGE="https://invent.kde.org/libraries/kosmindoormap" - -LICENSE="LGPL-2+" -SLOT="6" -KEYWORDS="~amd64 ~arm64" -IUSE="+gui" - -# kservice is optional and only used to find and open josm -RDEPEND=" - dev-libs/protobuf:= - >=dev-qt/qtbase-${QTMIN}:6[gui?,network] - sys-libs/zlib - gui? ( - >=dev-libs/kopeninghours-${PVCUT}:6 - >=dev-libs/kpublictransport-${PVCUT}:6 - >=dev-qt/qtdeclarative-${QTMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kservice-${KFMIN}:6 - ) -" -DEPEND="${RDEPEND} - test? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] ) -" -BDEPEND=" - app-alternatives/lex - app-alternatives/yacc -" - -# Pending: https://invent.kde.org/libraries/kosmindoormap/-/merge_requests/40 -PATCHES=( "${FILESDIR}/${PN}-24.05.1-cmake.patch" ) - -src_configure() { - local mycmakeargs=( - -DBUILD_TOOLS_ONLY=$(usex !gui) - -DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON # we have no use for it - ) - ecm_src_configure -} |