- Fix build with vala 0.36

- Add LICENSE and LICENSE_FILE
- Update WWW in pkg-descr

PR:		222037
Submitted by:	cpm@

7 files changed, 74 insertions, 2 deletions

diff --git a/audio/abraca/Makefile b/audio/abraca/Makefile
index 209e546ef2dd..a81fa1f757bd 100644
--- a/audio/abraca/Makefile
+++ b/audio/abraca/Makefile
@@ -3,13 +3,16 @@
 
 PORTNAME=	abraca
 PORTVERSION=	0.8.2
-PORTREVISION=	1
+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
diff --git a/audio/abraca/files/patch-src_abraca-filter-searchbox.vala b/audio/abraca/files/patch-src_abraca-filter-searchbox.vala
new file mode 100644
index 000000000000..e7f249cb0359
--- /dev/null
+++ b/audio/abraca/files/patch-src_abraca-filter-searchbox.vala
@@ -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));
diff --git a/audio/abraca/files/patch-src_abraca-medialib.vala b/audio/abraca/files/patch-src_abraca-medialib.vala
new file mode 100644
index 000000000000..eb72aa720c21
--- /dev/null
+++ b/audio/abraca/files/patch-src_abraca-medialib.vala
@@ -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));
diff --git a/audio/abraca/files/patch-src_abraca-playlist-model.vala b/audio/abraca/files/patch-src_abraca-playlist-model.vala
new file mode 100644
index 000000000000..e573bb784adb
--- /dev/null
+++ b/audio/abraca/files/patch-src_abraca-playlist-model.vala
@@ -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
+ 			}
+ 		}
+ 
diff --git a/audio/abraca/files/patch-src_abraca-resolver.vala b/audio/abraca/files/patch-src_abraca-resolver.vala
new file mode 100644
index 000000000000..96abbeaa9b62
--- /dev/null
+++ b/audio/abraca/files/patch-src_abraca-resolver.vala
@@ -0,0 +1,13 @@
+--- src/abraca-resolver.vala.orig	2014-10-26 18:55:55 UTC
++++ src/abraca-resolver.vala
+@@ -63,8 +63,8 @@ public class Abraca.MetadataResolver : GLib.Object {
+ 
+ 	private Gee.List<MetadataRequestorImpl> listeners = new Gee.ArrayList<MetadataRequestorImpl>();
+ 
+-	private Gee.List<int> pending = new Gee.ArrayList<uint>();
+-	private Gee.Map<int,Xmms.Collection> pending_mids = new Gee.HashMap<uint,Xmms.Collection>();
++	private Gee.List<int> pending = new Gee.ArrayList<int>();
++	private Gee.Map<int,Xmms.Collection> pending_mids = new Gee.HashMap<int,Xmms.Collection>();
+ 
+ 	private uint timeout_handle = 0;
+ 	private bool in_flight = false;
diff --git a/audio/abraca/files/patch-src_abraca-server-browser-dialog.vala b/audio/abraca/files/patch-src_abraca-server-browser-dialog.vala
new file mode 100644
index 000000000000..b835ca3c300f
--- /dev/null
+++ b/audio/abraca/files/patch-src_abraca-server-browser-dialog.vala
@@ -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));
diff --git a/audio/abraca/pkg-descr b/audio/abraca/pkg-descr
index 8424f2c85576..0ee8e2a8d756 100644
--- a/audio/abraca/pkg-descr
+++ b/audio/abraca/pkg-descr
@@ -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/