From 9da1c2adbbef9c70f9a25603dd853fde43677cb1 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 26 Mar 2023 14:55:38 +0200 Subject: app-office/libalkimia: Another cmake fix, this time from upstream Bug: https://bugs.gentoo.org/878397 Signed-off-by: Andreas Sturmlechner --- .../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 --------------------- 3 files changed, 108 insertions(+), 78 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 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-65-gdbad