kde5.applications: 16.08.3 -> 16.12.0

New packages:
- akonadi
- akonadi-contacts
- akonadi-mime
- kcontacts
- kdegraphics-mobipocket
- kmime

Removed packages:
- gpgmepp: now part of gpgme

Notable changes:
- kgpg: ported from Qt 4 and kdelibs to Qt 5 and Frameworks
- okular: ported from Qt 4 and kdelibs to Qt 5 and Frameworks

pkgs/desktops/kde-5/applications/akonadi-contacts.nix

@@ -0,0 +1,19 @@
+{
+  kdeApp, lib,
+  ecm,
+  akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine,
+  akonadi
+}:
+
+kdeApp {
+  name = "akonadi-contacts";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ ecm ];
+  buildInputs = [
+    akonadi-mime grantlee kcontacts kio kitemmodels kmime qtwebengine
+  ];
+  propagatedBuildInputs = [ akonadi ];
+}

pkgs/desktops/kde-5/applications/akonadi-mime.nix

@@ -0,0 +1,15 @@
+{
+  kdeApp, lib,
+  ecm,
+  akonadi, kdbusaddons, kio, kitemmodels, kmime
+}:
+
+kdeApp {
+  name = "akonadi-mime";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ ecm ];
+  buildInputs = [ akonadi kdbusaddons kio kitemmodels kmime ];
+}

pkgs/desktops/kde-5/applications/akonadi.nix

@@ -0,0 +1,20 @@
+{
+  kdeApp, lib,
+  ecm,
+  kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
+  kio,
+  boost, kitemmodels
+}:
+
+kdeApp {
+  name = "akonadi";
+  meta = {
+    license = [ lib.licenses.lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ ecm ];
+  buildInputs = [
+    kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio
+  ];
+  propagatedBuildInputs = [ boost kitemmodels ];
+}

pkgs/desktops/kde-5/applications/default.nix

@@ -31,6 +31,9 @@ let
       inherit (pkgs) attica phonon;
     };
 
+    akonadi = callPackage ./akonadi.nix {};
+    akonadi-contacts = callPackage ./akonadi-contacts.nix {};
+    akonadi-mime = callPackage ./akonadi-mime.nix {};
     ark = callPackage ./ark/default.nix {};
     baloo-widgets = callPackage ./baloo-widgets.nix {};
     dolphin = callPackage ./dolphin.nix {};
@@ -39,18 +42,20 @@ let
       ffmpeg = pkgs.ffmpeg_2;
     };
     filelight = callPackage ./filelight.nix {};
-    gpgmepp = callPackage ./gpgmepp.nix {};
     gwenview = callPackage ./gwenview.nix {};
     kate = callPackage ./kate.nix {};
     kdenlive = callPackage ./kdenlive.nix {};
     kcalc = callPackage ./kcalc.nix {};
     kcolorchooser = callPackage ./kcolorchooser.nix {};
+    kcontacts = callPackage ./kcontacts.nix {};
+    kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
     kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
     kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
     kdf = callPackage ./kdf.nix {};
-    kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; };
+    kgpg = callPackage ./kgpg.nix {};
     khelpcenter = callPackage ./khelpcenter.nix {};
     kio-extras = callPackage ./kio-extras.nix {};
+    kmime = callPackage ./kmime.nix {};
     kompare = callPackage ./kompare.nix {};
     konsole = callPackage ./konsole.nix {};
     kwalletmanager = callPackage ./kwalletmanager.nix {};

pkgs/desktops/kde-5/applications/fetch.sh

@@ -1 +1 @@
-WGET_ARGS=( http://ftp.ussg.iu.edu/kde/stable/applications/16.08.3/ --cut-dirs=1 -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/applications/16.12.0/ -A '*.tar.xz' )

pkgs/desktops/kde-5/applications/kcontacts.nix

@@ -0,0 +1,15 @@
+{
+  kdeApp, lib,
+  ecm, ki18n,
+  kcoreaddons, kconfig, kcodecs
+}:
+
+kdeApp {
+  name = "kcontacts";
+  meta = {
+    license = [ lib.licenses.lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ ecm ki18n ];
+  buildInputs = [ kcoreaddons kconfig kcodecs ];
+}

pkgs/desktops/kde-5/applications/kdegraphics-mobipocket.nix

@@ -1,15 +1,15 @@
 {
   kdeApp, lib,
   ecm,
-  boost, gpgme
+  kio
 }:
 
 kdeApp {
-  name = "gpgmepp";
+  name = "kdegraphics-mobipocket";
   meta = {
-    license = with lib.licenses; [ lgpl21 bsd3 ];
+    license = [ lib.licenses.gpl2Plus ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ ecm ];
-  propagatedBuildInputs = [ boost gpgme ];
+  buildInputs = [ kio ];
 }

pkgs/desktops/kde-5/applications/kgpg.nix

@@ -1,17 +1,19 @@
 {
   kdeApp, lib,
-  automoc4, cmake, makeWrapper, perl, pkgconfig,
+  ecm, kdoctools, ki18n,
-  boost, gpgme, kdelibs, kdepimlibs, gnupg
+  akonadi-contacts, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash,
+  kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
+  ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
 }:
 
 kdeApp {
   name = "kgpg";
-  nativeBuildInputs = [ automoc4 cmake makeWrapper perl pkgconfig ];
+  nativeBuildInputs = [ ecm kdoctools ki18n ];
-  buildInputs = [ boost gpgme kdelibs kdepimlibs ];
+  buildInputs = [
-  postInstall = ''
+    akonadi-contacts gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
-    wrapProgram "$out/bin/kgpg" \
+    kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui
-        --prefix PATH : "${gnupg}/bin"
+    kwidgetsaddons kwindowsystem
-  '';
+  ];
   meta = {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/desktops/kde-5/applications/kmime.nix

@@ -0,0 +1,15 @@
+{
+  kdeApp, lib,
+  ecm, ki18n,
+  kcodecs
+}:
+
+kdeApp {
+  name = "kmime";
+  meta = {
+    license = [ lib.licenses.lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ ecm ki18n ];
+  buildInputs = [ kcodecs ];
+}

pkgs/desktops/kde-5/applications/l10n.nix

@@ -205,7 +205,7 @@ lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) {
     }) {};
     qt5 = callPackage (kdeLocale5 "sr" {
       preConfigure = ''
-        patchShebangs 5/sr/data/resolve-sr-hybrid
+        patchShebangs 5/sr/cmake_modules/resolve-sr-hybrid
         sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt
       '';
     }) {};
@@ -222,13 +222,10 @@ lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) {
     qt4 = callPackage (kdeLocale4 "ug" {}) {};
     qt5 = callPackage (kdeLocale5 "ug" {}) {};
   };
-  # TODO: build broken in 15.11.80; re-enable in next release
-  /*
   uk = {
     qt4 = callPackage (kdeLocale4 "uk" {}) {};
     qt5 = callPackage (kdeLocale5 "uk" {}) {};
   };
-  */
   wa = {
     qt4 = callPackage (kdeLocale4 "wa" {}) {};
     qt5 = callPackage (kdeLocale5 "wa" {}) {};

pkgs/desktops/kde-5/applications/okular.nix

@@ -1,16 +1,21 @@
 {
-  kdeApp, lib,
+  kdeApp, lib, kdeWrapper,
-  automoc4, cmake, perl, pkgconfig, kdelibs, qimageblitz,
+  ecm, kdoctools,
-  poppler_qt4, libspectre, libkexiv2, djvulibre, libtiff, freetype,
+  djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
-  ebook_tools
+  kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
+  kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
+  libspectre, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
 }:
 
-kdeApp {
+let
+  unwrapped = kdeApp {
     name = "okular";
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+    nativeBuildInputs = [ ecm kdoctools ];
     buildInputs = [
-    kdelibs qimageblitz poppler_qt4 libspectre libkexiv2 djvulibre libtiff
+      djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig
-    freetype ebook_tools
+      kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes
+      kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler
+      qca-qt5 qtdeclarative qtsvg threadweaver
     ];
     meta = {
       platforms = lib.platforms.linux;
@@ -18,4 +23,8 @@ kdeApp {
       license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
       maintainers = [ lib.maintainers.ttuegel ];
     };
+  };
+in
+kdeWrapper unwrapped {
+  targets = [ "bin/okular" ];
 }