diff options
Diffstat (limited to 'kde-apps/kitinerary')
| -rw-r--r-- | kde-apps/kitinerary/Manifest | 4 | ||||
| -rw-r--r-- | kde-apps/kitinerary/files/kitinerary-20.04.3-poppler-20.08.patch | 32 | ||||
| -rw-r--r-- | kde-apps/kitinerary/kitinerary-20.08.2.ebuild | 46 | ||||
| -rw-r--r-- | kde-apps/kitinerary/kitinerary-23.08.5.ebuild (renamed from kde-apps/kitinerary/kitinerary-20.04.3.ebuild) | 38 | ||||
| -rw-r--r-- | kde-apps/kitinerary/kitinerary-24.02.2.ebuild | 48 | ||||
| -rw-r--r-- | kde-apps/kitinerary/metadata.xml | 8 |
6 files changed, 74 insertions, 102 deletions
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest index 82ef44670e2c..9ed8e7033413 100644 --- a/kde-apps/kitinerary/Manifest +++ b/kde-apps/kitinerary/Manifest @@ -1,2 +1,2 @@ -DIST kitinerary-20.04.3.tar.xz 1280676 BLAKE2B 17e02987ed40985b8adcec81f6499ca968a89f22919cd6af2f16d6c5623b8b767fb43142aa4ff93e8d24c6ba483b553e7817d0e74c68bebe8b897d689704e2ca SHA512 eee734fc06373aed09e0eadd7ef232cde5ba07adf4d0996117bc4a0ee16cf80fc7f607ae1dc92033ea404e70eb8afcf5a676ff71e286613272c0d1051d7b7168 -DIST kitinerary-20.08.2.tar.xz 1756516 BLAKE2B 4e9748ec09f83b1c745b3f8511393a87772cc87a55b9874cd77f240cc1da2e3540525a6e1b46523b8bf10b256018d6f5069bc6e3156414d4946725ddeb6ef0fd SHA512 f207fea12b51d15548d4fa0186720f5f9cb4f313f8ca6cbe88c283312f31872bab7ec333566e85016c7a018772f155c867592bb5f0181a7316c2bc8c8e135f52 +DIST kitinerary-23.08.5.tar.xz 1940264 BLAKE2B ed09bace93b45275c2a7d9106a737b808f9423f044cd36349daaa5c864e1e78bd8592fc95a232bd91927e7af8a4f583759b2db7855c52445c8911d2c6346e3fa SHA512 bf62f4c2fbfbaaafe1d6e3acebdf4b19dab9a2f3e0fb6a2ffa16917e91f27386d562a6a9f5676cdd0ab8c1451a0e7e0e9282a0bc481e1f1b538882db5e1c23df +DIST kitinerary-24.02.2.tar.xz 1962304 BLAKE2B 96e93b8995dec767e86f3841553a9a59dc313e288419f32ea7b806527a7a67ca82532ee8566326be588548a51cb948aa9659e0498d6b854abf8ba37c736d18c8 SHA512 29b2db03b24594f4d96fbb1cf6fd60bfef7015b25fc5e33d1275904af6be9abcd622895dd425e6875ca4b609340ca575e7f2a34f3054d147f95242e1fc61ba46 diff --git a/kde-apps/kitinerary/files/kitinerary-20.04.3-poppler-20.08.patch b/kde-apps/kitinerary/files/kitinerary-20.04.3-poppler-20.08.patch deleted file mode 100644 index 768cf5dc5097..000000000000 --- a/kde-apps/kitinerary/files/kitinerary-20.04.3-poppler-20.08.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7098c8be9a5e7fabf74543308bfaf11a2ebe5484 Mon Sep 17 00:00:00 2001 -From: Volker Krause <vkrause@kde.org> -Date: Wed, 5 Aug 2020 17:18:13 +0200 -Subject: [PATCH] Fix build with latest Poppler - -That now has a leading 0 in its minor version number. ---- - CMakeLists.txt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e4d40f2..37787d8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -71,10 +71,10 @@ if(TARGET Poppler::Core) - endif() - endif() - if (HAVE_POPPLER) -- string(REPLACE "." ";" _poppler_version_components ${Poppler_VERSION}) -- list(GET _poppler_version_components 0 POPPLER_VERSION_MAJOR) -- list(GET _poppler_version_components 1 POPPLER_VERSION_MINOR) -- list(GET _poppler_version_components 2 POPPLER_VERSION_PATCH) -+ string(REGEX MATCH "([0-9]+)\.0*([0-9]+)\.0*([0-9]+)" _match ${Poppler_VERSION}) -+ set(POPPLER_VERSION_MAJOR ${CMAKE_MATCH_1}) -+ set(POPPLER_VERSION_MINOR ${CMAKE_MATCH_2}) -+ set(POPPLER_VERSION_PATCH ${CMAKE_MATCH_3}) - endif() - - if (TARGET ZXing::ZXing OR TARGET ZXing::Core) --- -GitLab - diff --git a/kde-apps/kitinerary/kitinerary-20.08.2.ebuild b/kde-apps/kitinerary/kitinerary-20.08.2.ebuild deleted file mode 100644 index db1e12d6f0e1..000000000000 --- a/kde-apps/kitinerary/kitinerary-20.08.2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -PVCUT=$(ver_cut 1-3) -KFMIN=5.72.0 -QTMIN=5.14.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Data Model and Extraction System for Travel Reservation information" -HOMEPAGE="https://apps.kde.org/en/kontact" - -LICENSE="LGPL-2.1+" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="+barcode pdf" - -REQUIRED_USE="test? ( pdf )" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-apps/kmime-${PVCUT}:5 - >=kde-apps/kpkpass-${PVCUT}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcalendarcore-${KFMIN}:5 - >=kde-frameworks/kcontacts-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - sys-libs/zlib - barcode? ( >=media-libs/zxing-cpp-1.1.0 ) - pdf? ( app-text/poppler:=[qt5] ) -" -RDEPEND="${DEPEND} - !<kde-apps/kdepim-addons-18.07.80 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package barcode ZXing) - $(cmake_use_find_package pdf Poppler) - ) - ecm_src_configure -} diff --git a/kde-apps/kitinerary/kitinerary-20.04.3.ebuild b/kde-apps/kitinerary/kitinerary-23.08.5.ebuild index b3aa5d1ab270..0f5a2ef14317 100644 --- a/kde-apps/kitinerary/kitinerary-20.04.3.ebuild +++ b/kde-apps/kitinerary/kitinerary-23.08.5.ebuild @@ -1,24 +1,30 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +ECM_QTHELP="true" ECM_TEST="true" PVCUT=$(ver_cut 1-3) -KFMIN=5.70.0 -QTMIN=5.14.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org DESCRIPTION="Data Model and Extraction System for Travel Reservation information" -HOMEPAGE="https://apps.kde.org/en/kontact" +HOMEPAGE="https://apps.kde.org/kontact/" LICENSE="LGPL-2.1+" SLOT="5" -KEYWORDS="amd64 arm64 x86" -IUSE="+barcode pdf" +KEYWORDS="amd64 arm64 ~ppc64 x86" +IUSE="" + +RESTRICT="test" # bug 907957, 851000, 739732... DEPEND=" + app-text/poppler:=[qt5] + dev-libs/libphonenumber + dev-libs/libxml2:2 + dev-libs/openssl:= >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=kde-apps/kmime-${PVCUT}:5 @@ -27,20 +33,16 @@ DEPEND=" >=kde-frameworks/kcalendarcore-${KFMIN}:5 >=kde-frameworks/kcontacts-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 + >=media-libs/zxing-cpp-1.1.0:= sys-libs/zlib - barcode? ( ~media-libs/zxing-cpp-1.0.8 ) - pdf? ( app-text/poppler:=[qt5] ) -" -RDEPEND="${DEPEND} - !<kde-apps/kdepim-addons-18.07.80 " - -PATCHES=( "${FILESDIR}/${P}-poppler-20.08.patch" ) # bug 735800 +RDEPEND="${DEPEND}" +BDEPEND="x11-misc/shared-mime-info" src_configure() { local mycmakeargs=( - $(cmake_use_find_package barcode ZXing) - $(cmake_use_find_package pdf Poppler) + # sci-geosciences/osmctools; TODO: useful at all? + -DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON ) ecm_src_configure } diff --git a/kde-apps/kitinerary/kitinerary-24.02.2.ebuild b/kde-apps/kitinerary/kitinerary-24.02.2.ebuild new file mode 100644 index 000000000000..eb86bf848435 --- /dev/null +++ b/kde-apps/kitinerary/kitinerary-24.02.2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_QTHELP="true" +ECM_TEST="true" +PVCUT=$(ver_cut 1-3) +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="Data Model and Extraction System for Travel Reservation information" +HOMEPAGE="https://apps.kde.org/kontact/" + +LICENSE="LGPL-2.1+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +RESTRICT="test" # bug 907957, 851000, 739732... + +DEPEND=" + >=app-text/poppler-23.12.0:=[qt6] + dev-libs/libphonenumber + dev-libs/libxml2:2 + dev-libs/openssl:= + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-apps/kmime-${PVCUT}:6 + >=kde-apps/kpkpass-${PVCUT}:6 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kcalendarcore-${KFMIN}:6 + >=kde-frameworks/kcontacts-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=media-libs/zxing-cpp-1.1.1:= + sys-libs/zlib +" +RDEPEND="${DEPEND}" +BDEPEND="x11-misc/shared-mime-info" + +src_configure() { + local mycmakeargs=( + # sci-geosciences/osmctools; TODO: useful at all? + -DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON + ) + ecm_src_configure +} diff --git a/kde-apps/kitinerary/metadata.xml b/kde-apps/kitinerary/metadata.xml index 7476175a04a6..d925f2439758 100644 --- a/kde-apps/kitinerary/metadata.xml +++ b/kde-apps/kitinerary/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> - <use> - <flag name="barcode">Enable support for PDF417 and Aztec barcode decoding using <pkg>media-libs/zxing-cpp</pkg></flag> - </use> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + </upstream> </pkgmetadata> |