Attachment 186075 Details for Bug 222037 – patch

[patch] patch

abraca.diff (text/plain), 6.53 KB, created by Carlos J. Puga Medina on 2017-09-05 11:37:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J. Puga Medina

Created: 2017-09-05 11:37:41 UTC

Size: 6.53 KB

patch

obsolete

>Index: audio/abraca/Makefile
>===================================================================
>--- audio/abraca/Makefile	(revision 449193)
>+++ audio/abraca/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	abraca
> PORTVERSION=	0.8.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	audio
> MASTER_SITES=	SF/${PORTNAME}
> 
>@@ -10,6 +10,9 @@
> MAINTAINER=	madpilot@FreeBSD.org
> COMMENT=	GTK2 client for the XMMS2 music player
> 
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING.GPL
>+
> BUILD_DEPENDS=	${LOCALBASE}/bin/valac:lang/vala
> LIB_DEPENDS=	libxmmsclient.so:audio/xmms2 \
> 		libgee-0.8.so:devel/libgee
>Index: audio/abraca/files/patch-src_abraca-filter-searchbox.vala
>===================================================================
>--- audio/abraca/files/patch-src_abraca-filter-searchbox.vala	(nonexistent)
>+++ audio/abraca/files/patch-src_abraca-filter-searchbox.vala	(working copy)
>@@ -0,0 +1,14 @@
>+--- src/abraca-filter-searchbox.vala.orig	2014-10-26 18:55:55 UTC
>++++ src/abraca-filter-searchbox.vala
>+@@ -78,7 +78,11 @@ public class Abraca.FilterSearchBox : Gtk.ComboBox, Se
>+ 			do {
>+ 				store.get(iter, 0, out current);
>+ 				if (current == pattern) {
>++#if VALA_0_36
>++					store.remove(ref iter);
>++#else
>+ 					store.remove(iter);
>++#endif
>+ 					break;
>+ 				}
>+ 			} while (store.iter_next(ref iter));
>
>Property changes on: audio/abraca/files/patch-src_abraca-filter-searchbox.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/abraca/files/patch-src_abraca-medialib.vala
>===================================================================
>--- audio/abraca/files/patch-src_abraca-medialib.vala	(nonexistent)
>+++ audio/abraca/files/patch-src_abraca-medialib.vala	(working copy)
>@@ -0,0 +1,14 @@
>+--- src/abraca-medialib.vala.orig	2014-10-26 18:55:55 UTC
>++++ src/abraca-medialib.vala
>+@@ -505,7 +505,11 @@ namespace Abraca {
>+ 				do {
>+ 					urls.get(iter, 0, out current);
>+ 					if (current == url) {
>++#if VALA_0_36
>++						urls.remove(ref iter);
>++#else
>+ 						urls.remove(iter);
>++#endif
>+ 						break;
>+ 					}
>+ 				} while (urls.iter_next(ref iter));
>
>Property changes on: audio/abraca/files/patch-src_abraca-medialib.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/abraca/files/patch-src_abraca-playlist-model.vala
>===================================================================
>--- audio/abraca/files/patch-src_abraca-playlist-model.vala	(nonexistent)
>+++ audio/abraca/files/patch-src_abraca-playlist-model.vala	(working copy)
>@@ -0,0 +1,14 @@
>+--- src/abraca-playlist-model.vala.orig	2014-10-26 18:55:55 UTC
>++++ src/abraca-playlist-model.vala
>+@@ -136,7 +136,11 @@ namespace Abraca {
>+ 				get(iter, Column.ID, out mid);
>+ 
>+ 				playlist_map.remove_path((int) mid, path);
>++#if VALA_0_36
>++				remove(ref iter);
>++#else
>+ 				remove(iter);
>++#endif
>+ 			}
>+ 		}
>+ 
>
>Property changes on: audio/abraca/files/patch-src_abraca-playlist-model.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/abraca/files/patch-src_abraca-resolver.vala
>===================================================================
>--- audio/abraca/files/patch-src_abraca-resolver.vala	(nonexistent)
>+++ audio/abraca/files/patch-src_abraca-resolver.vala	(working copy)
>@@ -0,0 +1,16 @@
>+--- src/abraca-resolver.vala.orig	2014-10-26 18:55:55 UTC
>++++ src/abraca-resolver.vala
>+@@ -63,8 +63,13 @@ public class Abraca.MetadataResolver : GLib.Object {
>+ 
>+ 	private Gee.List<MetadataRequestorImpl> listeners = new Gee.ArrayList<MetadataRequestorImpl>();
>+ 
>++#if VALA_0_36
>++	private Gee.List<int> pending = new Gee.ArrayList<int>();
>++	private Gee.Map<int,Xmms.Collection> pending_mids = new Gee.HashMap<int,Xmms.Collection>();
>++#else
>+ 	private Gee.List<int> pending = new Gee.ArrayList<uint>();
>+ 	private Gee.Map<int,Xmms.Collection> pending_mids = new Gee.HashMap<uint,Xmms.Collection>();
>++#endif
>+ 
>+ 	private uint timeout_handle = 0;
>+ 	private bool in_flight = false;
>
>Property changes on: audio/abraca/files/patch-src_abraca-resolver.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/abraca/files/patch-src_abraca-server-browser-dialog.vala
>===================================================================
>--- audio/abraca/files/patch-src_abraca-server-browser-dialog.vala	(nonexistent)
>+++ audio/abraca/files/patch-src_abraca-server-browser-dialog.vala	(working copy)
>@@ -0,0 +1,14 @@
>+--- src/abraca-server-browser-dialog.vala.orig	2014-10-26 18:55:55 UTC
>++++ src/abraca-server-browser-dialog.vala
>+@@ -145,7 +145,11 @@ public class Abraca.ServerBrowserDialog : Gtk.Dialog
>+ 			unowned string entry_name, entry_path;
>+ 			location_store.get(iter, Column.NAME, out entry_name, Column.PATH, out entry_path);
>+ 			if (path == entry_path) {
>++#if VALA_0_36
>++				location_store.remove(ref iter);
>++#else
>+ 				location_store.remove(iter);
>++#endif
>+ 				break;
>+ 			}
>+ 		} while (location_store.iter_next(ref iter));
>
>Property changes on: audio/abraca/files/patch-src_abraca-server-browser-dialog.vala
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/abraca/pkg-descr
>===================================================================
>--- audio/abraca/pkg-descr	(revision 449193)
>+++ audio/abraca/pkg-descr	(working copy)
>@@ -1,4 +1,4 @@
> Abraca is a GTK2 client for the XMMS2 music player. It is designed with
> collections in mind, which makes managing your music a breeze.
> 
>-WWW: http://abraca.github.com/Abraca
>+WWW: http://abraca.github.io/Abraca/

Flags:

cpm: maintainer-approval? (madpilot)

Actions: View | Diff

Attachments on bug 222037: 186044 | 186075