ario: 1.5.1 → 1.6
This commit is contained in:
parent
8c10401e69
commit
12134c74ef
@ -1,27 +1,24 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, gettext, gtk2, expat, intltool, libgcrypt,
|
{ stdenv, fetchurl, pkgconfig, gettext, gtk3, intltool,
|
||||||
libunique, gnutls, libxml2, curl, mpd_clientlib, dbus-glib, libnotify,
|
wrapGAppsHook, libxml2, curl, mpd_clientlib, dbus-glib,
|
||||||
libsoup, avahi, taglib
|
libsoup, avahi, taglib
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.5.1";
|
version = "1.6";
|
||||||
name = "ario-${version}";
|
name = "ario-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/ario-player/${name}.tar.gz";
|
url = "mirror://sourceforge/ario-player/${name}.tar.gz";
|
||||||
sha256 = "07n97618jv1ilxnm5c6qj9zjz0imw3p304mn4hjbjkk3p0d2hc88";
|
sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./glib-single-include.patch ];
|
nativeBuildInputs = [ pkgconfig gettext intltool wrapGAppsHook ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gettext gtk2 expat intltool libgcrypt libunique gnutls
|
gtk3 libxml2 curl mpd_clientlib dbus-glib libsoup avahi taglib
|
||||||
libxml2 curl mpd_clientlib dbus-glib libnotify libsoup avahi taglib
|
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "GTK2 client for MPD (Music player daemon)";
|
description = "GTK client for MPD (Music player daemon)";
|
||||||
homepage = http://ario-player.sourceforge.net/;
|
homepage = http://ario-player.sourceforge.net/;
|
||||||
license = stdenv.lib.licenses.gpl2Plus;
|
license = stdenv.lib.licenses.gpl2Plus;
|
||||||
maintainers = [ stdenv.lib.maintainers.garrison ];
|
maintainers = [ stdenv.lib.maintainers.garrison ];
|
||||||
|
@ -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
|
|
Loading…
Reference in New Issue
Block a user