diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-19 13:26:49 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-19 13:26:49 +0200 |
| commit | ffb632b965c7ab84b22c9d886f11cac4fdd8db8e (patch) | |
| tree | 4ed86882ddeecec9f7113d75ce8291849edcaab3 /kde-apps | |
| parent | bade95817dba83d9d4b4b55344c9e10d37229838 (diff) | |
| download | kde-ffb632b965c7ab84b22c9d886f11cac4fdd8db8e.tar.gz kde-ffb632b965c7ab84b22c9d886f11cac4fdd8db8e.tar.bz2 kde-ffb632b965c7ab84b22c9d886f11cac4fdd8db8e.zip | |
kde-apps/kdenlive: Update qt5.11b3.patch by upstream review
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'kde-apps')
| -rw-r--r-- | kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch b/kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch index 143745737c9..9b65000a8cb 100644 --- a/kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch +++ b/kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch @@ -1,33 +1,36 @@ -From c205adc1f55e2864180b3b0e1fe133c9056e9130 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Fri, 13 Apr 2018 23:56:26 +0200 -Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) - ---- - renderer/CMakeLists.txt | 3 +-- - src/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 3 deletions(-) - +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -78,7 +78,7 @@ + check_include_files(malloc.h HAVE_MALLOC_H) + check_include_files(pthread.h HAVE_PTHREAD_H) + +-find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick ) ++find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick Concurrent) + find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET) + + find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET) diff --git a/renderer/CMakeLists.txt b/renderer/CMakeLists.txt -index 27f5f4367..693478abb 100644 --- a/renderer/CMakeLists.txt +++ b/renderer/CMakeLists.txt -@@ -9,9 +9,8 @@ set(kdenlive_render_SRCS +@@ -9,12 +9,6 @@ add_executable(kdenlive_render ${kdenlive_render_SRCS}) ecm_mark_nongui_executable(kdenlive_render) -qt5_use_modules(kdenlive_render Widgets Concurrent DBus) - - target_link_libraries(kdenlive_render -+ Qt5::Widgets Qt5::Concurrent Qt5::DBus - ${QT_LIBRARIES} - ${Qt5_LIBRARIES} - ) +-target_link_libraries(kdenlive_render +- ${QT_LIBRARIES} +- ${Qt5_LIBRARIES} +-) +- ++target_link_libraries(kdenlive_render Qt5::Core Qt5::DBus) + + install(TARGETS kdenlive_render DESTINATION ${BIN_INSTALL_DIR}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 1b3cbdea9..2ba81bb48 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -299,7 +299,7 @@ if (KF5Crash_FOUND) +@@ -299,7 +299,7 @@ target_link_libraries(kdenlive KF5::Crash) endif() @@ -36,6 +39,3 @@ index 1b3cbdea9..2ba81bb48 100644 if (Qt5WebKitWidgets_FOUND) message(STATUS "Found Qt5 WebKitWidgets. You can use your Freesound.org credentials to download files") --- -2.17.0 - |