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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 59A24138332 for ; Thu, 19 Apr 2018 11:27:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 606FAE095E; Thu, 19 Apr 2018 11:27:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 27233E095E for ; Thu, 19 Apr 2018 11:27:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E364E335C87 for ; Thu, 19 Apr 2018 11:27:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 891AB292 for ; Thu, 19 Apr 2018 11:27:24 +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: <1524137209.ffb632b965c7ab84b22c9d886f11cac4fdd8db8e.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdenlive/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch X-VCS-Directories: kde-apps/kdenlive/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ffb632b965c7ab84b22c9d886f11cac4fdd8db8e X-VCS-Branch: master Date: Thu, 19 Apr 2018 11:27:24 +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-Archives-Salt: 2790dd65-819a-4f77-aa45-aa2b64c4a053 X-Archives-Hash: fb4c3d925ac3bc34352538e99db24f8d commit: ffb632b965c7ab84b22c9d886f11cac4fdd8db8e Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 19 11:26:49 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 19 11:26:49 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ffb632b9 kde-apps/kdenlive: Update qt5.11b3.patch by upstream review Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../kdenlive/files/kdenlive-18.04.0-qt-5.11.patch | 44 +++++++++++----------- 1 file 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 143745737c..9b65000a8c 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 -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 -