From 115dcc7054f5934a2c8e26fd8a8eed5f3e29e9ce Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 28 Mar 2023 09:49:11 +0100 Subject: gentoo auto-resync : 28:03:2023 - 09:49:10 --- app-office/Manifest.gz | Bin 8068 -> 8066 bytes app-office/libalkimia/Manifest | 3 +- .../files/libalkimia-8.1.0-cmake-webengine.patch | 27 +++++++ app-office/libalkimia/libalkimia-8.1.1-r1.ebuild | 81 +++++++++++++++++++++ app-office/libalkimia/libalkimia-8.1.1.ebuild | 78 -------------------- 5 files changed, 110 insertions(+), 79 deletions(-) create mode 100644 app-office/libalkimia/files/libalkimia-8.1.0-cmake-webengine.patch create mode 100644 app-office/libalkimia/libalkimia-8.1.1-r1.ebuild delete mode 100644 app-office/libalkimia/libalkimia-8.1.1.ebuild (limited to 'app-office') diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz index 2b0bfcee2a44..3a90f0df4183 100644 Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest index 61831742bff4..2441a6ca46d5 100644 --- a/app-office/libalkimia/Manifest +++ b/app-office/libalkimia/Manifest @@ -1,4 +1,5 @@ +AUX libalkimia-8.1.0-cmake-webengine.patch 880 BLAKE2B febde1eec297d3aea720ff0b84ab20bfb6b27870bbcd6545813d9bd6c3690aff1c48cd69d168b06379e576b4bf8df90d4fdf571a61a3737233c6562f368c2136 SHA512 c88844d28f895faa88b63593f1ecec6647967448be737b24caa9758ded87b1818b05c409dde0dae4197257b13b0afd89ea4d6d121610629fb0d7f5430104c946 AUX libalkimia-8.1.0-cmake.patch 1453 BLAKE2B 9dfb249e5fa95e78083f1f010960253915831888959944511d6e945a81f1f24a9e060c76e4927ac98ea8847c46b04dd8a1910079deb2ec0514a5b20d7c977d52 SHA512 61396c87615fd1105d1a3f10b687f987aaad6ca533b42ba36e9e5179a375e505652afad097726e8f2fd7da893c9593fe990461e7afa85b72933e803a8cf743db DIST alkimia-8.1.1.tar.xz 252332 BLAKE2B 35c5cbca47e993d0a771ec723fcdd764265b2d0706a77ac06bb892b0717f791bfbceb2611b64810abe9fb209ed065abae1545efa512009003a3626aa84940181 SHA512 3e96f5b32da3d8a7f23b3b0f0a0ba7923e472b972c06b35f918c7f00d1745fa747afb6b8fdc1d596b2c1d9757a8037de04a039047f47eb46383070721da05258 -EBUILD libalkimia-8.1.1.ebuild 1996 BLAKE2B 9f7d94bae5d8b9b42e0b8b0fae1d7f56e82c47bc4674030e5f838b0f90852323de87a8453412bcef946242e92239f7fc32ffe010a4b92a1ca6a3120f75efb2ed SHA512 109bf6b54df3c54b4afcfd18605bb749be330bd0d66d3afac1cb80a00a36d5ffc8a1f1ff6c20440700870528d6c705fd74026e3ca79f3b6ffc143c62c8fbce0e +EBUILD libalkimia-8.1.1-r1.ebuild 2046 BLAKE2B 9c5a499273572fdb2a970a034c5a9a2947a58c263fdbccf7d3247ca55b5e7a28c406c201767880d8b10a57c35decce16d05c537cce7e37c381951340f4a0b4f1 SHA512 e9bde6cba163eb62745c8ea1bab3c0a8aa3586f6b417756d56565aeb0206105b287695f2226743ee42b8989aee8b21370c743f651e4bb747f6ceb14c468bf339 MISC metadata.xml 422 BLAKE2B 3dcb004865bfc7dbb4367d1a5ca617acc15738e44072718c2b9e5eabe8848f50198ddabf9cc395cd3683f0576e67bffbf65e200704230d624beb310e89bb3e60 SHA512 50770ec9d3512be154220bbb386c7bda521d182be612e02d3f0c34d579b6f5a27d27dc08098fdf50715aa039af96581a73e34e7369e29a543f9792e4df9a0766 diff --git a/app-office/libalkimia/files/libalkimia-8.1.0-cmake-webengine.patch b/app-office/libalkimia/files/libalkimia-8.1.0-cmake-webengine.patch new file mode 100644 index 000000000000..7d1140ca7509 --- /dev/null +++ b/app-office/libalkimia/files/libalkimia-8.1.0-cmake-webengine.patch @@ -0,0 +1,27 @@ +From 09a11cee26af4ca55e5839dd44e32400147dc119 Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau +Date: Sun, 11 Sep 2022 11:55:49 +0200 +Subject: [PATCH] Fix finding of WebEngineWidgets + +--- + src/LibAlkimiaConfig.cmake.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/LibAlkimiaConfig.cmake.in b/src/LibAlkimiaConfig.cmake.in +index 5c2dfc3..1ad866e 100644 +--- a/src/LibAlkimiaConfig.cmake.in ++++ b/src/LibAlkimiaConfig.cmake.in +@@ -9,7 +9,9 @@ if("@BUILD_QT4@" STREQUAL "ON" OR "@BUILD_QT4@" STREQUAL "1") + else() + find_dependency(Qt5Core) + find_dependency(Qt5DBus) +- if (@QT_BROWSER_LIB@) ++ if (@BUILD_WITH_WEBENGINE@) ++ find_dependency(Qt@QT_MAJOR_VERSION@WebEngineWidgets 5.15.0) ++ elseif (@QT_BROWSER_LIB@) + find_dependency(@QT_BROWSER_LIB@) + endif() + if (@QT_NETWORK_LIB@) +-- +2.40.0 + diff --git a/app-office/libalkimia/libalkimia-8.1.1-r1.ebuild b/app-office/libalkimia/libalkimia-8.1.1-r1.ebuild new file mode 100644 index 000000000000..0cebd5e68506 --- /dev/null +++ b/app-office/libalkimia/libalkimia-8.1.1-r1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KDE_ORG_NAME="alkimia" +KFMIN=5.82.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${PV}/${KDE_ORG_NAME}-${PV}.tar.xz" + KEYWORDS="amd64 x86" +fi + +DESCRIPTION="Library with common classes and functionality used by KDE finance applications" +HOMEPAGE="https://www.linux-apps.com/content/show.php/libalkimia?content=137323 +https://community.kde.org/Alkimia" + +LICENSE="LGPL-2.1" +SLOT="0/8" +IUSE="doc gmp plasma webengine" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + !gmp? ( sci-libs/mpir:=[cxx] ) + gmp? ( dev-libs/gmp:0=[cxx(+)] ) + plasma? ( + >=kde-frameworks/kpackage-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + ) + webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +PATCHES=( + "${FILESDIR}/${PN}-8.1.0-cmake.patch" + "${FILESDIR}/${PN}-8.1.0-cmake-webengine.patch" +) + +src_configure() { + local mycmakeargs=( + -DENABLE_FINANCEQUOTE=OFF + -DBUILD_TOOLS=ON + -DBUILD_WITH_WEBKIT=OFF + $(cmake_use_find_package doc Doxygen) + $(cmake_use_find_package !gmp MPIR) + -DBUILD_APPLETS=$(usex plasma) + -DBUILD_WITH_WEBENGINE=$(usex webengine) + ) + ecm_src_configure +} + +src_test() { + # Depends on BUILD_WITH_WEBKIT, bug 736128 + local myctestargs=( + -E "(alkonlinequotestest)" + ) + ecm_src_test +} diff --git a/app-office/libalkimia/libalkimia-8.1.1.ebuild b/app-office/libalkimia/libalkimia-8.1.1.ebuild deleted file mode 100644 index 0d5b5f054028..000000000000 --- a/app-office/libalkimia/libalkimia-8.1.1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -KDE_ORG_NAME="alkimia" -KFMIN=5.82.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${PV}/${KDE_ORG_NAME}-${PV}.tar.xz" - KEYWORDS="amd64 x86" -fi - -DESCRIPTION="Library with common classes and functionality used by KDE finance applications" -HOMEPAGE="https://www.linux-apps.com/content/show.php/libalkimia?content=137323 -https://community.kde.org/Alkimia" - -LICENSE="LGPL-2.1" -SLOT="0/8" -IUSE="doc gmp plasma webengine" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - !gmp? ( sci-libs/mpir:=[cxx] ) - gmp? ( dev-libs/gmp:0=[cxx(+)] ) - plasma? ( - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - ) - webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -PATCHES=( "${FILESDIR}/${PN}-8.1.0-cmake.patch" ) - -src_configure() { - local mycmakeargs=( - -DENABLE_FINANCEQUOTE=OFF - -DBUILD_TOOLS=ON - -DBUILD_WITH_WEBKIT=OFF - $(cmake_use_find_package doc Doxygen) - $(cmake_use_find_package !gmp MPIR) - -DBUILD_APPLETS=$(usex plasma) - -DBUILD_WITH_WEBENGINE=$(usex webengine) - ) - ecm_src_configure -} - -src_test() { - # Depends on BUILD_WITH_WEBKIT, bug 736128 - local myctestargs=( - -E "(alkonlinequotestest)" - ) - ecm_src_test -} -- cgit v1.2.3