Merge pull request #22977 from ttuegel/triage-kde4

Remove KDE 4 desktop packages

4 files changed, 2 insertions, 122 deletions

diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix
deleted file mode 100644
index ceece8879dcb..000000000000
--- a/pkgs/applications/video/bangarang/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, kdelibs, phonon, soprano, shared_desktop_ontologies
-, kdemultimedia, taglib, glibc, gettext
-}:
-
-stdenv.mkDerivation rec {
-  name = "bangarang-2.1";
-
-  src = fetchurl {
-    url = "http://bangarangissuetracking.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1g4pap79k8qaqi0py34xqvisxln1nc5hbvph692ah3af06n6cly1";
-  };
-
-  buildInputs = [
-    kdelibs phonon soprano shared_desktop_ontologies kdemultimedia
-    taglib gettext
-  ];
-
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
-  patches = [ ./gcc-4.7.patch ];
-
-  meta = with stdenv.lib; {
-    description = "A media player for KDE based on Nepomuk and Phonon";
-    longDescription = ''
-      Bangarang offers a minimalistic media center user interface,
-      media collection management, playlists and statistics.
-    '';
-    homepage = http://bangarangkde.wordpress.com/;
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ maintainers.phreedom maintainers.urkud ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/video/bangarang/gcc-4.7.patch b/pkgs/applications/video/bangarang/gcc-4.7.patch
deleted file mode 100644
index d4f650b9caf5..000000000000
--- a/pkgs/applications/video/bangarang/gcc-4.7.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit b893fcdb7ddfc8c59fd29a29b7265a713c3dbab1
-Author: Alex Fiestas <afiestas@kde.org>
-Date:   Thu Mar 29 10:09:22 2012 +0200
-
-    Build fix: Add unistd.h include since sleep is defined there
-
-diff --git a/src/platform/infofetchers/lastfminfofetcher.cpp b/src/platform/infofetchers/lastfminfofetcher.cpp
-index 0c49d69..fcc4cd3 100644
---- a/src/platform/infofetchers/lastfminfofetcher.cpp
-+++ b/src/platform/infofetchers/lastfminfofetcher.cpp
-@@ -32,6 +32,8 @@
- #include <QFile>
- #include <QTextEdit>
- 
-+#include <unistd.h>
-+
- LastfmInfoFetcher::LastfmInfoFetcher(QObject *parent) :
-         InfoFetcher(parent)
- {
-diff --git a/src/platform/infofetchers/tmdbinfofetcher.cpp b/src/platform/infofetchers/tmdbinfofetcher.cpp
-index 7801644..3c01960 100644
---- a/src/platform/infofetchers/tmdbinfofetcher.cpp
-+++ b/src/platform/infofetchers/tmdbinfofetcher.cpp
-@@ -30,6 +30,8 @@
- #include <QDomDocument>
- #include <QFile>
- 
-+#include <unistd.h>
-+
- TMDBInfoFetcher::TMDBInfoFetcher(QObject *parent) :
-         InfoFetcher(parent)
- {
-diff --git a/src/platform/infofetchers/tvdbinfofetcher.cpp b/src/platform/infofetchers/tvdbinfofetcher.cpp
-index ff351b0..670ed18 100644
---- a/src/platform/infofetchers/tvdbinfofetcher.cpp
-+++ b/src/platform/infofetchers/tvdbinfofetcher.cpp
-@@ -30,6 +30,8 @@
- #include <QDomDocument>
- #include <QFile>
- 
-+#include <unistd.h>
-+
- TVDBInfoFetcher::TVDBInfoFetcher(QObject *parent) :
-         InfoFetcher(parent)
- {
diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix
deleted file mode 100644
index 3da5180352c6..000000000000
--- a/pkgs/applications/video/kdenlive/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, frei0r, lib, cmake, qt4, perl, kdelibs, automoc4
-, phonon , makeWrapper, mlt, gettext , qimageblitz, qjson
-, shared_mime_info, soprano, pkgconfig, shared_desktop_ontologies
-, libv4l, oxygen_icons
-}:
-
-stdenv.mkDerivation rec {
-  name = "kdenlive-${version}";
-  version = "0.9.10";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kdenlive/${version}/src/${name}.tar.bz2";
-    sha256 = "0qxpxnfbr8g6xq0h32skgqqi2xylrv2bnmyx5x1cws9y2wwxp3zn";
-  };
-
-  buildInputs = [
-    frei0r kdelibs libv4l mlt phonon qimageblitz qjson qt4
-    shared_desktop_ontologies soprano
-  ];
-
-  nativeBuildInputs = [
-    automoc4 cmake gettext makeWrapper perl pkgconfig shared_mime_info
-  ];
-
-  propagatedUserEnvPkgs = [ oxygen_icons ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    wrapProgram $out/bin/kdenlive --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
-    wrapProgram $out/bin/kdenlive_render  --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
-  '';
-
-  meta = {
-    description = "Free and open source video editor";
-    license = stdenv.lib.licenses.gpl2Plus;
-    homepage = http://www.kdenlive.org/;
-    maintainers = with stdenv.lib.maintainers; [ goibhniu viric ];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
index cbd0347078ef..59b9893ded14 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , automoc4, cmake, gettext, makeWrapper, perl, pkgconfig
-, kdelibs, cairo, dbus_glib, mplayer
+, kdelibs4, cairo, dbus_glib, mplayer
 }:
 
 stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky";
   };
 
-  buildInputs = [ kdelibs cairo dbus_glib ];
+  buildInputs = [ kdelibs4 cairo dbus_glib ];
 
   nativeBuildInputs = [ automoc4 cmake gettext makeWrapper perl pkgconfig ];