Maintainer update to 0.3.0.

Disabling BMP for now, because building it causes pkg-plist failures
(directories and files are renamed from gxmms prefix to gxmms-bmp or
gxmms_bmp). This was discussed with the submitter on IRC, he will send a
new PR to fix BMP.

Adding files/patch-src__bmpctrl.c that fixes a compilation issue
(non-constant initializer) on NLS-enabled systems. Please forward this
to the upstream gxmms maintainers.

PR:		ports/173751
Submitted by:	Chris Petrik (maintainer)
This commit is contained in:
Matthias Andree 2013-03-09 17:22:31 +00:00
parent 0d3f23366a
commit c937071995
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=313733
7 changed files with 62 additions and 33 deletions

View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gxmms
PORTVERSION= 0.2.1
PORTREVISION= 14
PORTVERSION= 0.3.0
CATEGORIES= multimedia gnome
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -11,9 +10,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= c.petrik.sosa@gmail.com
COMMENT= Simple GNOME panel applet for controlling XMMS
BUILD_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USE_GMAKE= yes
USE_GNOME= gnomehack gnomepanel gnomeprefix intlhack libgnomeui
USE_GETTEXT= yes
@ -22,4 +18,29 @@ CONFIGURE_ENV= LIBS="`pkg-config --libs libgnomeui-2.0`"
CPPFLAGS+= -I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS_SINGLE= FRONTEND
OPTIONS_SINGLE_FRONTEND= XMMS # BMP
OPTIONS_DEFAULT= XMMS
XMMS_DESC= Use xmms as frontend
BMP_DESC= Use BMP as frontend
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MXMMS}
CONFIGURE_ARGS+= --with-xmms
BUILD_DEPENDS+= xmms:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS+= xmms:${PORTSDIR}/multimedia/xmms
.else
CONFIGURE_ARGS+=--disable-xmms
.endif
.if ${PORT_OPTIONS:MBMP}
CONFIGURE_ARGS+=--with-bmp
BUILD_DEPENDS+= beep-media-player:${PORTSDIR}/multimedia/beep-media-player
RUN_DEPENDS+= beep-media-player:${PORTSDIR}/multimedia/beep-media-player
.else
CONFIGURE_ARGS+=--disable-bmp
.endif
.include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
SHA256 (gxmms-0.2.1.tar.gz) = bf3cc3bd5b42935db7589434a4777bc6125de3f49f8885bb086e9ebd9e85fb26
SIZE (gxmms-0.2.1.tar.gz) = 129794
SHA256 (gxmms-0.3.0.tar.gz) = a6515796cca60cc01e52af7acf42875e6dda0132737abe2d5525f1f6d9dc2606
SIZE (gxmms-0.3.0.tar.gz) = 148662

View file

@ -1,22 +0,0 @@
--- src/xmmsctrl.c.orig 2004-09-03 00:19:54.000000000 +0200
+++ src/xmmsctrl.c 2008-04-24 15:36:57.000000000 +0200
@@ -45,16 +45,17 @@
xmms_start(XMMSData *xmms)
{
static gchar *exec_cmd = "xmms";
- static gchar *msg_error = _("Sorry, unable to launch XMMS.");
+ gchar *msg_error = _("Sorry, unable to launch XMMS.");
gint timer;
time_t lt;
+ gchar *exec_this;
if (xmms_remote_is_running(xmms->session))
{
return;
}
- gchar *exec_this = g_strdup_printf("%s &", exec_cmd);
+ exec_this = g_strdup_printf("%s &", exec_cmd);
if (system(exec_this))
{

View file

@ -0,0 +1,11 @@
--- ./src/bmpctrl.c.orig 2004-12-30 01:24:11.000000000 +0100
+++ ./src/bmpctrl.c 2013-03-09 11:13:54.000000000 +0100
@@ -44,7 +44,7 @@
void
player_start(XMMSData *xmms)
{
- static gchar *msg_error = _("Unable to launch Beep Media Player.");
+ gchar *msg_error = _("Unable to launch Beep Media Player.");
static gchar *exec_cmd = "beep-media-player &";
gint timer;
time_t lt;

View file

@ -1,6 +1,6 @@
--- src/interface.c.orig 2008-04-24 15:30:43.000000000 +0200
+++ src/interface.c 2008-04-24 15:31:31.000000000 +0200
@@ -224,7 +224,7 @@
--- ./src/interface.c.orig 2005-01-05 01:22:54.000000000 +0100
+++ ./src/interface.c 2013-03-09 11:13:27.000000000 +0100
@@ -227,7 +227,7 @@
gdouble width;
GtkWidget *progress;
BonoboUIComponent *popup;
@ -8,4 +8,4 @@
+ gchar info[256] = "No track";
progress = xmms->track_control.progress;
if (!xmms_remote_is_running(xmms->session))
if (!player_is_running(xmms))

View file

@ -0,0 +1,17 @@
--- ./src/xmmsctrl.c.orig 2005-01-05 01:22:54.000000000 +0100
+++ ./src/xmmsctrl.c 2013-03-09 11:13:27.000000000 +0100
@@ -44,11 +44,11 @@
void
player_start(XMMSData *xmms)
{
- static gchar *msg_error = _("Unable to launch XMMS.");
- static gchar *exec_cmd = "xmms &";
+ gchar *msg_error = _("Unable to launch XMMS.");
+ gchar *exec_cmd = "xmms &";
gint timer;
time_t lt;
-
+
if (player_is_running(xmms))
{
return;

View file

@ -7,7 +7,9 @@ share/gxmms/gxmms_next.png
share/gxmms/gxmms_play_pause.png
share/gxmms/gxmms_prev.png
share/gxmms/gxmms_stop.png
share/gxmms/gxmms_mini.png
share/pixmaps/gxmms_mini.png
share/pixmaps/gxmms.png
share/locale/ca/LC_MESSAGES/gxmms.mo
share/locale/es/LC_MESSAGES/gxmms.mo
share/locale/fr/LC_MESSAGES/gxmms.mo