diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /kde-apps/marble/files | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'kde-apps/marble/files')
-rw-r--r-- | kde-apps/marble/files/marble-20.04.2-missing-dep.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/kde-apps/marble/files/marble-20.04.2-missing-dep.patch b/kde-apps/marble/files/marble-20.04.2-missing-dep.patch deleted file mode 100644 index f4f71bdf1ccb..000000000000 --- a/kde-apps/marble/files/marble-20.04.2-missing-dep.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c062504a2864680fee9c81ea46e7613315de038a Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Mon, 15 Jun 2020 11:24:32 +0200 -Subject: [PATCH] Add missing Qt5WebChannel dependency - -QWebChannel header is used in src/lib/marble/MarbleLegendBrowser.cpp -since commit b42ee5c8 but apparently not always implicitly included. - -Downstream report: https://bugs.gentoo.org/728234 - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 1 + - src/lib/marble/CMakeLists.txt | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 631a5b7d7..a3b2139dc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -126,6 +126,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Android) - - set ( MARBLE_NO_WEBKITWIDGETS TRUE ) - else() -+ find_package(Qt5WebChannel ${REQUIRED_QT_VERSION}) - find_package(Qt5WebEngine ${REQUIRED_QT_VERSION}) - find_package(Qt5WebEngineWidgets ${REQUIRED_QT_VERSION}) - -diff --git a/src/lib/marble/CMakeLists.txt b/src/lib/marble/CMakeLists.txt -index e02c7d160..7d27be94b 100644 ---- a/src/lib/marble/CMakeLists.txt -+++ b/src/lib/marble/CMakeLists.txt -@@ -395,6 +395,7 @@ target_link_libraries(marblewidget - if (NOT MARBLE_NO_WEBKITWIDGETS) - target_link_libraries(marblewidget - LINK_PUBLIC -+ Qt5::WebChannel - Qt5::WebEngineWidgets - Qt5::WebEngine - ) --- -2.27.0 - |