From e5af7f79d55afaf4fcb49f0447eaa48517742a13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 11 Jan 2014 13:28:12 +0100
Subject: [PATCH 1/6] gupnp-tools and releated packages: fix and update

---
 pkgs/development/libraries/gssdp/default.nix  |  4 ++--
 .../libraries/gupnp-av/default.nix            | 20 +++++++++++++++++++
 pkgs/development/libraries/gupnp/default.nix  | 16 ++++++++++++---
 .../development/libraries/libsoup/default.nix | 13 ++++++------
 pkgs/tools/networking/gupnp-tools/default.nix | 13 ++++++++----
 pkgs/top-level/all-packages.nix               |  4 +++-
 6 files changed, 54 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/libraries/gupnp-av/default.nix

diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index 2c14451ba78..466406fbe79 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "gssdp-0.12.2.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gssdp/0.12/gssdp-0.12.2.1.tar.xz;
-    sha256 = "0544f9nv6dpnfd0qbmxm8xwqjh8dafcmf3vlzkdly12xh5bs52lj";
+    url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.6.tar.xz;
+    sha256 = "1kgakr0rpdpm7nkp4ycka12nndga16wmzim79v1nbcc0j2wxxkws";
   };
 
   buildInputs = [pkgconfig libsoup glib libxml2];
diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix
new file mode 100644
index 00000000000..ef78b4d185d
--- /dev/null
+++ b/pkgs/development/libraries/gupnp-av/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, gupnp, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "gupnp-av";
+  version = "0.12.4";
+  src = fetchurl {
+    url = mirror://gnome/sources/gupnp-av/0.12/gupnp-av-0.12.4.tar.xz;
+    sha256 = "0nvsvpiyfslz54j4hjh2gsdjkbi2qj2f4k0aw8s7f05kibprr2jl";
+  };
+  
+  buildInputs = [ gupnp pkgconfig ];
+
+  meta = {
+    homepage = http://gupnp.org/;
+    description = "GUPnP-AV is a collection of helpers for building AV (audio/video) applications using GUPnP.";
+    longDescription = "GUPnP implements the UPnP specification: resource announcement and discovery, description, control, event notification, and presentation (GUPnP includes basic web server functionality through libsoup). GUPnP does not include helpers for construction or control of specific standardized resources (e.g. MediaServer); this is left for higher level libraries utilizing the GUPnP framework.";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index ca92bb82a73..4bd4c1aee26 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }:
  
 stdenv.mkDerivation {
-  name = "gupnp-0.18.4";
+  name = "gupnp";
+  version = "0.20.9";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gupnp/0.18/gupnp-0.18.4.tar.xz;
-    sha256 = "18bqmy8r44fnga9wz9inlq6k2s0292bnnql0c0n2j4mj25bpshvb";
+    url = mirror://gnome/sources/gupnp/0.20/gupnp-0.20.9.tar.xz;
+    sha256 = "0vicydn3f72x1rqql7857ans85mg7dfap7n7h8xrfyb9whxhlrb1";
   };
 
   propagatedBuildInputs = [ libxml2 libsoup gssdp ];
@@ -13,7 +14,16 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
 
+  postInstall = '' 
+    cp -r ${libsoup}/include/libsoup-2.4/libsoup $out/include
+    cp -r ${gssdp}/include/gssdp-1.0/libgssdp $out/include
+    cp -r ${libxml2}/include/libxml2/libxml $out/include
+    '';
+
   meta = {
     homepage = http://www.gupnp.org/;
+    description = "GUPnP is an implementation of the UPnP specification.";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index a5ce0fda270..5e0cae657f8 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -1,17 +1,18 @@
 { stdenv, fetchurl, glib, libxml2, pkgconfig
 , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking
-, libintlOrEmpty }:
+, libintlOrEmpty
+, intltool, python }:
 
 stdenv.mkDerivation {
-  name = "libsoup-2.38.1";
+  name = "libsoup";
+  version = "2.45";
 
   src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz;
-    sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i";
+    url = mirror://gnome/sources/libsoup/2.45/libsoup-2.45.3.tar.xz;
+    sha256 = "04ma47hcrrbjp90r8jjn686cngnbgac24wgarpwwzlpg66wighva";
   };
 
-
-  buildInputs = libintlOrEmpty;
+  buildInputs = libintlOrEmpty ++ [ intltool python ];
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ glib libxml2 ]
     ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix
index 8346be2ceb5..f9583e22340 100644
--- a/pkgs/tools/networking/gupnp-tools/default.nix
+++ b/pkgs/tools/networking/gupnp-tools/default.nix
@@ -1,11 +1,16 @@
-{fetchurl, stdenv, gupnp, gssdp, pkgconfig, glib, libxml2, libsoup, gtk, libglade, gnomeicontheme, e2fsprogs}:
+{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, makeWrapper}:
 
 stdenv.mkDerivation rec {
   name = "gupnp-tools-0.6";
   src = fetchurl {
-    url = "http://www.gupnp.org/sources/gupnp-tools/gupnp-tools-0.6.tar.gz";
-    sha256 = "08fnggk85zqdcvm4np53yxw15b3ck25c2rmyfrh04g8j25qf50dj";
+    url = mirror://gnome/sources/gupnp-tools/0.8/gupnp-tools-0.8.8.tar.xz;
+    sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij";
   };
 
-  buildInputs = [gupnp gssdp pkgconfig glib libxml2 libsoup gtk libglade gnomeicontheme e2fsprogs];
+  buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av gnome3.gnome_icon_theme gnome3.gnome_themes_standard makeWrapper];
+
+  postInstall = ''
+    wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share"
+    wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share"
+  '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22cf0c51680..145655011fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1101,10 +1101,12 @@ let
     inherit (gnome) libsoup;
   };
 
+  gupnp_av = callPackage ../development/libraries/gupnp-av {};
+
   gupnp_igd = callPackage ../development/libraries/gupnp-igd {};
 
   gupnptools = callPackage ../tools/networking/gupnp-tools {
-    inherit (gnome) libsoup libglade gnomeicontheme;
+#    inherit (gnome) libsoup libglade gnomeicontheme;
   };
 
   gvpe = builderDefsPackage ../tools/networking/gvpe {

From 9c4a58515d0a538776bc4cc0e5e3639f796e4001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 11 Jan 2014 21:26:05 +0100
Subject: [PATCH 2/6] Add version numbers to name and remove comment

---
 pkgs/development/libraries/gupnp-av/default.nix | 2 +-
 pkgs/development/libraries/gupnp/default.nix    | 2 +-
 pkgs/development/libraries/libsoup/default.nix  | 2 +-
 pkgs/top-level/all-packages.nix                 | 4 +---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix
index ef78b4d185d..0f4e783ff6e 100644
--- a/pkgs/development/libraries/gupnp-av/default.nix
+++ b/pkgs/development/libraries/gupnp-av/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gupnp, pkgconfig }:
 
 stdenv.mkDerivation {
-  name = "gupnp-av";
+  name = "gupnp-av-0.12.4";
   version = "0.12.4";
   src = fetchurl {
     url = mirror://gnome/sources/gupnp-av/0.12/gupnp-av-0.12.4.tar.xz;
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index 4bd4c1aee26..84c2df9b817 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }:
  
 stdenv.mkDerivation {
-  name = "gupnp";
+  name = "gupnp-0.20.9";
   version = "0.20.9";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 5e0cae657f8..c9203ec34c6 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -4,7 +4,7 @@
 , intltool, python }:
 
 stdenv.mkDerivation {
-  name = "libsoup";
+  name = "libsoup-2.45";
   version = "2.45";
 
   src = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 145655011fe..8507fe0eed2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1105,9 +1105,7 @@ let
 
   gupnp_igd = callPackage ../development/libraries/gupnp-igd {};
 
-  gupnptools = callPackage ../tools/networking/gupnp-tools {
-#    inherit (gnome) libsoup libglade gnomeicontheme;
-  };
+  gupnptools = callPackage ../tools/networking/gupnp-tools {};
 
   gvpe = builderDefsPackage ../tools/networking/gvpe {
     inherit openssl gmp nettools iproute;

From 9d6ab791af07f4baeb84e116c0eb972f8b64ecf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 14 Jan 2014 21:33:11 +0100
Subject: [PATCH 3/6] Use version variables for easier upgrading

---
 pkgs/development/libraries/gupnp-av/default.nix |  9 +++++----
 pkgs/development/libraries/gupnp/default.nix    | 10 +++++-----
 pkgs/development/libraries/libsoup/default.nix  |  9 +++++----
 pkgs/tools/networking/gupnp-tools/default.nix   |  6 ++++--
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix
index 0f4e783ff6e..3cbb13972d3 100644
--- a/pkgs/development/libraries/gupnp-av/default.nix
+++ b/pkgs/development/libraries/gupnp-av/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, gupnp, pkgconfig }:
 
-stdenv.mkDerivation {
-  name = "gupnp-av-0.12.4";
-  version = "0.12.4";
+stdenv.mkDerivation rec {
+  name = "gupnp-av-${version}";
+  majorVersion = "0.12";
+  version = "${majorVersion}.4";
   src = fetchurl {
-    url = mirror://gnome/sources/gupnp-av/0.12/gupnp-av-0.12.4.tar.xz;
+    url = "mirror://gnome/sources/gupnp-av/${majorVersion}/gupnp-av-${version}.tar.xz";
     sha256 = "0nvsvpiyfslz54j4hjh2gsdjkbi2qj2f4k0aw8s7f05kibprr2jl";
   };
   
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index 84c2df9b817..bae0639a61c 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }:
  
-stdenv.mkDerivation {
-  name = "gupnp-0.20.9";
-  version = "0.20.9";
-
+stdenv.mkDerivation rec {
+  name = "gupnp-${version}";
+  majorVersion = "0.20";
+  version = "${majorVersion}.9";
   src = fetchurl {
-    url = mirror://gnome/sources/gupnp/0.20/gupnp-0.20.9.tar.xz;
+    url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz";
     sha256 = "0vicydn3f72x1rqql7857ans85mg7dfap7n7h8xrfyb9whxhlrb1";
   };
 
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index c9203ec34c6..99dc56722b9 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -3,12 +3,13 @@
 , libintlOrEmpty
 , intltool, python }:
 
-stdenv.mkDerivation {
-  name = "libsoup-2.45";
-  version = "2.45";
+stdenv.mkDerivation rec {
+  name = "libsoup-${version}";
+  majorVersion = "2.45";
+  version = "${majorVersion}.3";
 
   src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.45/libsoup-2.45.3.tar.xz;
+    url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
     sha256 = "04ma47hcrrbjp90r8jjn686cngnbgac24wgarpwwzlpg66wighva";
   };
 
diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix
index f9583e22340..54f3e860e0c 100644
--- a/pkgs/tools/networking/gupnp-tools/default.nix
+++ b/pkgs/tools/networking/gupnp-tools/default.nix
@@ -1,9 +1,11 @@
 {fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  name = "gupnp-tools-0.6";
+  name = "gupnp-tools-${version}";
+  majorVersion = "0.8";
+  version = "${majorVersion}.8";
   src = fetchurl {
-    url = mirror://gnome/sources/gupnp-tools/0.8/gupnp-tools-0.8.8.tar.xz;
+    url = "mirror://gnome/sources/gupnp-tools/${majorVersion}/gupnp-tools-${version}.tar.xz";
     sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij";
   };
 

From 49b668f5d2b8d1104eb9f1764cc384024f5cf97a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 21 Jan 2014 16:33:10 +0100
Subject: [PATCH 4/6] libsoup: Run patchShebangs

---
 pkgs/development/libraries/libsoup/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 99dc56722b9..12124474566 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
     sha256 = "04ma47hcrrbjp90r8jjn686cngnbgac24wgarpwwzlpg66wighva";
   };
 
+  patchPhase = ''
+    patchShebangs libsoup/
+    '';
+
   buildInputs = libintlOrEmpty ++ [ intltool python ];
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ glib libxml2 ]

From e0b8a4cc5e3486e1b2009cbfdb9092947ea60319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 30 Jan 2014 18:48:16 +0100
Subject: [PATCH 5/6] Remove libsoup_2_44

---
 pkgs/development/libraries/libsoup/2.44.nix | 35 ---------------------
 pkgs/top-level/all-packages.nix             |  6 +---
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 pkgs/development/libraries/libsoup/2.44.nix

diff --git a/pkgs/development/libraries/libsoup/2.44.nix b/pkgs/development/libraries/libsoup/2.44.nix
deleted file mode 100644
index 4bef93ff8cd..00000000000
--- a/pkgs/development/libraries/libsoup/2.44.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, python, gobjectIntrospection
-, glib, libxml2, sqlite, glib_networking
-, gnomeSupport ? true, libgnome_keyring
-}:
-
-stdenv.mkDerivation {
-  name = "libsoup-2.44.2";
-
-  meta = {
-    description = "HTTP client/server library";
-    license = stdenv.lib.licenses.lgpl2Plus;
-  };
-
-  src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.44/libsoup-2.44.2.tar.xz;
-    sha256 = "1wwqsmi1jvidiqwbdnjl66nmk1yja8w9dxf9cz10zh56fjmvbr77";
-  };
-
-  preConfigure = ''
-    substituteInPlace libsoup/tld-parser.py \
-      --replace "!/usr/bin/env python" "!${python}/bin/${python.executable}"
-  '';
-
-  nativeBuildInputs = [ pkgconfig intltool python gobjectIntrospection ];
-
-  propagatedBuildInputs = [ glib libxml2 sqlite ]
-    ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
-
-  passthru.propagatedUserEnvPackages = [ glib_networking ];
-
-  # glib_networking is a runtime dependency, not a compile-time dependency
-  configureFlags = "--disable-tls-check";
-
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8507fe0eed2..6b28eb79073 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4120,9 +4120,7 @@ let
 
   geoclue = callPackage ../development/libraries/geoclue {};
 
-  geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {
-    libsoup = libsoup_2_44;
-  };
+  geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
 
   geoip = builderDefsPackage ../development/libraries/geoip {
     inherit zlib;
@@ -4928,7 +4926,6 @@ let
   libsodium = callPackage ../development/libraries/libsodium { };
 
   libsoup = callPackage ../development/libraries/libsoup { };
-  libsoup_2_44 = callPackage ../development/libraries/libsoup/2.44.nix { };
 
   libssh = callPackage ../development/libraries/libssh { };
 
@@ -5734,7 +5731,6 @@ let
     };
 
   webkitgtk = callPackage ../development/libraries/webkitgtk {
-    libsoup = libsoup_2_44;
     harfbuzz = harfbuzz.override {
       withIcu = true;
     };

From 13d11227f1e68f55b1365c39c0e91bcc4371735e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 30 Jan 2014 19:02:29 +0100
Subject: [PATCH 6/6] Remove left-over reference to libsoup_2_44

---
 pkgs/desktops/gnome-3/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 772aaf54e0a..1b440be200a 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -8,10 +8,6 @@ rec {
   orbit = ORBit2;
 
 
-#### Overrides of libraries
-
-  libsoup = pkgs.libsoup_2_44;
-
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 
   at_spi2_atk = callPackage ./core/at-spi2-atk { };