- Update to 0.5.5

- Use GitHub as master site
- Use a more complete set of icons (Faenza)

BuildLog:	http://goo.gl/InAuJ
ReleaseNotes:	http://goo.gl/RSV53

6 files changed, 73 insertions, 13 deletions

diff --git a/x11/gnome-pie/Makefile b/x11/gnome-pie/Makefile
index c93af92a348f..81590b514254 100644
--- a/x11/gnome-pie/Makefile
+++ b/x11/gnome-pie/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-pie
-PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTVERSION=	0.5.5
+PORTREVISION=	0
 CATEGORIES=	x11
-# Waiting for a tag on the GitHub repository https://github.com/Simmesimme/Gnome-Pie...
-MASTER_SITES=	LOCAL/nivit/${PORTNAME}/
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Circular application launcher
@@ -14,14 +12,20 @@ COMMENT=	Circular application launcher
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
-RUN_DEPENDS=	gnome-icons-elementary>=2.5:${PORTSDIR}/x11-themes/gnome-icons-elementary \
+RUN_DEPENDS=	gnome-icons-faenza>=1.3:${PORTSDIR}/x11-themes/gnome-icons-faenza \
 		gnome-settings-daemon>=2.32.1_4:${PORTSDIR}/sysutils/gnome-settings-daemon
 LIB_DEPENDS=	Xtst:${PORTSDIR}/x11/libXtst \
 		cairo:${PORTSDIR}/graphics/cairo \
 		gee:${PORTSDIR}/devel/libgee06 \
 		unique:${PORTSDIR}/x11-toolkits/unique
 
+GH_ACCOUNT=	Simmesimme
+GH_PROJECT=	Gnome-Pie
+GH_COMMIT=	5ea8b11
+GH_TAGNAME=	v${PORTVERSION}
+
 INSTALLS_ICONS=	yes
+
 OPTIONS_DEFINE=	DOCS MANPAGES NLS
 OPTIONS_DEFAULT=	MANPAGES
 
@@ -51,24 +55,27 @@ PLIST_SUB+=	DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,}
 REINPLACE_ARGS=	-e 's,%%DATADIR%%,${DATADIR},1' \
 		-e 's,%%DESKTOPDIR%%,${DESKTOPDIR},1' \
 		-e 's,%%PREFIX%%,${PREFIX},1' \
-		-i.bak
+		-e '/has_resize_grip/d' -i ''
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PORTSDIR=${PORTSDIR}
 
-USE_BZIP2=	yes
 USE_CMAKE=	yes
+USE_GITHUB=	yes
 USE_GNOME=	gconf2 gnomemenus gtk20 libwnck
 USE_PKGCONFIG=	build
 
 post-patch:
-	${REINPLACE_CMD} ${WRKSRC}/src/actions/actionRegistry.vala ${WRKSRC}/src/utilities/paths.vala
+	${REINPLACE_CMD} ${WRKSRC}/src/actions/actionRegistry.vala \
+			${WRKSRC}/src/gui/indicator.vala \
+			${WRKSRC}/src/utilities/paths.vala \
+			${WRKSRC}/resources/ui/*.ui
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 gnome-pie-user:
-	gconftool-2 --type string --set /desktop/gnome/interface/icon_theme "elementary"
+	gconftool-2 --type string --set /desktop/gnome/interface/icon_theme "Faenza"
 	gconftool-2 --type bool --set /desktop/gnome/interface/menus_have_icons true
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-pie/distinfo b/x11/gnome-pie/distinfo
index 819bd91b4e3d..99459ac676f9 100644
--- a/x11/gnome-pie/distinfo
+++ b/x11/gnome-pie/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome-pie-0.5.2.tar.bz2) = 12fd55ea199f4a22bcfe76989e6e44650dd1f169b7b3592b1cfff3fe01e95d8d
-SIZE (gnome-pie-0.5.2.tar.bz2) = 185397
+SHA256 (gnome-pie-0.5.5.tar.gz) = 7b98d9055943b389818ad529faa81758736907b99aa7280c74b44424ac9c8639
+SIZE (gnome-pie-0.5.5.tar.gz) = 224767
diff --git a/x11/gnome-pie/files/patch-src__gui__indicator.vala b/x11/gnome-pie/files/patch-src__gui__indicator.vala
new file mode 100644
index 000000000000..e504035e1a80
--- /dev/null
+++ b/x11/gnome-pie/files/patch-src__gui__indicator.vala
@@ -0,0 +1,14 @@
+--- ./src/gui/indicator.vala.orig	2013-03-19 01:40:47.000000000 +0100
++++ ./src/gui/indicator.vala	2013-03-19 01:41:57.000000000 +0100
+@@ -93,10 +93,7 @@
+         #else
+             this.indicator = new Gtk.StatusIcon();
+             try {
+-                var file = GLib.File.new_for_path(GLib.Path.build_filename(
+-                    GLib.Path.get_dirname(GLib.FileUtils.read_link("/proc/self/exe"))+"/resources",
+-                    icon + ".svg"
+-                ));
++                var file = GLib.File.new_for_path(GLib.Path.build_filename("%%DATADIR%%/resources", icon + ".svg"));
+ 
+                 if (!file.query_exists())
+                   this.indicator.set_from_icon_name(icon);
diff --git a/x11/gnome-pie/files/patch-src__gui__themeList.vala b/x11/gnome-pie/files/patch-src__gui__themeList.vala
new file mode 100644
index 000000000000..0be0574bf8c4
--- /dev/null
+++ b/x11/gnome-pie/files/patch-src__gui__themeList.vala
@@ -0,0 +1,11 @@
+--- ./src/gui/themeList.vala.orig	2013-03-19 01:24:16.000000000 +0100
++++ ./src/gui/themeList.vala	2013-03-19 01:24:23.000000000 +0100
+@@ -81,7 +81,7 @@
+                     
+                     this.on_select_new();
+     
+-                    Config.global.theme.load();
++                    //Config.global.theme.load();
+                     Config.global.theme.load_images();
+                     return false;
+                 });  
diff --git a/x11/gnome-pie/files/patch-src__utilities__bindingManager.vala b/x11/gnome-pie/files/patch-src__utilities__bindingManager.vala
new file mode 100644
index 000000000000..27a6d43be434
--- /dev/null
+++ b/x11/gnome-pie/files/patch-src__utilities__bindingManager.vala
@@ -0,0 +1,19 @@
+--- ./src/utilities/bindingManager.vala.orig	2013-03-15 23:02:39.000000000 +0100
++++ ./src/utilities/bindingManager.vala	2013-03-15 23:03:13.000000000 +0100
+@@ -228,12 +228,12 @@
+     
+     private Gdk.FilterReturn event_filter(Gdk.XEvent gdk_xevent, Gdk.Event gdk_event) { 
+         
+-        #if VALA_0_16 || VALA_0_17
+-            X.Event* xevent = (X.Event*) gdk_xevent;
+-        #else
++        //#if VALA_0_16 || VALA_0_17
++        //    X.Event* xevent = (X.Event*) gdk_xevent;
++        //#else
+             void* pointer = &gdk_xevent;
+             X.Event* xevent = (X.Event*) pointer;
+-        #endif
++        //#endif
+  
+         if(xevent->type == X.EventType.KeyPress) {
+             foreach(var binding in bindings) {
diff --git a/x11/gnome-pie/files/patch-src__utilities__paths.vala b/x11/gnome-pie/files/patch-src__utilities__paths.vala
index 72bdf2ff2693..2043d8782569 100644
--- a/x11/gnome-pie/files/patch-src__utilities__paths.vala
+++ b/x11/gnome-pie/files/patch-src__utilities__paths.vala
@@ -1,5 +1,5 @@
---- ./src/utilities/paths.vala.orig	2013-01-23 23:33:16.000000000 +0100
-+++ ./src/utilities/paths.vala	2013-01-24 21:41:21.000000000 +0100
+--- ./src/utilities/paths.vala.orig	2013-03-17 12:15:02.000000000 +0100
++++ ./src/utilities/paths.vala	2013-03-19 01:34:39.000000000 +0100
 @@ -71,21 +71,21 @@
      /// usually /usr/share/gnome-pie/themes.
      /////////////////////////////////////////////////////////////////////
@@ -25,3 +25,12 @@
      
      /////////////////////////////////////////////////////////////////////
      /// The autostart file of gnome-pie_config
+@@ -115,7 +115,7 @@
+     
+         // get path of executable
+         try {
+-            executable = GLib.File.new_for_path(GLib.FileUtils.read_link("/proc/self/exe")).get_path();
++            executable = GLib.File.new_for_path("%%PREFIX%%/bin/gnome-pie").get_path();
+         } catch (GLib.FileError e) {
+             warning("Failed to get path of executable!");
+         }