From 12134c74ef5003587d30cd2d43a308820d6e6384 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 18 Nov 2018 01:05:11 +0100
Subject: [PATCH] =?UTF-8?q?ario:=201.5.1=20=E2=86=92=201.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/audio/ario/default.nix      | 17 ++++----
 .../audio/ario/glib-single-include.patch      | 40 -------------------
 2 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 pkgs/applications/audio/ario/glib-single-include.patch

diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix
index a99fb80df723..02d818410df4 100644
--- a/pkgs/applications/audio/ario/default.nix
+++ b/pkgs/applications/audio/ario/default.nix
@@ -1,27 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt,
-  libunique, gnutls, libxml2, curl, mpd_clientlib, dbus-glib, libnotify,
+{ stdenv, fetchurl, pkgconfig, gettext, gtk3, intltool,
+  wrapGAppsHook, libxml2, curl, mpd_clientlib, dbus-glib,
   libsoup, avahi, taglib
   }:
 
 stdenv.mkDerivation rec {
-  version = "1.5.1";
+  version = "1.6";
   name = "ario-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/ario-player/${name}.tar.gz";
-    sha256 = "07n97618jv1ilxnm5c6qj9zjz0imw3p304mn4hjbjkk3p0d2hc88";
+    sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl";
   };
 
-  patches = [ ./glib-single-include.patch ];
-
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig gettext intltool wrapGAppsHook ];
   buildInputs = [
-    gettext gtk2 expat intltool libgcrypt libunique gnutls
-    libxml2 curl mpd_clientlib dbus-glib libnotify libsoup avahi taglib
+    gtk3 libxml2 curl mpd_clientlib dbus-glib libsoup avahi taglib
   ];
 
   meta = {
-    description = "GTK2 client for MPD (Music player daemon)";
+    description = "GTK client for MPD (Music player daemon)";
     homepage = http://ario-player.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.garrison ];
diff --git a/pkgs/applications/audio/ario/glib-single-include.patch b/pkgs/applications/audio/ario/glib-single-include.patch
deleted file mode 100644
index 45e0a1738f8b..000000000000
--- a/pkgs/applications/audio/ario/glib-single-include.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Michael Biebl <biebl@debian.org>
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/665506
-Subject: Including individual glib headers no longer supported
-
---- a/src/ario-profiles.h
-+++ b/src/ario-profiles.h
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_PROFILES_H
- #define __ARIO_PROFILES_H
- 
--#include <glib/gslist.h>
-+#include <glib.h>
- #include "servers/ario-server.h"
- 
- G_BEGIN_DECLS
---- a/src/plugins/ario-plugin-info.c
-+++ b/src/plugins/ario-plugin-info.c
-@@ -27,7 +27,7 @@
- 
- #include <string.h>
- #include <glib/gi18n.h>
--#include <glib/gkeyfile.h>
-+#include <glib.h>
- 
- #include "plugins/ario-plugin-info-priv.h"
- #include "ario-debug.h"
---- a/src/ario-util.h
-+++ b/src/ario-util.h
-@@ -18,8 +18,8 @@
-  */
- 
- #include "servers/ario-server.h"
--#include "glib/gslist.h"
--#include "gdk/gdkpixbuf.h"
-+#include <glib.h>
-+#include <gdk/gdkpixbuf.h>
- 
- /* Number of covers used to generate the drag & drop image */
- #define MAX_COVERS_IN_DRAG 3