Attachment #186075 for bug #222037





PORTNAME=	abraca
PORTVERSION=	0.8.2
PORTREVISION=	2
CATEGORIES=	audio
MASTER_SITES=	SF/${PORTNAME}


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




--- 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));




--- 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));




--- 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
 			}
 		}
 




--- 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;




--- 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));

Lines 1-4 Link Here

(-)audio/abraca/pkg-descr (-1 / +1 lines)
1	Abraca is a GTK2 client for the XMMS2 music player. It is designed with	1	Abraca is a GTK2 client for the XMMS2 music player. It is designed with
2	collections in mind, which makes managing your music a breeze.	2	collections in mind, which makes managing your music a breeze.
3		3
4	WWW: http://abraca.github.com/Abraca	4	WWW: http://abraca.github.io/Abraca/

Return to bug 222037

Lines 3-9 Link Here

(-)audio/abraca/Makefile (-1 / +4 lines)
3		3
4	PORTNAME= abraca	4	PORTNAME= abraca
5	PORTVERSION= 0.8.2	5	PORTVERSION= 0.8.2
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= audio	7	CATEGORIES= audio
8	MASTER_SITES= SF/${PORTNAME}	8	MASTER_SITES= SF/${PORTNAME}
9		9
Lines 10-15 Link Here
10	MAINTAINER= madpilot@FreeBSD.org	10	MAINTAINER= madpilot@FreeBSD.org
11	COMMENT= GTK2 client for the XMMS2 music player	11	COMMENT= GTK2 client for the XMMS2 music player
12		12
		13	LICENSE= GPLv2
		14	LICENSE_FILE= ${WRKSRC}/COPYING.GPL
		15
13	BUILD_DEPENDS= ${LOCALBASE}/bin/valac:lang/vala	16	BUILD_DEPENDS= ${LOCALBASE}/bin/valac:lang/vala
14	LIB_DEPENDS= libxmmsclient.so:audio/xmms2 \	17	LIB_DEPENDS= libxmmsclient.so:audio/xmms2 \
15	libgee-0.8.so:devel/libgee	18	libgee-0.8.so:devel/libgee

Line 0 Link Here

(-)audio/abraca/files/patch-src_abraca-filter-searchbox.vala (+14 lines)
	1	--- src/abraca-filter-searchbox.vala.orig 2014-10-26 18:55:55 UTC
	2	+++ src/abraca-filter-searchbox.vala
	3	@@ -78,7 +78,11 @@ public class Abraca.FilterSearchBox : Gtk.ComboBox, Se
	4	do {
	5	store.get(iter, 0, out current);
	6	if (current == pattern) {
	7	+#if VALA_0_36
	8	+ store.remove(ref iter);
	9	+#else
	10	store.remove(iter);
	11	+#endif
	12	break;
	13	}
	14	} while (store.iter_next(ref iter));

Line 0 Link Here

(-)audio/abraca/files/patch-src_abraca-medialib.vala (+14 lines)
	1	--- src/abraca-medialib.vala.orig 2014-10-26 18:55:55 UTC
	2	+++ src/abraca-medialib.vala
	3	@@ -505,7 +505,11 @@ namespace Abraca {
	4	do {
	5	urls.get(iter, 0, out current);
	6	if (current == url) {
	7	+#if VALA_0_36
	8	+ urls.remove(ref iter);
	9	+#else
	10	urls.remove(iter);
	11	+#endif
	12	break;
	13	}
	14	} while (urls.iter_next(ref iter));

Line 0 Link Here

(-)audio/abraca/files/patch-src_abraca-playlist-model.vala (+14 lines)
	1	--- src/abraca-playlist-model.vala.orig 2014-10-26 18:55:55 UTC
	2	+++ src/abraca-playlist-model.vala
	3	@@ -136,7 +136,11 @@ namespace Abraca {
	4	get(iter, Column.ID, out mid);
	5
	6	playlist_map.remove_path((int) mid, path);
	7	+#if VALA_0_36
	8	+ remove(ref iter);
	9	+#else
	10	remove(iter);
	11	+#endif
	12	}
	13	}
	14

Line 0 Link Here

(-)audio/abraca/files/patch-src_abraca-resolver.vala (+16 lines)
	1	--- src/abraca-resolver.vala.orig 2014-10-26 18:55:55 UTC
	2	+++ src/abraca-resolver.vala
	3	@@ -63,8 +63,13 @@ public class Abraca.MetadataResolver : GLib.Object {
	4
	5	private Gee.List<MetadataRequestorImpl> listeners = new Gee.ArrayList<MetadataRequestorImpl>();
	6
	7	+#if VALA_0_36
	8	+ private Gee.List<int> pending = new Gee.ArrayList<int>();
	9	+ private Gee.Map<int,Xmms.Collection> pending_mids = new Gee.HashMap<int,Xmms.Collection>();
	10	+#else
	11	private Gee.List<int> pending = new Gee.ArrayList<uint>();
	12	private Gee.Map<int,Xmms.Collection> pending_mids = new Gee.HashMap<uint,Xmms.Collection>();
	13	+#endif
	14
	15	private uint timeout_handle = 0;
	16	private bool in_flight = false;

Line 0 Link Here

(-)audio/abraca/files/patch-src_abraca-server-browser-dialog.vala (+14 lines)
	1	--- src/abraca-server-browser-dialog.vala.orig 2014-10-26 18:55:55 UTC
	2	+++ src/abraca-server-browser-dialog.vala
	3	@@ -145,7 +145,11 @@ public class Abraca.ServerBrowserDialog : Gtk.Dialog
	4	unowned string entry_name, entry_path;
	5	location_store.get(iter, Column.NAME, out entry_name, Column.PATH, out entry_path);
	6	if (path == entry_path) {
	7	+#if VALA_0_36
	8	+ location_store.remove(ref iter);
	9	+#else
	10	location_store.remove(iter);
	11	+#endif
	12	break;
	13	}
	14	} while (location_store.iter_next(ref iter));