[gentoo-commits] proj/kde:master commit in: kde-apps/kdenlive/files/

[gentoo-commits] proj/kde:master commit in: kde-apps/kdenlive/files/

[Johannes Huber]

commit:     916da9ded6c166d7043b7ac43525df7aeaf15a36
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 18:46:44 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 18:46:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=916da9de

kde-apps/kdenlive: Remove unused patch

Package-Manager: portage-2.2.28

 .../kdenlive/files/kdenlive-15.12.0-kcrash.patch   | 63 ----------------------
 1 file changed, 63 deletions(-)

diff --git a/kde-apps/kdenlive/files/kdenlive-15.12.0-kcrash.patch b/kde-apps/kdenlive/files/kdenlive-15.12.0-kcrash.patch
deleted file mode 100644
index 87bc3f7..0000000
--- a/kde-apps/kdenlive/files/kdenlive-15.12.0-kcrash.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Jean-Baptiste Mardelle <jb@kdenlive.org>
-Date: Sun, 27 Dec 2015 23:25:59 +0000
-Subject: Open KDE's crash handler on crash (bump KF5 requirement to 5.15)
-X-Git-Url: http://quickgit.kde.org/?p=kdenlive.git&a=commitdiff&h=57cb1121da1d7106ebdb73a814c27e54b1711332
----
-Open KDE's crash handler on crash (bump KF5 requirement to 5.15)
----
-
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -74,9 +74,8 @@
- 
- find_package(Qt5 CONFIG REQUIRED Core DBus Test Widgets Script Svg)
- 
--find_package(KF5 REQUIRED Archive Bookmarks CoreAddons Config ConfigWidgets 
--                            DBusAddons KIO WidgetsAddons Plotting NotifyConfig NewStuff XmlGui Notifications GuiAddons TextWidgets IconThemes DocTools)
--
-+find_package(KF5 5.15 REQUIRED COMPONENTS Archive Bookmarks CoreAddons Config ConfigWidgets 
-+                            DBusAddons KIO WidgetsAddons Plotting NotifyConfig NewStuff XmlGui Notifications GuiAddons TextWidgets IconThemes DocTools Crash)
- 
- # Search MLT package.
- find_package(MLT ${MLT_MIN_VERSION} REQUIRED)
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -261,6 +261,7 @@
-    KF5::Notifications
-    KF5::TextWidgets
-    KF5::IconThemes
-+   KF5::Crash
-   ${Qt5_LIBRARIES}
-   Qt5::Svg
-   ${OPENGL_LIBRARIES}
-
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -22,6 +22,7 @@
- #include "mainwindow.h"
- 
- #include <KAboutData>
-+#include <KCrash>
- #include <QDebug>
- 
- #include <QUrl> //new
-@@ -37,7 +38,7 @@
- #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
-     QCoreApplication::setAttribute(Qt::AA_X11InitThreads);
- #endif
--    
-+
-     KLocalizedString::setApplicationDomain("kdenlive");
- 
-     // Init application
-@@ -93,6 +94,7 @@
- 
-     // Register DBus service
-     KDBusService programDBusService;
-+    KCrash::initialize();
- 
-     // see if we are starting with session management
-     if (qApp->isSessionRestored()){
-

[gentoo-commits] proj/kde:master commit in: kde-apps/kdenlive/files/

[Andreas Sturmlechner]

commit:     ffb632b965c7ab84b22c9d886f11cac4fdd8db8e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 19 11:26:49 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <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
-