diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile index b23c71412062..5f4ab84abaf4 100644 --- a/audio/xfmpc/Makefile +++ b/audio/xfmpc/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xfmpc -PORTVERSION= 0.2.2 -PORTREVISION= 6 +PORTVERSION= 0.2.3 CATEGORIES= audio xfce MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 @@ -17,16 +16,10 @@ BUILD_DEPENDS= valac:lang/vala LIB_DEPENDS= libmpd.so:audio/libmpd INSTALLS_ICONS= yes -USES= tar:bzip2 gettext gmake xfce pkgconfig +USES= gettext gmake pkgconfig tar:bzip2 xfce GNU_CONFIGURE= yes USE_GNOME= gtk20 intltool intlhack USE_XFCE= libmenu - -post-extract: - ${CP} ${FILESDIR}/config.vapi ${WRKSRC}/src - -post-patch: - ${FIND} ${WRKSRC} -type f -name 'Makefile.in' | \ - ${XARGS} ${REINPLACE_CMD} 's|@VALAC@|${LOCALBASE}/bin/valac|' +INSTALL_TARGET= install-strip .include diff --git a/audio/xfmpc/distinfo b/audio/xfmpc/distinfo index 0055d9b0cd21..21082b951ff1 100644 --- a/audio/xfmpc/distinfo +++ b/audio/xfmpc/distinfo @@ -1,2 +1,3 @@ -SHA256 (xfce4/xfmpc-0.2.2.tar.bz2) = ed0cc2940bd5928bb30fab1531c22185a97bd0cc5beacd9e3be4d4cd994a6862 -SIZE (xfce4/xfmpc-0.2.2.tar.bz2) = 404906 +TIMESTAMP = 1467351883 +SHA256 (xfce4/xfmpc-0.2.3.tar.bz2) = 4189c0c82b66b758a6d5bc651493b675d3d46329e5f1a76ff26c448125f4fcb0 +SIZE (xfce4/xfmpc-0.2.3.tar.bz2) = 414680 diff --git a/audio/xfmpc/files/config.vapi b/audio/xfmpc/files/config.vapi deleted file mode 100644 index 0c27101252bd..000000000000 --- a/audio/xfmpc/files/config.vapi +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2009-2010 Mike Massonnet - * Copyright (c) 2009-2010 Vincent Legout - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -[CCode (cprefix="", lower_case_prefix="", cheader_filename="config.h")] -namespace Config { - [CCode (cname = "GETTEXT_PACKAGE")] - public const string GETTEXT_PACKAGE; - [CCode (cname = "PACKAGE_LOCALE_DIR")] - public const string PACKAGE_LOCALE_DIR; - [CCode (cname = "PACKAGE_VERSION")] - public const string PACKAGE_VERSION; - [CCode (cname = "PACKAGE_STRING")] - public const string PACKAGE_STRING; - [CCode (cname = "PACKAGE_NAME")] - public const string PACKAGE_NAME; -} diff --git a/audio/xfmpc/files/patch-src_extended-interface.vala b/audio/xfmpc/files/patch-src_extended-interface.vala deleted file mode 100644 index 50bc1585b064..000000000000 --- a/audio/xfmpc/files/patch-src_extended-interface.vala +++ /dev/null @@ -1,13 +0,0 @@ -Fix ambiguity between GLib.Menu and Gtk.Menu (bug #8922) - ---- src/extended-interface.vala.orig 2011-10-23 13:55:52 UTC -+++ src/extended-interface.vala -@@ -197,7 +197,7 @@ namespace Xfmpc { - this.context_menu.show_all (); - } - -- private void menu_detach (Widget attach_widget, Menu menu) { -+ private void menu_detach (Gtk.Widget attach_widget, Gtk.Menu menu) { - } - - /* diff --git a/audio/xfmpc/files/patch-src_main-window.vala b/audio/xfmpc/files/patch-src_main-window.vala deleted file mode 100644 index 852fd233daef..000000000000 --- a/audio/xfmpc/files/patch-src_main-window.vala +++ /dev/null @@ -1,16 +0,0 @@ -main-window.vala:135.4-135.10: error: `Timeout' is an ambiguous reference -between `GLib.Timeout' and `Gtk.Timeout' - Timeout.add (1000, refresh); - ^^^^^^^ - ---- src/main-window.vala.orig 2011-10-23 15:08:38 UTC -+++ src/main-window.vala -@@ -132,7 +132,7 @@ namespace Xfmpc { - this.preferences.notify["show-statusbar"].connect (cb_show_statusbar_changed); - - /* === Timeout === */ -- Timeout.add (1000, refresh); -+ GLib.Timeout.add (1000, refresh); - } - - private void show_hide_status_icon () { diff --git a/audio/xfmpc/files/patch-src_mpdclient.c b/audio/xfmpc/files/patch-src_mpdclient.c deleted file mode 100644 index 4e7d3b085b25..000000000000 --- a/audio/xfmpc/files/patch-src_mpdclient.c +++ /dev/null @@ -1,68 +0,0 @@ ---- src/mpdclient.c.orig 2011-02-01 18:13:51 UTC -+++ src/mpdclient.c -@@ -106,7 +106,7 @@ struct _XfmpcMpdclientPrivate - gboolean env_cached; - gboolean connecting; - guint connection_count; -- GMutex *mutex; -+ GMutex mutex; - }; - - -@@ -275,8 +275,7 @@ xfmpc_mpdclient_init (XfmpcMpdclient *mp - - priv->mi = mpd_new_default (); - -- if (!g_thread_supported ()) g_thread_init (NULL); -- priv->mutex = g_mutex_new (); -+ g_mutex_init (&priv->mutex); - - mpd_signal_connect_status_changed (priv->mi, (StatusChangedCallback)cb_status_changed, mpdclient); - } -@@ -288,7 +287,7 @@ xfmpc_mpdclient_finalize (GObject *objec - XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv; - - mpd_free (priv->mi); -- g_mutex_free (priv->mutex); -+ g_mutex_clear (&priv->mutex); - - (*G_OBJECT_CLASS (parent_class)->finalize) (object); - } -@@ -389,8 +388,6 @@ xfmpc_mpdclient_connect_thread (XfmpcMpd - - priv->connecting = FALSE; - -- g_mutex_unlock (priv->mutex); -- - return NULL; - } - -@@ -405,7 +402,7 @@ xfmpc_mpdclient_connect (XfmpcMpdclient - return TRUE; - - /* return FALSE if a we are already trying to connect to mpd */ -- if (!g_mutex_trylock (priv->mutex)) -+ if (!g_mutex_trylock (&priv->mutex)) - { - g_warning ("Already connecting to mpd"); - return FALSE; -@@ -413,8 +410,8 @@ xfmpc_mpdclient_connect (XfmpcMpdclient - - priv->connecting = TRUE; - -- thread = g_thread_create ((GThreadFunc) xfmpc_mpdclient_connect_thread, -- mpdclient, TRUE, NULL); -+ thread = g_thread_new ("0", (GThreadFunc) xfmpc_mpdclient_connect_thread, -+ mpdclient); - - while (priv->connecting) - { -@@ -427,6 +424,8 @@ xfmpc_mpdclient_connect (XfmpcMpdclient - - g_signal_emit (mpdclient, signals[SIG_CONNECTED], 0); - -+ g_mutex_unlock (&priv->mutex); -+ - return TRUE; - } - diff --git a/audio/xfmpc/files/patch-src_playlist.vala b/audio/xfmpc/files/patch-src_playlist.vala deleted file mode 100644 index 4faf7ff11414..000000000000 --- a/audio/xfmpc/files/patch-src_playlist.vala +++ /dev/null @@ -1,13 +0,0 @@ -Fix ambiguity between GLib.Menu and Gtk.Menu (bug #8922) - ---- src/playlist.vala.orig 2011-10-23 15:02:51 UTC -+++ src/playlist.vala -@@ -98,7 +98,7 @@ namespace Xfmpc { - new Gtk.Adjustment (0, 0, 0, 0, 0, 0)); - scrolled.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.ALWAYS); - -- this.menu = new Menu (); -+ this.menu = new Gtk.Menu (); - - var mi = new Gtk.ImageMenuItem.from_stock (Gtk.Stock.REMOVE, null); - this.menu.append (mi); diff --git a/audio/xfmpc/pkg-plist b/audio/xfmpc/pkg-plist index 7581b06e01f4..a099717e9d32 100644 --- a/audio/xfmpc/pkg-plist +++ b/audio/xfmpc/pkg-plist @@ -1,32 +1,45 @@ bin/xfmpc man/man1/xfmpc.1.gz share/applications/xfmpc.desktop +share/locale/am/LC_MESSAGES/xfmpc.mo share/locale/ar/LC_MESSAGES/xfmpc.mo share/locale/ast/LC_MESSAGES/xfmpc.mo +share/locale/bg/LC_MESSAGES/xfmpc.mo share/locale/ca/LC_MESSAGES/xfmpc.mo share/locale/cs/LC_MESSAGES/xfmpc.mo share/locale/da/LC_MESSAGES/xfmpc.mo share/locale/de/LC_MESSAGES/xfmpc.mo share/locale/el/LC_MESSAGES/xfmpc.mo +share/locale/en_AU/LC_MESSAGES/xfmpc.mo share/locale/en_GB/LC_MESSAGES/xfmpc.mo share/locale/es/LC_MESSAGES/xfmpc.mo share/locale/eu/LC_MESSAGES/xfmpc.mo share/locale/fi/LC_MESSAGES/xfmpc.mo share/locale/fr/LC_MESSAGES/xfmpc.mo share/locale/gl/LC_MESSAGES/xfmpc.mo +share/locale/he/LC_MESSAGES/xfmpc.mo share/locale/hr/LC_MESSAGES/xfmpc.mo share/locale/hu/LC_MESSAGES/xfmpc.mo share/locale/id/LC_MESSAGES/xfmpc.mo +share/locale/is/LC_MESSAGES/xfmpc.mo share/locale/it/LC_MESSAGES/xfmpc.mo share/locale/ja/LC_MESSAGES/xfmpc.mo +share/locale/ko/LC_MESSAGES/xfmpc.mo +share/locale/lt/LC_MESSAGES/xfmpc.mo +share/locale/ms/LC_MESSAGES/xfmpc.mo +share/locale/nb/LC_MESSAGES/xfmpc.mo share/locale/nl/LC_MESSAGES/xfmpc.mo +share/locale/oc/LC_MESSAGES/xfmpc.mo +share/locale/pl/LC_MESSAGES/xfmpc.mo share/locale/pt/LC_MESSAGES/xfmpc.mo share/locale/pt_BR/LC_MESSAGES/xfmpc.mo share/locale/ru/LC_MESSAGES/xfmpc.mo share/locale/si/LC_MESSAGES/xfmpc.mo share/locale/sk/LC_MESSAGES/xfmpc.mo share/locale/sl/LC_MESSAGES/xfmpc.mo +share/locale/sr/LC_MESSAGES/xfmpc.mo share/locale/sv/LC_MESSAGES/xfmpc.mo +share/locale/th/LC_MESSAGES/xfmpc.mo share/locale/tr/LC_MESSAGES/xfmpc.mo share/locale/ug/LC_MESSAGES/xfmpc.mo share/locale/uk/LC_MESSAGES/xfmpc.mo