diff --git a/audio/ario/Makefile b/audio/ario/Makefile index ca681541cec..66d1a97f62d 100644 --- a/audio/ario/Makefile +++ b/audio/ario/Makefile @@ -1,33 +1,27 @@ -COMMENT = GTK2-based MPD client inspired by Rhythmbox -DISTNAME = ario-1.5.1 +COMMENT = GTK3 MPD client inspired by Rhythmbox +DISTNAME = ario-1.6 CATEGORIES = audio x11 -REVISION = 22 -SHARED_LIBS += audioscrobbler 0.0 # 0.0 -SHARED_LIBS += filesystem 0.0 # 0.0 -SHARED_LIBS += information 0.0 # 0.0 -SHARED_LIBS += libnotify 0.0 # 0.0 +SHARED_LIBS += filesystem 1.0 # 0.0 +SHARED_LIBS += information 1.0 # 0.0 SHARED_LIBS += mmkeys 0.0 # 0.0 -SHARED_LIBS += radios 0.0 # 0.0 -SHARED_LIBS += wikipedia 0.0 # 0.0 +SHARED_LIBS += radios 1.0 # 0.0 -HOMEPAGE = http://ario-player.sourceforge.net/ +HOMEPAGE = https://ario-player.sourceforge.net/ # GPLv2+ PERMIT_PACKAGE = Yes -WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr -WANTLIB += Xrender atk-1.0 avahi-client avahi-common avahi-glib c cairo -WANTLIB += crypto curl dbus-1 dbus-glib-1 expat ffi fontconfig freetype -WANTLIB += gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 -WANTLIB += gmodule-2.0 gmp gnutls gobject-2.0 gpg-error graphite2 -WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz hogweed iconv idn2 intl lzma -WANTLIB += m mpdclient nettle nghttp2 notify p11-kit pango-1.0 -WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png pthread -WANTLIB += soup-2.4 sqlite3 ssl tag tag_c tasn1 unique-1.0 -WANTLIB += unistring xcb xcb-render xcb-shm xml2 z -WANTLIB += ${COMPILER_LIBCXX} brotlicommon brotlidec execinfo -WANTLIB += fribidi jpeg psl Xau Xdmcp brotlienc zstd +WANTLIB += ${COMPILER_LIBCXX} X11 Xau Xcomposite Xcursor Xdamage +WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 +WANTLIB += atk-bridge-2.0 atspi avahi-client avahi-common avahi-glib +WANTLIB += c cairo cairo-gobject crypto curl dbus-1 dbus-glib-1 +WANTLIB += epoxy execinfo expat ffi fontconfig freetype fribidi +WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 +WANTLIB += graphite2 gthread-2.0 harfbuzz iconv intl jpeg lzma +WANTLIB += m mpdclient nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl +WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 +WANTLIB += png ssl tag tag_c xcb xcb-render xcb-shm xml2 z SITES = ${SITE_SOURCEFORGE:=ario-player/} @@ -36,13 +30,14 @@ MODULES = textproc/intltool BUILD_DEPENDS = devel/gettext,-tools LIB_DEPENDS = audio/libmpdclient \ audio/taglib \ - devel/libnotify \ - devel/libsoup \ - devel/libunique \ + devel/fribidi \ + devel/pango \ + graphics/cairo \ + graphics/graphite2 \ net/avahi,-glib \ net/curl \ - security/libgcrypt \ - security/libgpg-error + x11/dbus-glib \ + x11/gnome/at-spi2-core RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+4,-guic diff --git a/audio/ario/distinfo b/audio/ario/distinfo index 67623bb2281..a94296e7a49 100644 --- a/audio/ario/distinfo +++ b/audio/ario/distinfo @@ -1,2 +1,2 @@ -SHA256 (ario-1.5.1.tar.gz) = CDEoGrhjTrkkJLYSMO7gNYIvf5LYsFJtpzFsiYI5yR4= -SIZE (ario-1.5.1.tar.gz) = 1135444 +SHA256 (ario-1.6.tar.gz) = FELt6O75lDhEidctAo1/exocge/nN/cUdYfdAsdy0Jo= +SIZE (ario-1.6.tar.gz) = 1151747 diff --git a/audio/ario/patches/patch-src_ario-profiles_h b/audio/ario/patches/patch-src_ario-profiles_h deleted file mode 100644 index ff7d92a5502..00000000000 --- a/audio/ario/patches/patch-src_ario-profiles_h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ario-profiles.h.orig Fri May 3 13:44:48 2013 -+++ src/ario-profiles.h Fri May 3 13:45:26 2013 -@@ -20,7 +20,7 @@ - #ifndef __ARIO_PROFILES_H - #define __ARIO_PROFILES_H - --#include -+#include - #include "servers/ario-server.h" - - G_BEGIN_DECLS diff --git a/audio/ario/patches/patch-src_ario-util_h b/audio/ario/patches/patch-src_ario-util_h deleted file mode 100644 index 06850aa4604..00000000000 --- a/audio/ario/patches/patch-src_ario-util_h +++ /dev/null @@ -1,13 +0,0 @@ -XXX: Only needed on powerpc, seems not to affect amd64 or loongson. - ---- src/ario-util.h.orig Fri May 3 22:23:22 2013 -+++ src/ario-util.h Fri May 3 22:23:52 2013 -@@ -18,7 +18,7 @@ - */ - - #include "servers/ario-server.h" --#include "glib/gslist.h" -+#include "glib.h" - #include "gdk/gdkpixbuf.h" - - /* Number of covers used to generate the drag & drop image */ diff --git a/audio/ario/patches/patch-src_plugins_ario-plugin-info_c b/audio/ario/patches/patch-src_plugins_ario-plugin-info_c deleted file mode 100644 index b08f6e7a14b..00000000000 --- a/audio/ario/patches/patch-src_plugins_ario-plugin-info_c +++ /dev/null @@ -1,13 +0,0 @@ -XXX: Only needed on powerpc, seems not to affect amd64 or loongson. - ---- src/plugins/ario-plugin-info.c.orig Fri May 3 22:28:48 2013 -+++ src/plugins/ario-plugin-info.c Fri May 3 22:29:10 2013 -@@ -27,7 +27,7 @@ - - #include - #include --#include -+#include - - #include "plugins/ario-plugin-info-priv.h" - #include "ario-debug.h" diff --git a/audio/ario/pkg/DESCR b/audio/ario/pkg/DESCR index 3ba358ee7e8..8e9f581e889 100644 --- a/audio/ario/pkg/DESCR +++ b/audio/ario/pkg/DESCR @@ -1,2 +1,2 @@ -Ario is a GTK2 client for MPD. The interface used to browse the library +Ario is a GTK client for MPD. The interface used to browse the library is inspired by Rhythmbox but Ario aims to be much lighter and faster. diff --git a/audio/ario/pkg/PLIST b/audio/ario/pkg/PLIST index 6ccb6cde9af..f7eef50bc73 100644 --- a/audio/ario/pkg/PLIST +++ b/audio/ario/pkg/PLIST @@ -1,40 +1,29 @@ @bin bin/ario lib/ario/ lib/ario/plugins/ -lib/ario/plugins/audioscrobbler.ario-plugin lib/ario/plugins/filesystem.ario-plugin lib/ario/plugins/information.ario-plugin -lib/ario/plugins/libaudioscrobbler.a -lib/ario/plugins/libaudioscrobbler.la -@lib lib/ario/plugins/libaudioscrobbler.so.${LIBaudioscrobbler_VERSION} -lib/ario/plugins/libfilesystem.a +@static-lib lib/ario/plugins/libfilesystem.a lib/ario/plugins/libfilesystem.la @lib lib/ario/plugins/libfilesystem.so.${LIBfilesystem_VERSION} -lib/ario/plugins/libinformation.a +@static-lib lib/ario/plugins/libinformation.a lib/ario/plugins/libinformation.la @lib lib/ario/plugins/libinformation.so.${LIBinformation_VERSION} -lib/ario/plugins/liblibnotify.a -lib/ario/plugins/liblibnotify.la -@lib lib/ario/plugins/liblibnotify.so.${LIBlibnotify_VERSION} -lib/ario/plugins/libmmkeys.a +@static-lib lib/ario/plugins/libmmkeys.a lib/ario/plugins/libmmkeys.la @lib lib/ario/plugins/libmmkeys.so.${LIBmmkeys_VERSION} -lib/ario/plugins/libnotify.ario-plugin -lib/ario/plugins/libradios.a +@static-lib lib/ario/plugins/libradios.a lib/ario/plugins/libradios.la @lib lib/ario/plugins/libradios.so.${LIBradios_VERSION} -lib/ario/plugins/libwikipedia.a -lib/ario/plugins/libwikipedia.la -@lib lib/ario/plugins/libwikipedia.so.${LIBwikipedia_VERSION} lib/ario/plugins/mmkeys.ario-plugin lib/ario/plugins/radios.ario-plugin -lib/ario/plugins/wikipedia.ario-plugin share/applications/ario.desktop share/ario/ share/ario/art/ share/ario/art/ario-pause.png share/ario/art/ario-play.png share/ario/art/ario.png +share/ario/art/consume.png share/ario/art/logo.png share/ario/art/pl-below.png share/ario/art/pl-inside.png @@ -45,20 +34,19 @@ share/ario/art/shuffle.png share/ario/data/ share/ario/data/profiles.xml.default share/ario/plugins/ -share/ario/plugins/audioscrobbler-prefs.ui -share/ario/plugins/filesystem-ui.xml -share/ario/plugins/icons/ -share/ario/plugins/icons/audioscrobbler.png -share/ario/plugins/icons/wikipedia.png +share/ario/plugins/ario-filesystem-menu.ui +share/ario/plugins/ario-radios-menu.ui share/ario/plugins/information.ui -share/ario/plugins/radios-ui.xml share/ario/plugins/radios.xml.default -share/ario/plugins/wikipedia-ui.xml share/ario/ui/ -share/ario/ui/ario-ui.xml +share/ario/ui/ario-browser-menu.ui +share/ario/ui/ario-playlist-menu.ui +share/ario/ui/ario-shell-menu.ui +share/ario/ui/ario-songlist-menu.ui share/ario/ui/browser-prefs.ui share/ario/ui/connection-assistant.ui share/ario/ui/connection-autodetect.ui +share/ario/ui/connection-dialog.ui share/ario/ui/connection-prefs.ui share/ario/ui/connection-widget.ui share/ario/ui/cover-prefs.ui @@ -72,7 +60,6 @@ share/ario/ui/server-prefs.ui share/ario/ui/similar-artists.ui share/ario/ui/song-infos.ui share/ario/ui/stats-prefs.ui -share/ario/ui/trayicon-prefs.ui share/icons/hicolor/128x128/apps/ario.png share/icons/hicolor/16x16/apps/ario.png share/icons/hicolor/22x22/apps/ario.png