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 E882015808B for ; Wed, 30 Mar 2022 05:48:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5AF2E0874; Wed, 30 Mar 2022 05:48:06 +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 7AA79E085E for ; Wed, 30 Mar 2022 05:48:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 06C3934120C for ; Wed, 30 Mar 2022 05:48:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55E492D7 for ; Wed, 30 Mar 2022 05:48:00 +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: <1648619258.a626daadc0d9e5626aaa1ee3b52580e523b90b6c.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/okular/files/okular-22.07.70-optional-options.patch X-VCS-Directories: kde-apps/okular/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a626daadc0d9e5626aaa1ee3b52580e523b90b6c X-VCS-Branch: master Date: Wed, 30 Mar 2022 05:48:00 +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: ae106ccb-f380-4003-85ba-b372a0c554d5 X-Archives-Hash: c759975b1563648c609e06b5ca888d82 commit: a626daadc0d9e5626aaa1ee3b52580e523b90b6c Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Mar 30 05:47:38 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Mar 30 05:47:38 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a626daad kde-apps/okular: Rebase optional-options patch on top of 22.07.70 Reported-by: Duncan <1i5t5.duncan cox.net> Closes: https://bugs.gentoo.org/836389 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/okular/files/okular-22.07.70-optional-options.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kde-apps/okular/files/okular-22.07.70-optional-options.patch b/kde-apps/okular/files/okular-22.07.70-optional-options.patch index 6c83b03e06..0cadfe415d 100644 --- a/kde-apps/okular/files/okular-22.07.70-optional-options.patch +++ b/kde-apps/okular/files/okular-22.07.70-optional-options.patch @@ -1,4 +1,4 @@ -From 86729e7698250dcb11ccbec0a6cc9690501ad691 Mon Sep 17 00:00:00 2001 +From f29b89d8ac7fcca1cf74462dcc33da24551c924f Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 31 Aug 2021 16:48:42 +0200 Subject: [PATCH] Make WITH_KWALLET and WITH_KJS proper cmake options @@ -21,7 +21,7 @@ Signed-off-by: Andreas Sturmlechner 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 43a45c7b9..57d0f6f74 100644 +index 547671f24..f1e14fa8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,12 +91,9 @@ ecm_setup_qtplugin_macro_names( @@ -40,7 +40,7 @@ index 43a45c7b9..57d0f6f74 100644 find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Archive -@@ -111,21 +108,19 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS +@@ -110,21 +107,19 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS TextWidgets ThreadWeaver WindowSystem @@ -52,7 +52,7 @@ index 43a45c7b9..57d0f6f74 100644 ) if (BUILD_DESKTOP) - find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash) + find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash IconThemes) endif() -if(KF5Wallet_FOUND)