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 6174115864F for ; Sun, 26 Mar 2023 18:02:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC013E07D4; Sun, 26 Mar 2023 18:02:49 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8FA7EE07D4 for ; Sun, 26 Mar 2023 18:02:49 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE24A340F97 for ; Sun, 26 Mar 2023 18:02:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F769964 for ; Sun, 26 Mar 2023 18:02:47 +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: <1679853749.d1ddcb664613d4398d87ac10962f98f277352f68.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-office/kmymoney/files/, app-office/kmymoney/ X-VCS-Repository: proj/kde X-VCS-Files: app-office/kmymoney/files/kmymoney-9999-cmake.patch app-office/kmymoney/kmymoney-9999.ebuild X-VCS-Directories: app-office/kmymoney/files/ app-office/kmymoney/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d1ddcb664613d4398d87ac10962f98f277352f68 X-VCS-Branch: master Date: Sun, 26 Mar 2023 18:02:47 +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: 5b8cbbff-8dd5-41fa-9abb-ee270c6aae97 X-Archives-Hash: 1b6dc900c2ca03b87e0d8680338bf55d commit: d1ddcb664613d4398d87ac10962f98f277352f68 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 26 18:01:37 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 26 18:02:29 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d1ddcb66 app-office/kmymoney: Patch upstreamed Upstream commit b6c2c157f403c9ab74067cc2611ffebd3f87d8d7 Bug: https://bugs.gentoo.org/878397 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kmymoney/files/kmymoney-9999-cmake.patch | 35 ---------------------- app-office/kmymoney/kmymoney-9999.ebuild | 2 -- 2 files changed, 37 deletions(-) diff --git a/app-office/kmymoney/files/kmymoney-9999-cmake.patch b/app-office/kmymoney/files/kmymoney-9999-cmake.patch deleted file mode 100644 index 71cf5f4d38..0000000000 --- a/app-office/kmymoney/files/kmymoney-9999-cmake.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b6c2c157f403c9ab74067cc2611ffebd3f87d8d7 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Fri, 5 Aug 2022 10:37:09 +0200 -Subject: [PATCH] Drop bogus dependencies - -This reverts 90d78bd238c8db701e4bb19d9c5c2ddd9bd4f59c, -93374114e87a9b05546fb27bc936f223b5b84f7d and -92ef8b8ef8d0c5229fc601ac36806c926c85c36a. - -The proper fix went into alkimia via -https://invent.kde.org/office/alkimia/-/commit/09a11cee26af4ca55e5839dd44e32400147dc119 - -See also: https://invent.kde.org/office/kmymoney/-/issues/63 - -Signed-off-by: Andreas Sturmlechner ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 842acedaa..5a4542d29 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -110,7 +110,7 @@ if (PkgConfig_FOUND) - endif() - - find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets Svg Xml Test PrintSupport) --find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Sql Concurrent QuickWidgets WebEngineWidgets WebKitWidgets) -+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Sql Concurrent QuickWidgets) - - find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Archive CoreAddons Config ConfigWidgets I18n Completion KCMUtils ItemModels ItemViews Service XmlGui TextWidgets Notifications KIO) - --- -2.40.0 - diff --git a/app-office/kmymoney/kmymoney-9999.ebuild b/app-office/kmymoney/kmymoney-9999.ebuild index a8d9b50100..01b289392e 100644 --- a/app-office/kmymoney/kmymoney-9999.ebuild +++ b/app-office/kmymoney/kmymoney-9999.ebuild @@ -78,8 +78,6 @@ DEPEND="${RDEPEND} " BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) - pkg_setup() { ecm_pkg_setup