Re: [Nix-dev] kdenlive fix build

[Vladimír Čunát]

On 06/10/2017 06:24 AM, Karn Kallio wrote:
> [...] The attached patch
> fixes the build by adding the Concurrent module to the find_package use.

Thanks!  Pushed to master as dc073726927.

--Vladimir
___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev

[Nix-dev] kdenlive fix build

[Karn Kallio]

The kdenlive expression is does not build because the CMakeLists.txt
does not find the Concurrent module and then uses it anyway.  Maybe an
earlier version of Qt5 had the Concurrent module as a dependency of
another module that is in the find_package call.  The attached patch
fixes the build by adding the Concurrent module to the find_package use.
>From 017c7209bff2566036ca819339c28ca3dcf76df2 Mon Sep 17 00:00:00 2001
From: Karn Kallio 
Date: Sat, 10 Jun 2017 00:20:40 -0400
Subject: [PATCH] kdenlive : patch CMakeLists.txt to find Concurrent module.

---
 pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch | 12 
 pkgs/applications/kde/kdenlive.nix   |  3 +++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch

diff --git a/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch b/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch
new file mode 100644
index 00..ea2af2b095
--- /dev/null
+++ b/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch
@@ -0,0 +1,12 @@
+diff -Naur kdenlive-17.04.1-upstream/CMakeLists.txt kdenlive-17.04.1/CMakeLists.txt
+--- kdenlive-17.04.1-upstream/CMakeLists.txt	2017-06-10 00:06:44.773146595 -0400
 kdenlive-17.04.1/CMakeLists.txt	2017-06-10 00:07:35.766596566 -0400
+@@ -79,7 +79,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 Concurrent DBus Widgets Script Svg Quick )
+ find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
+ 
+ find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET)
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index 3c18772f03..e543a3d84b 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -34,6 +34,9 @@
 let
 unwrapped = kdeApp {
   name = "kdenlive";
+  patches = [
+./kdenlive-cmake-concurrent-module.patch
+  ];
   nativeBuildInputs = [
 extra-cmake-modules
 kdoctools
-- 
2.12.0

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-dev