public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/discover/files/
Date: Sat, 10 Jul 2021 21:16:15 +0000 (UTC)	[thread overview]
Message-ID: <1625951311.d8706a434f3b6632496c94b10b8b0742f245d38b.conikost@gentoo> (raw)

commit:     d8706a434f3b6632496c94b10b8b0742f245d38b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun 15 19:35:18 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jul 10 21:08:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8706a43

kde-plasma/discover: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/21256
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/discover-5.21.4-missing-link.patch       | 49 ----------------------
 1 file changed, 49 deletions(-)

diff --git a/kde-plasma/discover/files/discover-5.21.4-missing-link.patch b/kde-plasma/discover/files/discover-5.21.4-missing-link.patch
deleted file mode 100644
index c8c8b152ea7..00000000000
--- a/kde-plasma/discover/files/discover-5.21.4-missing-link.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3c578beeb5d3748d9fdacae4ace42fe6098d9184 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 25 Apr 2021 00:26:12 +0200
-Subject: [PATCH] Add missing Qt5Concurrent to target_link_libraries
-
-This was working as long as it was implicitly provided by KIO.
-Other backends are fine.
-
-Fixes:
-- DiscoverCommon w/ AppStreamQt
-- packagekit-backend
-
-See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- libdiscover/CMakeLists.txt                            | 2 +-
- libdiscover/backends/PackageKitBackend/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt
-index 1097ea84..3e2a6c9c 100644
---- a/libdiscover/CMakeLists.txt
-+++ b/libdiscover/CMakeLists.txt
-@@ -48,7 +48,7 @@ if(TARGET AppStreamQt)
-         appstream/AppStreamIntegration.cpp
-         appstream/AppStreamUtils.cpp
-     )
--    target_link_libraries(DiscoverCommon PRIVATE AppStreamQt)
-+    target_link_libraries(DiscoverCommon PRIVATE Qt5::Concurrent AppStreamQt)
- 
-     if(AppStreamQt_VERSION VERSION_GREATER 0.12.4)
-         target_compile_definitions(DiscoverCommon PRIVATE -DAPPSTREAM_HAS_SPDX=1)
-diff --git a/libdiscover/backends/PackageKitBackend/CMakeLists.txt b/libdiscover/backends/PackageKitBackend/CMakeLists.txt
-index cfeb38f1..466dbc49 100644
---- a/libdiscover/backends/PackageKitBackend/CMakeLists.txt
-+++ b/libdiscover/backends/PackageKitBackend/CMakeLists.txt
-@@ -19,7 +19,7 @@ ecm_qt_declare_logging_category(packagekit-backend_SRCS HEADER libdiscover_backe
- 
- add_library(packagekit-backend MODULE ${packagekit-backend_SRCS})
- 
--target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt5::Core PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::Archive AppStreamQt)
-+target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt5::Core Qt5::Concurrent PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::Archive AppStreamQt)
- install(TARGETS packagekit-backend DESTINATION ${PLUGIN_INSTALL_DIR}/discover)
- 
- if(TARGET PkgConfig::Markdown)
--- 
-2.31.1
-


             reply	other threads:[~2021-07-10 21:16 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-10 21:16 Conrad Kostecki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-05-13  1:49 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/discover/files/ Andreas Sturmlechner
2019-09-29 20:07 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1625951311.d8706a434f3b6632496c94b10b8b0742f245d38b.conikost@gentoo \
    --to=conikost@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox