Date: Sun, 22 Feb 2015 13:03:51 +0000 (UTC) From: Nicola Vitale <nivit@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379603 - in head: . x11 x11/gnome-pie x11/gnome-pie/files Message-ID: <201502221303.t1MD3pFW028582@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nivit Date: Sun Feb 22 13:03:50 2015 New Revision: 379603 URL: https://svnweb.freebsd.org/changeset/ports/379603 QAT: https://qat.redports.org/buildarchive/r379603/ Log: (Readdition of x11/gnome-pie which was removed on 372767) Gnome-Pie is a circular application launcher. It is made of several pies, each consisting of multiple slices. The user presses a key stroke which opens the desired pie. By activating one of its slices, applications may be launched, key presses may be simulated or files can be opened. WWW: http://simmesimme.github.io/gnome-pie.html Added: head/x11/gnome-pie/ - copied from r372767, head/x11/gnome-pie/ Deleted: head/x11/gnome-pie/files/patch-CMakeLists.txt head/x11/gnome-pie/files/patch-src__actionGroups__windowListGroup.vala Modified: head/MOVED head/x11/Makefile head/x11/gnome-pie/Makefile head/x11/gnome-pie/distinfo (contents, props changed) head/x11/gnome-pie/files/patch-resources__gnome-pie.desktop (contents, props changed) head/x11/gnome-pie/files/patch-src__CMakeLists.txt (contents, props changed) head/x11/gnome-pie/files/patch-src__actions__actionRegistry.vala (contents, props changed) head/x11/gnome-pie/files/patch-src__gui__indicator.vala (contents, props changed) head/x11/gnome-pie/files/patch-src__gui__themeList.vala (contents, props changed) head/x11/gnome-pie/files/patch-src__utilities__bindingManager.vala (contents, props changed) head/x11/gnome-pie/files/patch-src__utilities__paths.vala (contents, props changed) head/x11/gnome-pie/files/pkg-message.in (contents, props changed) head/x11/gnome-pie/pkg-descr (contents, props changed) head/x11/gnome-pie/pkg-plist (contents, props changed) Modified: head/MOVED ============================================================================== --- head/MOVED Sun Feb 22 12:50:21 2015 (r379602) +++ head/MOVED Sun Feb 22 13:03:50 2015 (r379603) @@ -7191,7 +7191,6 @@ x11/gdesklets-tasklist||2014-11-19|Depen x11/gnome-applets||2014-11-19|GNOME 2 was removed x11/gnome-panel||2014-11-19|GNOME 2 was removed x11/gnome-panel-reference||2014-11-19|GNOME 2 was removed -x11/gnome-pie||2014-11-19|Is not compatible with updated gnome-menus x11/gnome-screensaver||2014-11-19|Is not compatible with updated gnome-desktop x11/gnome-swallow||2014-11-19|Removed, depends on removed gnome-panel x11/gnome2||2014-11-19|GNOME 2 was removed Modified: head/x11/Makefile ============================================================================== --- head/x11/Makefile Sun Feb 22 12:50:21 2015 (r379602) +++ head/x11/Makefile Sun Feb 22 13:03:50 2015 (r379603) @@ -77,6 +77,7 @@ SUBDIR += gnome-desktop SUBDIR += gnome-desktop-reference SUBDIR += gnome-menus + SUBDIR += gnome-pie SUBDIR += gnome-session SUBDIR += gnome-shell SUBDIR += gnome-shell-extensions Modified: head/x11/gnome-pie/Makefile ============================================================================== --- head/x11/gnome-pie/Makefile Wed Nov 19 11:15:06 2014 (r372767) +++ head/x11/gnome-pie/Makefile Sun Feb 22 13:03:50 2015 (r379603) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= gnome-pie -PORTVERSION= 0.5.5 -PORTREVISION= 3 +PORTVERSION= 0.5.7 +PORTREVISION= 0 CATEGORIES= x11 MAINTAINER= nivit@FreeBSD.org @@ -12,52 +12,46 @@ COMMENT= Circular application launcher LICENSE= GPLv3 BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala -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= libcairo.so:${PORTSDIR}/graphics/cairo \ - libgee.so:${PORTSDIR}/devel/libgee06 \ - librsvg-2.so:${PORTSDIR}/graphics/librsvg2 \ +RUN_DEPENDS= gnome-settings-daemon>=2.32.1_4:${PORTSDIR}/sysutils/gnome-settings-daemon +LIB_DEPENDS= libbamf3.so:${PORTSDIR}/sysutils/bamf \ + libgee-0.8.so:${PORTSDIR}/devel/libgee \ libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique -USE_XORG= xtst +DOCS_CMAKE_ON= -DINSTALL_DOCS:BOOL=ON + GH_ACCOUNT= Simmesimme +GH_COMMIT= 6ee3a64 GH_PROJECT= Gnome-Pie -GH_COMMIT= 5ea8b11 GH_TAGNAME= v${PORTVERSION} INSTALLS_ICONS= yes -OPTIONS_DEFINE= DOCS MANPAGES NLS -OPTIONS_DEFAULT= MANPAGES -OPTIONS_SUB= yes - -DOCS_CMAKE_ON= -DINSTALL_DOCS:BOOL=ON MANPAGES_CMAKE_OFF= -DNO_INSTALL_MANPAGES:BOOL=ON -NLS_CMAKE_ON= -DINSTALL_NLS:BOOL=ON -NLS_USES= gettext NLS_CMAKE_OFF= -DINSTALL_NLS:BOOL=OFF +NLS_CMAKE_ON= -DINSTALL_NLS:BOOL=ON +NLS_USES= gettext + +OPTIONS_DEFAULT= MANPAGES +OPTIONS_DEFINE= DOCS MANPAGES NLS +OPTIONS_SUB= yes + +PLIST_SUB= DESKTOPDIR=${DESKTOPDIR} REINPLACE_ARGS= -e 's,%%DATADIR%%,${DATADIR},1' \ -e 's,%%DESKTOPDIR%%,${DESKTOPDIR},1' \ - -e 's,%%PREFIX%%,${PREFIX},1' \ + -e 's,%%PREFIX%%,${PREFIX},1' -i.bak \ -e '/has_resize_grip/d' -i '' -SUB_FILES= pkg-message -SUB_LIST= PORTSDIR=${PORTSDIR} - -USES+= cmake pkgconfig +USES= cmake pkgconfig USE_GITHUB= yes -USE_GNOME= gconf2 gnomemenus gtk20 libwnck +USE_GNOME= cairo gconf2 gnomemenus3 gtk30 librsvg2 libwnck3 +USE_XORG= xtst post-patch: ${REINPLACE_CMD} ${WRKSRC}/src/actions/actionRegistry.vala \ - ${WRKSRC}/src/gui/indicator.vala \ - ${WRKSRC}/src/utilities/paths.vala \ - ${WRKSRC}/resources/ui/*.ui - -gnome-pie-user: - gconftool-2 --type string --set /desktop/gnome/interface/icon_theme "Faenza" - gconftool-2 --type bool --set /desktop/gnome/interface/menus_have_icons true + ${WRKSRC}/src/gui/indicator.vala \ + ${WRKSRC}/src/utilities/paths.vala \ + ${WRKSRC}/resources/ui/*.ui .include <bsd.port.mk> Modified: head/x11/gnome-pie/distinfo ============================================================================== --- head/x11/gnome-pie/distinfo Wed Nov 19 11:15:06 2014 (r372767) +++ head/x11/gnome-pie/distinfo Sun Feb 22 13:03:50 2015 (r379603) @@ -1,2 +1,2 @@ -SHA256 (gnome-pie-0.5.5.tar.gz) = 7b98d9055943b389818ad529faa81758736907b99aa7280c74b44424ac9c8639 -SIZE (gnome-pie-0.5.5.tar.gz) = 224767 +SHA256 (gnome-pie-0.5.7.tar.gz) = 95a178c959ce8c53764f1feacb045b264ca2a9d7aff5016559fb0975909ab0b4 +SIZE (gnome-pie-0.5.7.tar.gz) = 224405 Modified: head/x11/gnome-pie/files/patch-resources__gnome-pie.desktop ============================================================================== --- head/x11/gnome-pie/files/patch-resources__gnome-pie.desktop Wed Nov 19 11:15:06 2014 (r372767) +++ head/x11/gnome-pie/files/patch-resources__gnome-pie.desktop Sun Feb 22 13:03:50 2015 (r379603) @@ -1,8 +1,9 @@ ---- ./resources/gnome-pie.desktop.orig 2013-01-23 23:33:16.000000000 +0100 -+++ ./resources/gnome-pie.desktop 2013-01-24 21:41:21.000000000 +0100 -@@ -4,4 +4,4 @@ +--- resources/gnome-pie.desktop.orig 2015-01-23 11:49:05 UTC ++++ resources/gnome-pie.desktop +@@ -4,5 +4,5 @@ Name=Gnome-Pie Comment=Cakes don't lie. Exec=gnome-pie Icon=gnome-pie -Categories=GNOME;Utility; +Categories=GTK;GNOME;Utility; + Keywords=Utility;Menu; Modified: head/x11/gnome-pie/files/patch-src__CMakeLists.txt ============================================================================== --- head/x11/gnome-pie/files/patch-src__CMakeLists.txt Wed Nov 19 11:15:06 2014 (r372767) +++ head/x11/gnome-pie/files/patch-src__CMakeLists.txt Sun Feb 22 13:03:50 2015 (r379603) @@ -1,6 +1,6 @@ ---- ./src/CMakeLists.txt.orig 2013-01-23 23:33:16.000000000 +0100 -+++ ./src/CMakeLists.txt 2013-01-24 21:41:57.000000000 +0100 -@@ -43,6 +43,7 @@ +--- src/CMakeLists.txt.orig 2015-01-23 11:49:05 UTC ++++ src/CMakeLists.txt +@@ -39,6 +39,7 @@ install( ${CMAKE_INSTALL_PREFIX}/bin ) @@ -8,7 +8,7 @@ # install credits install( FILES -@@ -50,7 +51,9 @@ +@@ -46,7 +47,9 @@ install( DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/gnome-pie ) @@ -18,7 +18,7 @@ # install locales install( DIRECTORY -@@ -61,6 +64,7 @@ +@@ -57,6 +60,7 @@ install( PATTERN *.pot EXCLUDE PATTERN *.sh EXCLUDE ) @@ -26,7 +26,7 @@ # install themes install( -@@ -95,11 +99,12 @@ +@@ -91,11 +95,12 @@ install( ${CMAKE_INSTALL_PREFIX}/share/applications ) Modified: head/x11/gnome-pie/files/patch-src__actions__actionRegistry.vala ============================================================================== --- head/x11/gnome-pie/files/patch-src__actions__actionRegistry.vala Wed Nov 19 11:15:06 2014 (r372767) +++ head/x11/gnome-pie/files/patch-src__actions__actionRegistry.vala Sun Feb 22 13:03:50 2015 (r379603) @@ -1,11 +1,11 @@ ---- ./src/actions/actionRegistry.vala.orig 2013-01-23 23:33:16.000000000 +0100 -+++ ./src/actions/actionRegistry.vala 2013-01-24 21:41:21.000000000 +0100 -@@ -108,7 +108,7 @@ +--- src/actions/actionRegistry.vala.orig 2015-01-23 11:49:05 UTC ++++ src/actions/actionRegistry.vala +@@ -108,7 +108,7 @@ public class ActionRegistry : GLib.Objec case "application": var file_name = uri.split("//")[1]; - var desktop_file = GLib.File.new_for_path("/usr/share/applications/" + file_name); -+ var desktop_file = GLib.File.new_for_path("%%DESKTOPDIR%%/" + file_name); ++ var desktop_file = GLib.File.new_for_path("%%DATADIR%%/applications/" + file_name); if (desktop_file.query_exists()) return new_for_desktop_file(desktop_file.get_path()); Modified: head/x11/gnome-pie/files/patch-src__gui__indicator.vala ============================================================================== --- head/x11/gnome-pie/files/patch-src__gui__indicator.vala Wed Nov 19 11:15:06 2014 (r372767) +++ head/x11/gnome-pie/files/patch-src__gui__indicator.vala Sun Feb 22 13:03:50 2015 (r379603) @@ -1,6 +1,15 @@ ---- ./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 @@ +--- src/gui/indicator.vala.orig 2015-01-23 11:49:05 UTC ++++ src/gui/indicator.vala +@@ -79,7 +79,7 @@ public class Indicator : GLib.Object { + string path = ""; + + try { +- path = GLib.Path.get_dirname(GLib.FileUtils.read_link("/proc/self/exe"))+"/resources"; ++ path = "%%DATADIR%%/resources"; + } catch (GLib.FileError e) { + warning("Failed to get path of executable!"); + } +@@ -90,10 +90,7 @@ public class Indicator : GLib.Object { #else this.indicator = new Gtk.StatusIcon(); try { Modified: head/x11/gnome-pie/files/patch-src__gui__themeList.vala ============================================================================== --- head/x11/gnome-pie/files/patch-src__gui__themeList.vala Wed Nov 19 11:15:06 2014 (r372767) +++ head/x11/gnome-pie/files/patch-src__gui__themeList.vala Sun Feb 22 13:03:50 2015 (r379603) @@ -1,6 +1,6 @@ ---- ./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 @@ +--- src/gui/themeList.vala.orig 2015-01-23 11:49:05 UTC ++++ src/gui/themeList.vala +@@ -81,7 +81,7 @@ class ThemeList : Gtk.TreeView { this.on_select_new(); Modified: head/x11/gnome-pie/files/patch-src__utilities__bindingManager.vala ============================================================================== --- head/x11/gnome-pie/files/patch-src__utilities__bindingManager.vala Wed Nov 19 11:15:06 2014 (r372767) +++ head/x11/gnome-pie/files/patch-src__utilities__bindingManager.vala Sun Feb 22 13:03:50 2015 (r379603) @@ -1,9 +1,9 @@ ---- ./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) { - +--- src/utilities/bindingManager.vala.orig 2015-01-23 11:49:05 UTC ++++ src/utilities/bindingManager.vala +@@ -228,12 +228,12 @@ public class BindingManager : GLib.Objec + + 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 @@ -14,6 +14,6 @@ X.Event* xevent = (X.Event*) pointer; - #endif + //#endif - + if(xevent->type == X.EventType.KeyPress) { foreach(var binding in bindings) { Modified: head/x11/gnome-pie/files/patch-src__utilities__paths.vala ============================================================================== --- head/x11/gnome-pie/files/patch-src__utilities__paths.vala Wed Nov 19 11:15:06 2014 (r372767) +++ head/x11/gnome-pie/files/patch-src__utilities__paths.vala Sun Feb 22 13:03:50 2015 (r379603) @@ -1,32 +1,32 @@ ---- ./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 @@ +--- src/utilities/paths.vala.orig 2015-02-10 20:42:17 UTC ++++ src/utilities/paths.vala +@@ -71,21 +71,21 @@ public class Paths : GLib.Object { /// usually /usr/share/gnome-pie/themes. ///////////////////////////////////////////////////////////////////// - + - public static string global_themes { get; private set; default=""; } + public static string global_themes { get; private set; default="%%DATADIR%%/themes"; } - + ///////////////////////////////////////////////////////////////////// /// The directory containing locale files /// usually /usr/share/locale. ///////////////////////////////////////////////////////////////////// - + - public static string locales { get; private set; default=""; } + public static string locales { get; private set; default="%%PREFIX%%/share/locale"; } - + ///////////////////////////////////////////////////////////////////// /// The directory containing UI declaration files /// usually /usr/share/gnome-pie/ui/. ///////////////////////////////////////////////////////////////////// - + - public static string ui_files { get; private set; default=""; } + public static string ui_files { get; private set; default="%%DATADIR%%/ui"; } - + ///////////////////////////////////////////////////////////////////// /// The autostart file of gnome-pie_config -@@ -115,7 +115,7 @@ - +@@ -115,7 +115,7 @@ public class Paths : GLib.Object { + // get path of executable try { - executable = GLib.File.new_for_path(GLib.FileUtils.read_link("/proc/self/exe")).get_path(); @@ -34,3 +34,30 @@ } catch (GLib.FileError e) { warning("Failed to get path of executable!"); } +@@ -128,12 +128,12 @@ public class Paths : GLib.Object { + Gtk.IconTheme.get_default().append_search_path(path); + } + +- Gtk.IconTheme.get_default().append_search_path("/usr/share/pixmaps/"); ++ Gtk.IconTheme.get_default().append_search_path("%%LOCALBASE%%/share/pixmaps/"); + + // get global paths + var default_dir = GLib.File.new_for_path("/usr/share/gnome-pie/"); + if(!default_dir.query_exists()) { +- default_dir = GLib.File.new_for_path("/usr/local/share/gnome-pie/"); ++ default_dir = GLib.File.new_for_path("%%DATADIR%%/"); + + if(!default_dir.query_exists()) { + default_dir = GLib.File.new_for_path(GLib.Path.get_dirname( +@@ -149,9 +149,9 @@ public class Paths : GLib.Object { + if(locale_dir.query_exists()) { + locale_dir = GLib.File.new_for_path("/usr/share/locale"); + } else { +- locale_dir = GLib.File.new_for_path("/usr/local/share/locale/de/LC_MESSAGES/gnomepie.mo"); ++ locale_dir = GLib.File.new_for_path("%%LOCALBASE%%/share/locale/de/LC_MESSAGES/gnomepie.mo"); + if(locale_dir.query_exists()) { +- locale_dir = GLib.File.new_for_path("/usr/local/share/locale"); ++ locale_dir = GLib.File.new_for_path("%%LOCALBASE%%/share/locale"); + } else { + locale_dir = GLib.File.new_for_path(GLib.Path.get_dirname( + executable)).get_child("resources/locale/de/LC_MESSAGES/gnomepie.mo"); Modified: head/x11/gnome-pie/files/pkg-message.in ============================================================================== --- head/x11/gnome-pie/files/pkg-message.in Wed Nov 19 11:15:06 2014 (r372767) +++ head/x11/gnome-pie/files/pkg-message.in Sun Feb 22 13:03:50 2015 (r379603) @@ -1,13 +1,10 @@ *************************************************************** -If you do not use GNOME as window manager, and do not see any -icon in Gnome-Pie preferences, then run the following command: +If you do not see any pie, create keyboard shortcuts manually +binding commands such as: - (cd %%PORTSDIR%%/x11/gnome-pie && make gnome-pie-user) + gnome-pie -o ID -and add this line to your ~/.xinitrc - - %%LOCALBASE%%/libexec/gnome-settings-daemon& - (sleep 2 && gnome-pie)& +(Open Preferences to take the value of the pie ID) *************************************************************** Modified: head/x11/gnome-pie/pkg-descr ============================================================================== --- head/x11/gnome-pie/pkg-descr Wed Nov 19 11:15:06 2014 (r372767) +++ head/x11/gnome-pie/pkg-descr Sun Feb 22 13:03:50 2015 (r379603) @@ -3,4 +3,4 @@ each consisting of multiple slices. The opens the desired pie. By activating one of its slices, applications may be launched, key presses may be simulated or files can be opened. -WWW: http://gnome-pie.simonschneegans.de/ +WWW: http://simmesimme.github.io/gnome-pie.html Modified: head/x11/gnome-pie/pkg-plist ============================================================================== --- head/x11/gnome-pie/pkg-plist Wed Nov 19 11:15:06 2014 (r372767) +++ head/x11/gnome-pie/pkg-plist Sun Feb 22 13:03:50 2015 (r379603) @@ -1,6 +1,6 @@ bin/gnome-pie %%MANPAGES%%man/man1/gnome-pie.1.gz -share/applications/gnome-pie.desktop +%%DESKTOPDIR%%/gnome-pie.desktop %%PORTDOCS%%%%DOCSDIR%%/README.md %%DATADIR%%/themes/adwaita/arrow.svg %%DATADIR%%/themes/adwaita/caption_mask.svg @@ -83,20 +83,3 @@ share/icons/hicolor/scalable/apps/gnome- %%NLS%%share/locale/pt_BR/LC_MESSAGES/gnomepie.mo %%NLS%%share/locale/ru/LC_MESSAGES/gnomepie.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnomepie.mo -@dirrm %%DATADIR%%/ui -@dirrm %%DATADIR%%/themes/unity -@dirrm %%DATADIR%%/themes/slim -@dirrm %%DATADIR%%/themes/o-pie -@dirrm %%DATADIR%%/themes/minimalistic_text -@dirrm %%DATADIR%%/themes/gloss -@dirrm %%DATADIR%%/themes/funky -@dirrm %%DATADIR%%/themes/elementary -@dirrm %%DATADIR%%/themes/bright -@dirrm %%DATADIR%%/themes/adwaita -@dirrm %%DATADIR%%/themes -@dirrm %%DATADIR%% -@dirrmtry share/icons/hicolor/scalable/apps -@dirrmtry share/icons/hicolor/scalable -@dirrmtry share/icons/hicolor -@dirrmtry share/icons -%%PORTDOCS%%@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502221303.t1MD3pFW028582>