From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 21CC015864F for ; Sun, 26 Mar 2023 13:09:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36EFAE0794; Sun, 26 Mar 2023 13:09:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 185FFE0794 for ; Sun, 26 Mar 2023 13:09:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 996E33411AA for ; Sun, 26 Mar 2023 13:09:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B65B895A for ; Sun, 26 Mar 2023 13:09:22 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1679835338.9da1c2adbbef9c70f9a25603dd853fde43677cb1.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libalkimia/files/, app-office/libalkimia/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libalkimia/files/libalkimia-8.1.0-cmake-webengine.patch app-office/libalkimia/libalkimia-8.1.1-r1.ebuild app-office/libalkimia/libalkimia-8.1.1.ebuild X-VCS-Directories: app-office/libalkimia/files/ app-office/libalkimia/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9da1c2adbbef9c70f9a25603dd853fde43677cb1 X-VCS-Branch: master Date: Sun, 26 Mar 2023 13:09:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 73a812ae-1fe7-4e65-8836-b0c1134bef30 X-Archives-Hash: 0ceb3713ab51ef12f771cf48ac06fed6 commit: 9da1c2adbbef9c70f9a25603dd853fde43677cb1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 26 12:55:38 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 26 12:55:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da1c2ad app-office/libalkimia: Another cmake fix, this time from upstream Bug: https://bugs.gentoo.org/878397 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libalkimia-8.1.0-cmake-webengine.patch | 27 ++++++++++++++++++++++ ...mia-8.1.1.ebuild => libalkimia-8.1.1-r1.ebuild} | 7 ++++-- 2 files changed, 32 insertions(+), 2 deletions(-) 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.ebuild b/app-office/libalkimia/libalkimia-8.1.1-r1.ebuild similarity index 93% rename from app-office/libalkimia/libalkimia-8.1.1.ebuild rename to app-office/libalkimia/libalkimia-8.1.1-r1.ebuild index 0d5b5f054028..0cebd5e68506 100644 --- a/app-office/libalkimia/libalkimia-8.1.1.ebuild +++ b/app-office/libalkimia/libalkimia-8.1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -54,7 +54,10 @@ BDEPEND=" doc? ( app-doc/doxygen ) " -PATCHES=( "${FILESDIR}/${PN}-8.1.0-cmake.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-8.1.0-cmake.patch" + "${FILESDIR}/${PN}-8.1.0-cmake-webengine.patch" +) src_configure() { local mycmakeargs=(