Several phonon include paths reference the nonexistent include
directory "Phonon" which breaks the kde5 build. The attached patch
fixes these replacing them with the correct "phonon" include directory.
The phonon expression itself produces a "phonon" include directory, so
I have used that as the definition of correct.
>From 95d7cc76f5d01de30b63ae13c7525a2b1092b9f4 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkal...@skami.org>
Date: Sat, 23 Apr 2016 21:39:43 -0430
Subject: [PATCH] kde-5: fix some phonon include paths.
---
.../dolphin-phonon-include.patch | 48 ++++++++++++++++++++++
pkgs/desktops/kde-5/applications-15.12/dolphin.nix | 1 +
.../gwenview-phonon-include.patch | 18 ++++++++
.../desktops/kde-5/applications-15.12/gwenview.nix | 1 +
.../plasma-workspace-phonon-include.patch | 12 ++++++
.../kde-5/plasma-5.5/plasma-workspace/series | 1 +
6 files changed, 81 insertions(+)
create mode 100644 pkgs/desktops/kde-5/applications-15.12/dolphin-phonon-include.patch
create mode 100644 pkgs/desktops/kde-5/applications-15.12/gwenview-phonon-include.patch
create mode 100644 pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/plasma-workspace-phonon-include.patch
diff --git a/pkgs/desktops/kde-5/applications-15.12/dolphin-phonon-include.patch b/pkgs/desktops/kde-5/applications-15.12/dolphin-phonon-include.patch
new file mode 100644
index 0000000..c4ae12c
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-15.12/dolphin-phonon-include.patch
@@ -0,0 +1,48 @@
+diff -Naur dolphin-15.12.3-up/src/panels/information/informationpanelcontent.cpp dolphin-15.12.3/src/panels/information/informationpanelcontent.cpp
+--- dolphin-15.12.3-up/src/panels/information/informationpanelcontent.cpp 2016-03-09 16:08:21.000000000 -0430
++++ dolphin-15.12.3/src/panels/information/informationpanelcontent.cpp 2016-04-23 20:25:44.509675559 -0430
+@@ -41,9 +41,9 @@
+ #include <panels/places/placesitem.h>
+ #include <panels/places/placesitemmodel.h>
+
+-#include <Phonon/BackendCapabilities>
+-#include <Phonon/MediaObject>
+-#include <Phonon/SeekSlider>
++#include <phonon/BackendCapabilities>
++#include <phonon/MediaObject>
++#include <phonon/SeekSlider>
+
+ #include <QEvent>
+ #include <QLabel>
+diff -Naur dolphin-15.12.3-up/src/panels/information/phononwidget.cpp dolphin-15.12.3/src/panels/information/phononwidget.cpp
+--- dolphin-15.12.3-up/src/panels/information/phononwidget.cpp 2016-03-09 16:08:21.000000000 -0430
++++ dolphin-15.12.3/src/panels/information/phononwidget.cpp 2016-04-23 20:24:10.905725084 -0430
+@@ -20,11 +20,11 @@
+
+ #include "phononwidget.h"
+
+-#include <Phonon/AudioOutput>
+-#include <Phonon/Global>
+-#include <Phonon/MediaObject>
+-#include <Phonon/SeekSlider>
+-#include <Phonon/VideoWidget>
++#include <phonon/AudioOutput>
++#include <phonon/Global>
++#include <phonon/MediaObject>
++#include <phonon/SeekSlider>
++#include <phonon/VideoWidget>
+
+ #include <QVBoxLayout>
+ #include <QHBoxLayout>
+diff -Naur dolphin-15.12.3-up/src/panels/information/phononwidget.h dolphin-15.12.3/src/panels/information/phononwidget.h
+--- dolphin-15.12.3-up/src/panels/information/phononwidget.h 2016-03-09 16:08:21.000000000 -0430
++++ dolphin-15.12.3/src/panels/information/phononwidget.h 2016-04-23 20:26:07.013384895 -0430
+@@ -25,7 +25,7 @@
+ #include <QSize>
+ #include <QWidget>
+
+-#include <Phonon/Global>
++#include <phonon/Global>
+
+ namespace Phonon
+ {
diff --git a/pkgs/desktops/kde-5/applications-15.12/dolphin.nix b/pkgs/desktops/kde-5/applications-15.12/dolphin.nix
index 3218146..b03d941 100644
--- a/pkgs/desktops/kde-5/applications-15.12/dolphin.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/dolphin.nix
@@ -29,6 +29,7 @@
kdeApp {
name = "dolphin";
+ patches = [ ./dolphin-phonon-include.patch ];
nativeBuildInputs = [
extra-cmake-modules
kdoctools
diff --git a/pkgs/desktops/kde-5/applications-15.12/gwenview-phonon-include.patch b/pkgs/desktops/kde-5/applications-15.12/gwenview-phonon-include.patch
new file mode 100644
index 0000000..d9d2fb2
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-15.12/gwenview-phonon-include.patch
@@ -0,0 +1,18 @@
+diff -Naur gwenview-15.12.3-up/lib/documentview/videoviewadapter.cpp gwenview-15.12.3/lib/documentview/videoviewadapter.cpp
+--- gwenview-15.12.3-up/lib/documentview/videoviewadapter.cpp 2016-03-09 16:10:55.000000000 -0430
++++ gwenview-15.12.3/lib/documentview/videoviewadapter.cpp 2016-04-23 20:04:13.585984564 -0430
+@@ -22,10 +22,10 @@
+ #include "videoviewadapter.h"
+
+ // Qt
+-#include <Phonon/AudioOutput>
+-#include <Phonon/MediaObject>
+-#include <Phonon/Path>
+-#include <Phonon/VideoWidget>
++#include <phonon/AudioOutput>
++#include <phonon/MediaObject>
++#include <phonon/Path>
++#include <phonon/VideoWidget>
+ #include <QAction>
+ #include <QGraphicsLinearLayout>
+ #include <QGraphicsProxyWidget>
diff --git a/pkgs/desktops/kde-5/applications-15.12/gwenview.nix b/pkgs/desktops/kde-5/applications-15.12/gwenview.nix
index 732ac11..368f54f 100644
--- a/pkgs/desktops/kde-5/applications-15.12/gwenview.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/gwenview.nix
@@ -16,6 +16,7 @@
kdeApp {
name = "gwenview";
+ patches = [ ./gwenview-phonon-include.patch ];
nativeBuildInputs = [
extra-cmake-modules
kdoctools
diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/plasma-workspace-phonon-include.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/plasma-workspace-phonon-include.patch
new file mode 100644
index 0000000..60d84d2
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/plasma-workspace-phonon-include.patch
@@ -0,0 +1,12 @@
+diff -Naur plasma-workspace-5.5.5-up/phonon/platform_kde/kiomediastream.h plasma-workspace-5.5.5/phonon/platform_kde/kiomediastream.h
+--- plasma-workspace-5.5.5-up/phonon/platform_kde/kiomediastream.h 2016-03-02 07:47:41.000000000 -0430
++++ plasma-workspace-5.5.5/phonon/platform_kde/kiomediastream.h 2016-04-23 20:50:53.164229612 -0430
+@@ -20,7 +20,7 @@
+ #ifndef PHONON_KIOMEDIASTREAM_H
+ #define PHONON_KIOMEDIASTREAM_H
+
+-#include <Phonon/AbstractMediaStream>
++#include <phonon/AbstractMediaStream>
+ #include <KIO/Job>
+
+ class QUrl;
diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series
index b908129..16f2e53 100644
--- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series
@@ -1 +1,2 @@
qml-import-path.patch
+plasma-workspace-phonon-include.patch
--
2.8.0
_______________________________________________
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev
