| |
@@ -0,0 +1,123 @@
|
| |
+ From b0b3e5a09d0dcee1cafbf25462d9289892a13532 Mon Sep 17 00:00:00 2001
|
| |
+ From: SolveFinder <kwopleq@proton.me>
|
| |
+ Date: Fri, 4 Aug 2023 21:37:44 +0300
|
| |
+ Subject: [PATCH] libre/discover without TPPM functionality; webview, flatpak, snap, fwupd and rpm-ostree support
|
| |
+
|
| |
+ ---
|
| |
+ CMakeLists.txt | 1 -
|
| |
+ discover/CMakeLists.txt | 7 +---
|
| |
+ libdiscover/backends/CMakeLists.txt | 8 ++---
|
| |
+ .../packagekit-backend-categories.xml | 34 -------------------
|
| |
+ 4 files changed, 5 insertions(+), 45 deletions(-)
|
| |
+
|
| |
+ diff --git a/CMakeLists.txt b/CMakeLists.txt
|
| |
+ index f96e83b..57991ca 100644
|
| |
+ --- a/CMakeLists.txt
|
| |
+ +++ b/CMakeLists.txt
|
| |
+ @@ -23,7 +23,6 @@ include(ECMQtDeclareLoggingCategory)
|
| |
+ include(KDEClangFormat)
|
| |
+ include(KDEGitCommitHooks)
|
| |
+ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Concurrent DBus Quick)
|
| |
+ -find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG OPTIONAL_COMPONENTS WebView)
|
| |
+
|
| |
+ find_package(PkgConfig REQUIRED)
|
| |
+
|
| |
+ diff --git a/discover/CMakeLists.txt b/discover/CMakeLists.txt
|
| |
+ index 17ac7f8..cbc2403 100644
|
| |
+ --- a/discover/CMakeLists.txt
|
| |
+ +++ b/discover/CMakeLists.txt
|
| |
+ @@ -53,12 +53,7 @@ target_link_libraries(plasma-discover PUBLIC
|
| |
+ Discover::Common
|
| |
+ )
|
| |
+
|
| |
+ -if (TARGET Qt::WebView)
|
| |
+ - target_link_libraries(plasma-discover PUBLIC Qt::WebView)
|
| |
+ - target_compile_definitions(plasma-discover PUBLIC -DWITH_QTWEBVIEW=1)
|
| |
+ -else()
|
| |
+ - target_compile_definitions(plasma-discover PUBLIC -DWITH_QTWEBVIEW=0)
|
| |
+ -endif()
|
| |
+ +target_compile_definitions(plasma-discover PUBLIC -DWITH_QTWEBVIEW=0)
|
| |
+
|
| |
+ if (TARGET KUserFeedbackCore)
|
| |
+ target_link_libraries(plasma-discover PRIVATE KUserFeedbackCore)
|
| |
+ diff --git a/libdiscover/backends/CMakeLists.txt b/libdiscover/backends/CMakeLists.txt
|
| |
+ index bd3a032..3b40c41 100644
|
| |
+ --- a/libdiscover/backends/CMakeLists.txt
|
| |
+ +++ b/libdiscover/backends/CMakeLists.txt
|
| |
+ @@ -21,7 +21,7 @@ if(BUILD_DummyBackend)
|
| |
+ add_subdirectory(DummyBackend)
|
| |
+ endif()
|
| |
+
|
| |
+ -option(BUILD_FlatpakBackend "Build Flatpak support" "ON")
|
| |
+ +option(BUILD_FlatpakBackend "Build Flatpak support" "OFF")
|
| |
+ if(Flatpak_FOUND AND AppStreamQt_FOUND AND BUILD_FlatpakBackend)
|
| |
+ add_subdirectory(FlatpakBackend)
|
| |
+ elseif(BUILD_FlatpakBackend)
|
| |
+ @@ -40,17 +40,17 @@ if(BUILD_SteamOSBackend)
|
| |
+ add_subdirectory(SteamOSBackend)
|
| |
+ endif()
|
| |
+
|
| |
+ -option(BUILD_SnapBackend "Build Snap support." "ON")
|
| |
+ +option(BUILD_SnapBackend "Build Snap support." "OFF")
|
| |
+ if(BUILD_SnapBackend AND AppStreamQt_FOUND AND Snapd_FOUND)
|
| |
+ add_subdirectory(SnapBackend)
|
| |
+ endif()
|
| |
+
|
| |
+ -option(BUILD_FwupdBackend "Build Fwupd support." "ON")
|
| |
+ +option(BUILD_FwupdBackend "Build Fwupd support." "OFF")
|
| |
+ if(BUILD_FwupdBackend AND TARGET PkgConfig::Fwupd)
|
| |
+ add_subdirectory(FwupdBackend)
|
| |
+ endif()
|
| |
+
|
| |
+ -option(BUILD_RpmOstreeBackend "Build rpm-ostree support." "ON")
|
| |
+ +option(BUILD_RpmOstreeBackend "Build rpm-ostree support." "OFF")
|
| |
+ if(BUILD_RpmOstreeBackend AND Ostree_FOUND AND RpmOstree_FOUND)
|
| |
+ add_subdirectory(RpmOstreeBackend)
|
| |
+ endif()
|
| |
+ diff --git a/libdiscover/backends/PackageKitBackend/packagekit-backend-categories.xml b/libdiscover/backends/PackageKitBackend/packagekit-backend-categories.xml
|
| |
+ index ff1a922..f6b5fe3 100644
|
| |
+ --- a/libdiscover/backends/PackageKitBackend/packagekit-backend-categories.xml
|
| |
+ +++ b/libdiscover/backends/PackageKitBackend/packagekit-backend-categories.xml
|
| |
+ @@ -548,39 +548,5 @@
|
| |
+ </Or>
|
| |
+ </Include>
|
| |
+ </Menu>
|
| |
+ - <Menu>
|
| |
+ - <Name>Plasma Addons</Name>
|
| |
+ - <Icon>plasma</Icon>
|
| |
+ - <Addons />
|
| |
+ -
|
| |
+ - <Include>
|
| |
+ - <Or>
|
| |
+ - <AppstreamIdWildcard>org.kde.plasma.*</AppstreamIdWildcard>
|
| |
+ - </Or>
|
| |
+ - </Include>
|
| |
+ -
|
| |
+ - <Menu>
|
| |
+ - <Name>Plasma Widgets</Name>
|
| |
+ - <Icon>plasma</Icon>
|
| |
+ - <Addons />
|
| |
+ - <Include>
|
| |
+ - <Or>
|
| |
+ - <AppstreamIdWildcard>org.kde.plasma.*</AppstreamIdWildcard>
|
| |
+ - </Or>
|
| |
+ - </Include>
|
| |
+ - </Menu>
|
| |
+ -
|
| |
+ -<!--
|
| |
+ - <Menu>
|
| |
+ - <Name>Fonts</Name>
|
| |
+ - <Icon>preferences-desktop-font</Icon>
|
| |
+ - <Include>
|
| |
+ - <And>
|
| |
+ - <Category>Fonts</Category>
|
| |
+ - </And>
|
| |
+ - </Include>
|
| |
+ - </Menu>
|
| |
+ --->
|
| |
+ - </Menu>
|
| |
+
|
| |
+ </Menu>
|
| |
+ --
|
| |
+ 2.41.0
|
| |
+
|
| |
solvefinder
commented 10 months ago
This commit removes webview support and TPPM functionality from discover.
"libre.patch" removes webview support.
Without "knewstuff" in "depends" Plasma-related functionality won't be compiled.
^
|
These changes for the ability to compile using libremakepkg when there's no libre version of discover in "blacklist.txt"
If everything is fine with package, pkgname should be "discover" and "parabola-appstream-data" should be in depends
If there's something wrong with this patch that could be fixed - I'd try to fix it
Original PKGBUILD: "https://gitlab.archlinux.org/archlinux/packaging/packages/discover/-/blob/main/PKGBUILD"