Date: Sat, 9 Mar 2013 23:12:14 +0000 (UTC) From: Olivier Duchateau <olivierd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313776 - in head/multimedia/xfce4-parole: . files Message-ID: <201303092312.r29NCEPL048795@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivierd Date: Sat Mar 9 23:12:13 2013 New Revision: 313776 URL: http://svnweb.freebsd.org/changeset/ports/313776 Log: - Update to 0.5.0 - Remove unneeded patches - Drop support for GLib 2.28 Announce: http://mail.xfce.org/pipermail/xfce-announce/2013-March/000250.html Approved by: rene, miwi (mentors, implicit) Deleted: head/multimedia/xfce4-parole/files/patch-data__interfaces__playlist.ui head/multimedia/xfce4-parole/files/patch-src__misc__parole-file.c Modified: head/multimedia/xfce4-parole/Makefile head/multimedia/xfce4-parole/distinfo head/multimedia/xfce4-parole/files/patch-src__gst__parole-gst.c head/multimedia/xfce4-parole/pkg-plist Modified: head/multimedia/xfce4-parole/Makefile ============================================================================== --- head/multimedia/xfce4-parole/Makefile Sat Mar 9 23:06:17 2013 (r313775) +++ head/multimedia/xfce4-parole/Makefile Sat Mar 9 23:12:13 2013 (r313776) @@ -3,8 +3,7 @@ # PORTNAME= parole -PORTVERSION= 0.4.0 -PORTREVISION= 2 +PORTVERSION= 0.5.0 CATEGORIES= multimedia xfce MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}/ DIST_SUBDIR= xfce4 @@ -23,15 +22,15 @@ INSTALLS_ICONS= yes USE_BZIP2= yes USE_GSTREAMER= core faad flac wavpack USE_GMAKE= yes -CONFIGURE_ARGS= --disable-power-manager-plugin \ - --enable-maintainer-mode \ - --enable-libnotify \ +CONFIGURE_ARGS= --enable-notify-plugin \ + --enable-tray-plugin \ --enable-taglib \ + --with-gstreamer=0.10 \ --without-html-dir CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_GNOME= gnomehack gtk20 glib20 intltool intlhack desktopfileutils -USE_XFCE= configenv libmenu libutil xfdev +USE_XFCE= configenv libmenu libutil USE_XORG= x11 sm USE_LDCONFIG= yes USE_PKGCONFIG= build @@ -61,13 +60,9 @@ PLIST_SUB+= NLS="@comment " .endif post-patch: -# Downgrade Glib version - @${REINPLACE_CMD} -e 's|2\.32|2\.28|g' ${WRKSRC}/configure # Fix .rc files path @${REINPLACE_CMD} -e 's|xfce4/src/misc|${PORTNAME}|g' \ - ${WRKSRC}/src/common/parole-rc-utils.h \ - ${WRKSRC}/src/plugins/notify/notify-provider.c \ - ${WRKSRC}/src/plugins/tray/tray-provider.c + ${WRKSRC}/src/common/parole-rc-utils.h post-install: @-update-desktop-database Modified: head/multimedia/xfce4-parole/distinfo ============================================================================== --- head/multimedia/xfce4-parole/distinfo Sat Mar 9 23:06:17 2013 (r313775) +++ head/multimedia/xfce4-parole/distinfo Sat Mar 9 23:12:13 2013 (r313776) @@ -1,2 +1,2 @@ -SHA256 (xfce4/parole-0.4.0.tar.bz2) = 79463fa3652bdeee20ed763afe551affb5c888d40d483fe3b23e1419554574aa -SIZE (xfce4/parole-0.4.0.tar.bz2) = 653805 +SHA256 (xfce4/parole-0.5.0.tar.bz2) = ba23f06f59720f35af07d50bc43de444dd726df592129137b5550d951bd4a285 +SIZE (xfce4/parole-0.5.0.tar.bz2) = 645848 Modified: head/multimedia/xfce4-parole/files/patch-src__gst__parole-gst.c ============================================================================== --- head/multimedia/xfce4-parole/files/patch-src__gst__parole-gst.c Sat Mar 9 23:06:17 2013 (r313775) +++ head/multimedia/xfce4-parole/files/patch-src__gst__parole-gst.c Sat Mar 9 23:12:13 2013 (r313776) @@ -1,34 +1,6 @@ ---- ./src/gst/parole-gst.c.orig 2013-01-07 10:15:53.000000000 +0000 -+++ ./src/gst/parole-gst.c 2013-01-15 22:53:07.000000000 +0000 -@@ -97,8 +97,12 @@ - GstElement *video_sink; - - GstBus *bus; -- -+ -+#if GLIB_CHECK_VERSION (2, 32, 0) - GMutex lock; -+#else -+ GMutex *lock; -+#endif - GstState state; - GstState target; - ParoleState media_state; -@@ -184,8 +188,12 @@ - - if ( gst->priv->device ) - g_free (gst->priv->device); -- -+ -+#if GLIB_CHECK_VERSION (2, 32, 0) - g_mutex_clear (&gst->priv->lock); -+#else -+ g_mutex_free (gst->priv->lock); -+#endif - - G_OBJECT_CLASS (parole_gst_parent_class)->finalize (object); - } -@@ -1435,22 +1443,36 @@ +--- ./src/gst/parole-gst.c.orig 2013-03-07 00:14:28.000000000 +0000 ++++ ./src/gst/parole-gst.c 2013-03-09 22:44:40.000000000 +0000 +@@ -1573,22 +1573,36 @@ dialog = GTK_MESSAGE_DIALOG(gtk_message_dialog_new_with_markup( NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, @@ -41,9 +13,8 @@ "<b><big>%s</big></b>", _("Additional software is required.") )); -- -+ -+#if defined(__linux__) + ++#if defined(__linux__) gtk_dialog_add_buttons( GTK_DIALOG(dialog), _("Don't Install"), GTK_RESPONSE_REJECT, @@ -66,135 +37,12 @@ desc); return GTK_DIALOG(dialog); -@@ -1561,7 +1583,7 @@ - +@@ -1712,7 +1726,7 @@ + #endif gst_install_plugins_context_free(ctx); } - else if ( response == GTK_RESPONSE_REJECT ) -+ else if ( (response == GTK_RESPONSE_REJECT) || (response == GTK_RESPONSE_OK) ) ++ else if ( ( response == GTK_RESPONSE_REJECT ) || (response == GTK_RESPONSE_OK) ) gtk_widget_destroy(GTK_WIDGET(dialog)); } break; -@@ -1876,11 +1898,19 @@ - g_object_get (G_OBJECT (gst->priv->stream), - "has-video", &playing_video, - NULL); -- -+ -+#if GLIB_CHECK_VERSION (2, 32, 0) - g_mutex_lock (&gst->priv->lock); -+#else -+ g_mutex_lock (gst->priv->lock); -+#endif - gst->priv->target = GST_STATE_NULL; - parole_stream_init_properties (gst->priv->stream); -+#if GLIB_CHECK_VERSION (2, 32, 0) - g_mutex_unlock (&gst->priv->lock); -+#else -+ g_mutex_unlock (gst->priv->lock); -+#endif - - parole_window_busy_cursor (GTK_WIDGET (gst)->window); - -@@ -2226,7 +2256,11 @@ - gst->priv->target = GST_STATE_VOID_PENDING; - gst->priv->media_state = PAROLE_STATE_STOPPED; - gst->priv->aspect_ratio = PAROLE_ASPECT_RATIO_NONE; -+#if GLIB_CHECK_VERSION (2, 32, 0) - g_mutex_init (&gst->priv->lock); -+#else -+ gst->priv->lock = g_mutex_new (); -+#endif - gst->priv->stream = parole_stream_new (); - gst->priv->tick_id = 0; - gst->priv->hidecursor_timer = g_timer_new (); -@@ -2330,7 +2364,11 @@ - - void parole_gst_play_uri (ParoleGst *gst, const gchar *uri, const gchar *subtitles) - { -+#if GLIB_CHECK_VERSION (2, 32, 0) - g_mutex_lock (&gst->priv->lock); -+#else -+ g_mutex_lock (gst->priv->lock); -+#endif - - gst->priv->target = GST_STATE_PLAYING; - parole_stream_init_properties (gst->priv->stream); -@@ -2339,8 +2377,12 @@ - "uri", uri, - "subtitles", subtitles, - NULL); -- -+ -+#if GLIB_CHECK_VERSION (2, 32, 0) - g_mutex_unlock (&gst->priv->lock); -+#else -+ g_mutex_unlock (gst->priv->lock); -+#endif - - if ( gst->priv->state_change_id == 0 ) - gst->priv->state_change_id = g_timeout_add_seconds (20, -@@ -2381,11 +2423,19 @@ - - void parole_gst_pause (ParoleGst *gst) - { -+#if GLIB_CHECK_VERSION (2, 32, 0) - g_mutex_lock (&gst->priv->lock); -+#else -+ g_mutex_lock (gst->priv->lock); -+#endif - - gst->priv->target = GST_STATE_PAUSED; -- -+ -+#if GLIB_CHECK_VERSION (2, 32, 0) - g_mutex_unlock (&gst->priv->lock); -+#else -+ g_mutex_unlock (gst->priv->lock); -+#endif - - parole_window_busy_cursor (GTK_WIDGET (gst)->window); - parole_gst_change_state (gst, GST_STATE_PAUSED); -@@ -2393,11 +2443,19 @@ - - void parole_gst_resume (ParoleGst *gst) - { -+#if GLIB_CHECK_VERSION (2, 32, 0) - g_mutex_lock (&gst->priv->lock); -+#else -+ g_mutex_lock (gst->priv->lock); -+#endif - - gst->priv->target = GST_STATE_PLAYING; -- -+ -+#if GLIB_CHECK_VERSION (2, 32, 0) - g_mutex_unlock (&gst->priv->lock); -+#else -+ g_mutex_unlock (gst->priv->lock); -+#endif - - parole_window_busy_cursor (GTK_WIDGET (gst)->window); - parole_gst_change_state (gst, GST_STATE_PLAYING); -@@ -2417,12 +2475,20 @@ - - void parole_gst_stop (ParoleGst *gst) - { -+#if GLIB_CHECK_VERSION (2, 32, 0) - g_mutex_lock (&gst->priv->lock); -+#else -+ g_mutex_lock (gst->priv->lock); -+#endif - - parole_stream_init_properties (gst->priv->stream); - gst->priv->target = GST_STATE_NULL; -- -+ -+#if GLIB_CHECK_VERSION (2, 32, 0) - g_mutex_unlock (&gst->priv->lock); -+#else -+ g_mutex_unlock (gst->priv->lock); -+#endif - - parole_window_busy_cursor (GTK_WIDGET (gst)->window); - Modified: head/multimedia/xfce4-parole/pkg-plist ============================================================================== --- head/multimedia/xfce4-parole/pkg-plist Sat Mar 9 23:06:17 2013 (r313775) +++ head/multimedia/xfce4-parole/pkg-plist Sat Mar 9 23:12:13 2013 (r313776) @@ -12,15 +12,16 @@ lib/parole-0/parole-notify.so lib/parole-0/tray-icon.la lib/parole-0/tray-icon.so share/applications/parole.desktop -share/icons/hicolor/16x16/apps/extension.png +share/icons/hicolor/16x16/apps/parole-extension.png share/icons/hicolor/16x16/apps/parole.png share/icons/hicolor/24x24/apps/parole.png share/icons/hicolor/32x32/apps/parole.png -share/icons/hicolor/48x48/apps/extension.png +share/icons/hicolor/48x48/apps/parole-extension.png share/icons/hicolor/48x48/apps/parole.png share/icons/hicolor/scalable/apps/parole.svg %%NLS%%share/locale/ar/LC_MESSAGES/parole.mo %%NLS%%share/locale/ast/LC_MESSAGES/parole.mo +%%NLS%%share/locale/bg/LC_MESSAGES/parole.mo %%NLS%%share/locale/ca/LC_MESSAGES/parole.mo %%NLS%%share/locale/cs/LC_MESSAGES/parole.mo %%NLS%%share/locale/da/LC_MESSAGES/parole.mo @@ -56,12 +57,17 @@ share/icons/hicolor/scalable/apps/parole %%NLS%%share/locale/ug/LC_MESSAGES/parole.mo %%NLS%%share/locale/uk/LC_MESSAGES/parole.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/parole.mo +%%NLS%%share/locale/zh_HK/LC_MESSAGES/parole.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/parole.mo +%%DATADIR%%/gtk-2.0/parole.gtkrc %%DATADIR%%/parole-plugins-0/notify.desktop %%DATADIR%%/parole-plugins-0/system-tray.desktop share/pixmaps/parole.png @dirrm %%DATADIR%%/parole-plugins-0 +@dirrm %%DATADIR%%/gtk-2.0 @dirrm %%DATADIR%% +%%NLS%%@dirrmtry share/locale/zh_HK/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/zh_HK %%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ug %%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303092312.r29NCEPL048795>