Update to xfce-utils 4.8.0.
Add a temporary workaround to install the fd.o menu file to ~/.config/menus/ at startup, i'm working on a fix with upstream (#6796)
This commit is contained in:
landry
parent
94c704ddb3
commit
8446e34c1a
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.33 2010/11/22 08:37:06 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.34 2011/01/18 20:25:56 landry Exp $
|
||||
|
||||
COMMENT= Xfce4 essential utilities and scripts
|
||||
|
||||
XFCE_PROJECT= xfce-utils
|
||||
REVISION= 1
|
||||
|
||||
# GPLv2
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
@ -12,10 +11,10 @@ PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
|
||||
MODULES= x11/xfce4
|
||||
DESKTOP_FILES= Yes
|
||||
|
||||
LIB_DEPENDS= x11/xfce4/libxfcegui4 \
|
||||
x11/dbus-glib \
|
||||
x11/dbus
|
||||
LIB_DEPENDS= x11/xfce4/libxfce4ui>=4.8.0 \
|
||||
x11/dbus-glib
|
||||
|
||||
RUN_DEPENDS= x11/xfce4/xfce4-settings \
|
||||
x11/xfce4/xfce4-session \
|
||||
@ -29,9 +28,10 @@ WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
|
||||
pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread \
|
||||
startup-notification-1 xfce4util z pthread-stubs xcb \
|
||||
execinfo xcb-atom xcb-aux xcb-event gthread-2.0 \
|
||||
xcb-render xcb-render-util xfcegui4 dbus-1 dbus-glib-1
|
||||
xcb-render dbus-1 dbus-glib-1 GL Xxf86vm drm xcb-shm xfce4ui-1
|
||||
|
||||
CONFIGURE_ARGS+=--with-browser="xterm -e lynx" \
|
||||
--disable-linker-opts \
|
||||
--with-xsession-prefix=${PREFIX}
|
||||
|
||||
FAKE_FLAGS= conffilesdir=${PREFIX}/share/examples/xfce-utils \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (xfce4/xfce-utils-4.6.2.tar.bz2) = XSNAdwDX6Ml1HhelvJVRCQ==
|
||||
RMD160 (xfce4/xfce-utils-4.6.2.tar.bz2) = BsM4Y9oPgPFu8VQwfkuJCFvDlY8=
|
||||
SHA1 (xfce4/xfce-utils-4.6.2.tar.bz2) = Y3OIbD1w5XaFl0G950eiNVZ//Y4=
|
||||
SHA256 (xfce4/xfce-utils-4.6.2.tar.bz2) = VO/CA4v71ayq38ke2R+z39bOxk+UAvNkrMznvK/iuno=
|
||||
SIZE (xfce4/xfce-utils-4.6.2.tar.bz2) = 638094
|
||||
MD5 (xfce4/xfce-utils-4.8.0.tar.bz2) = xJrz5xgEjXCz/dRf1KjSgQ==
|
||||
RMD160 (xfce4/xfce-utils-4.8.0.tar.bz2) = 8IaW+ZdUNghb4khlngXpm2CJaZo=
|
||||
SHA1 (xfce4/xfce-utils-4.8.0.tar.bz2) = oAv/kClvMCGIT9HIMtfidOCm3AA=
|
||||
SHA256 (xfce4/xfce-utils-4.8.0.tar.bz2) = UQ6GIuf/8lcgVc2NdDhjumJs8IL7PXXmHh/gyu/aQ9Q=
|
||||
SIZE (xfce4/xfce-utils-4.8.0.tar.bz2) = 713474
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-scripts_startxfce4_in,v 1.1 2009/11/14 16:43:27 landry Exp $
|
||||
set XDG_MENU_PREFIX to xfce- so that applications looking
|
||||
for the xfce xdg-compliant menu have another chance to find it.
|
||||
--- scripts/startxfce4.in.orig Sat Nov 14 14:24:41 2009
|
||||
+++ scripts/startxfce4.in Sat Nov 14 14:25:10 2009
|
||||
@@ -34,6 +34,11 @@ else
|
||||
fi
|
||||
export XDG_DATA_DIRS
|
||||
|
||||
+if test "x$XDG_MENU_PREFIX" = "x"
|
||||
+then
|
||||
+ export XDG_MENU_PREFIX="xfce-"
|
||||
+fi
|
||||
+
|
||||
if test "x$DISPLAY" = "x"
|
||||
then
|
||||
echo "$0: Starting X server"
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-scripts_xflock4,v 1.1 2008/02/13 13:08:53 landry Exp $
|
||||
--- scripts/xflock4.orig Wed Feb 13 13:23:00 2008
|
||||
+++ scripts/xflock4 Wed Feb 13 13:23:12 2008
|
||||
$OpenBSD: patch-scripts_xflock4,v 1.2 2011/01/18 20:25:56 landry Exp $
|
||||
--- scripts/xflock4.orig Sun Jan 16 17:02:27 2011
|
||||
+++ scripts/xflock4 Tue Jan 18 16:01:44 2011
|
||||
@@ -19,9 +19,9 @@
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
@ -11,5 +11,5 @@ $OpenBSD: patch-scripts_xflock4,v 1.1 2008/02/13 13:08:53 landry Exp $
|
||||
-elif test x"`which gnome-screensaver-command 2>/dev/null`" != x""; then
|
||||
+elif test x"`whereis gnome-screensaver-command`" != x""; then
|
||||
gnome-screensaver-command --lock
|
||||
else
|
||||
xlock $*
|
||||
elif test x"`which slock 2>/dev/null`" != x""; then
|
||||
slock
|
||||
|
||||
18
x11/xfce4/xfce-utils/patches/patch-scripts_xinitrc_in_in
Normal file
18
x11/xfce4/xfce-utils/patches/patch-scripts_xinitrc_in_in
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-scripts_xinitrc_in_in,v 1.1 2011/01/18 20:25:56 landry Exp $
|
||||
workaround until http://bugzilla.xfce.org/show_bug.cgi?id=6796 is fixed
|
||||
--- scripts/xinitrc.in.in.orig Tue Jan 18 16:14:35 2011
|
||||
+++ scripts/xinitrc.in.in Tue Jan 18 16:23:16 2011
|
||||
@@ -30,6 +30,13 @@ if test "x$XDG_CONFIG_HOME" = "x" ; then
|
||||
fi
|
||||
[ -d "$XDG_CONFIG_HOME" ] || mkdir "$XDG_CONFIG_HOME"
|
||||
|
||||
+# copy the sample applications.menu to XDG_CONFIG_HOME/menus
|
||||
+[ -d "$XDG_CONFIG_HOME/menus" ] || mkdir "$XDG_CONFIG_HOME/menus"
|
||||
+
|
||||
+if [ -f "@_sysconfdir_@/xdg/menus/${XDG_MENU_PREFIX}applications.menu" -a ! -f "$XDG_CONFIG_HOME/menus/${XDG_MENU_PREFIX}applications.menu" ]; then
|
||||
+ cp "@_sysconfdir_@/xdg/menus/${XDG_MENU_PREFIX}applications.menu" "$XDG_CONFIG_HOME/menus/"
|
||||
+fi
|
||||
+
|
||||
# $XDG_CACHE_HOME defines the base directory relative to which user specific
|
||||
# non-essential data files should be stored. If $XDG_CACHE_HOME is either not
|
||||
# set or empty, a default equal to $HOME/.cache should be used.
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.14 2010/06/05 15:24:37 landry Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.15 2011/01/18 20:25:56 landry Exp $
|
||||
bin/startxfce4
|
||||
bin/xfbrowser4
|
||||
@bin bin/xfce4-about
|
||||
@ -7,12 +7,85 @@ bin/xflock4
|
||||
bin/xfmountdev4
|
||||
@bin bin/xfrun4
|
||||
bin/xfterm4
|
||||
libexec/xfce4/
|
||||
libexec/xfce4/xfconf-migration/
|
||||
libexec/xfce4/xfconf-migration/xfconf-migration-4.6.pl
|
||||
lib/xfce4/xfconf-migration/
|
||||
lib/xfce4/xfconf-migration/xfconf-migration-4.6.pl
|
||||
share/applications/xfce4-about.desktop
|
||||
share/applications/xfhelp4.desktop
|
||||
share/applications/xfrun4.desktop
|
||||
share/dbus-1/
|
||||
share/dbus-1/services/
|
||||
share/dbus-1/services/org.xfce.RunDialog.service
|
||||
share/doc/xfce-utils/
|
||||
share/doc/xfce-utils/html/
|
||||
share/doc/xfce-utils/html/C/
|
||||
share/doc/xfce-utils/html/C/BSD.html
|
||||
share/doc/xfce-utils/html/C/GPL.html
|
||||
share/doc/xfce-utils/html/C/LGPL.html
|
||||
share/doc/xfce-utils/html/C/images/
|
||||
share/doc/xfce-utils/html/C/images/about-dialog.png
|
||||
share/doc/xfce-utils/html/C/images/default-session.png
|
||||
share/doc/xfce-utils/html/C/images/run-dialog.png
|
||||
share/doc/xfce-utils/html/C/images/xfce-mouse.png
|
||||
share/doc/xfce-utils/html/C/index.html
|
||||
share/doc/xfce-utils/html/C/xfce-user-guide.html
|
||||
share/doc/xfce-utils/html/C/xfce-utils.html
|
||||
share/doc/xfce-utils/html/da/
|
||||
share/doc/xfce-utils/html/da/BSD.html
|
||||
share/doc/xfce-utils/html/da/GPL.html
|
||||
share/doc/xfce-utils/html/da/LGPL.html
|
||||
share/doc/xfce-utils/html/da/images
|
||||
share/doc/xfce-utils/html/da/index.html
|
||||
share/doc/xfce-utils/html/da/xfce-user-guide.html
|
||||
share/doc/xfce-utils/html/da/xfce-utils.html
|
||||
share/doc/xfce-utils/html/el/
|
||||
share/doc/xfce-utils/html/el/BSD.html
|
||||
share/doc/xfce-utils/html/el/GPL.html
|
||||
share/doc/xfce-utils/html/el/LGPL.html
|
||||
share/doc/xfce-utils/html/el/images
|
||||
share/doc/xfce-utils/html/el/index.html
|
||||
share/doc/xfce-utils/html/el/xfce-user-guide.html
|
||||
share/doc/xfce-utils/html/el/xfce-utils.html
|
||||
share/doc/xfce-utils/html/gl/
|
||||
share/doc/xfce-utils/html/gl/BSD.html
|
||||
share/doc/xfce-utils/html/gl/GPL.html
|
||||
share/doc/xfce-utils/html/gl/LGPL.html
|
||||
share/doc/xfce-utils/html/gl/images
|
||||
share/doc/xfce-utils/html/gl/index.html
|
||||
share/doc/xfce-utils/html/gl/xfce-user-guide.html
|
||||
share/doc/xfce-utils/html/gl/xfce-utils.html
|
||||
share/doc/xfce-utils/html/it/
|
||||
share/doc/xfce-utils/html/it/BSD.html
|
||||
share/doc/xfce-utils/html/it/GPL.html
|
||||
share/doc/xfce-utils/html/it/LGPL.html
|
||||
share/doc/xfce-utils/html/it/images
|
||||
share/doc/xfce-utils/html/it/index.html
|
||||
share/doc/xfce-utils/html/it/xfce-user-guide.html
|
||||
share/doc/xfce-utils/html/it/xfce-utils.html
|
||||
share/doc/xfce-utils/html/ja/
|
||||
share/doc/xfce-utils/html/ja/BSD.html
|
||||
share/doc/xfce-utils/html/ja/GPL.html
|
||||
share/doc/xfce-utils/html/ja/LGPL.html
|
||||
share/doc/xfce-utils/html/ja/images
|
||||
share/doc/xfce-utils/html/ja/index.html
|
||||
share/doc/xfce-utils/html/ja/xfce-user-guide.html
|
||||
share/doc/xfce-utils/html/ja/xfce-utils.html
|
||||
share/doc/xfce-utils/html/sv/
|
||||
share/doc/xfce-utils/html/sv/BSD.html
|
||||
share/doc/xfce-utils/html/sv/GPL.html
|
||||
share/doc/xfce-utils/html/sv/LGPL.html
|
||||
share/doc/xfce-utils/html/sv/images
|
||||
share/doc/xfce-utils/html/sv/index.html
|
||||
share/doc/xfce-utils/html/sv/xfce-user-guide.html
|
||||
share/doc/xfce-utils/html/sv/xfce-utils.html
|
||||
share/doc/xfce-utils/html/ug/
|
||||
share/doc/xfce-utils/html/ug/BSD.html
|
||||
share/doc/xfce-utils/html/ug/GPL.html
|
||||
share/doc/xfce-utils/html/ug/LGPL.html
|
||||
share/doc/xfce-utils/html/ug/images
|
||||
share/doc/xfce-utils/html/ug/index.html
|
||||
share/doc/xfce-utils/html/ug/xfce-user-guide.html
|
||||
share/doc/xfce-utils/html/ug/xfce-utils.html
|
||||
share/doc/xfce-utils/html/xfce-utils.css
|
||||
share/examples/xfce-utils/
|
||||
@sample ${SYSCONFDIR}/xdg/
|
||||
@sample ${SYSCONFDIR}/xdg/xfce4/
|
||||
@ -32,6 +105,7 @@ share/locale/ast/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/az/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/be/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/bg/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/bn/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/bn_IN/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/ca/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/cs/LC_MESSAGES/xfce-utils.mo
|
||||
@ -52,6 +126,7 @@ share/locale/gl/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/gu/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/he/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/hi/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/hr/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/hu/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/hy/
|
||||
share/locale/hy/LC_MESSAGES/
|
||||
@ -70,7 +145,6 @@ share/locale/mr/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/ms/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/nb/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/nl/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/nn/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/pa/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/pl/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/pt/LC_MESSAGES/xfce-utils.mo
|
||||
@ -90,44 +164,9 @@ share/locale/ur_PK/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/vi/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/zh_CN/LC_MESSAGES/xfce-utils.mo
|
||||
share/locale/zh_TW/LC_MESSAGES/xfce-utils.mo
|
||||
share/xfce4/AUTHORS
|
||||
share/xfce4/BSD
|
||||
share/xfce4/COPYING
|
||||
share/xfce4/GPL
|
||||
share/xfce4/INFO
|
||||
share/xfce4/INFO.ca
|
||||
share/xfce4/INFO.de
|
||||
share/xfce4/INFO.es
|
||||
share/xfce4/INFO.fi
|
||||
share/xfce4/INFO.fr
|
||||
share/xfce4/INFO.it
|
||||
share/xfce4/INFO.ja
|
||||
share/xfce4/INFO.ru
|
||||
share/xfce4/INFO.uk
|
||||
share/xfce4/INFO.vi
|
||||
share/xfce4/LGPL
|
||||
share/xfce4/doc/C/BSD.html
|
||||
share/xfce4/doc/C/GPL.html
|
||||
share/xfce4/doc/C/LGPL.html
|
||||
share/xfce4/doc/C/images/about-dialog.png
|
||||
share/xfce4/doc/C/images/default-session.png
|
||||
share/xfce4/doc/C/images/link_xfce.jpg
|
||||
share/xfce4/doc/C/images/run-dialog.png
|
||||
share/xfce4/doc/C/images/taskbar_settings.png
|
||||
share/xfce4/doc/C/index.html
|
||||
share/xfce4/doc/C/xfce-utils.html
|
||||
share/xfce4/doc/C/xfce4-components.html
|
||||
share/xfce4/doc/C/xfce4-copyright.html
|
||||
share/xfce4/doc/C/xfce4-install.html
|
||||
share/xfce4/doc/C/xfce4-intro.html
|
||||
share/xfce4/doc/C/xfce4-use.html
|
||||
share/xfce4/doc/C/xfce4-user-guide.html
|
||||
share/xfce4/doc/fr/index.html
|
||||
share/xfce4/doc/it/index.html
|
||||
share/xfce4/doc/xfce-chunk.css
|
||||
share/xfce4/doc/xfce-mouse.png
|
||||
share/xfce4/doc/xfce.css
|
||||
share/xsessions/
|
||||
share/xsessions/xfce.desktop
|
||||
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
|
||||
@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
|
||||
@exec %D/bin/update-desktop-database
|
||||
@unexec-delete %D/bin/update-desktop-database
|
||||
|
||||
Loading…
Reference in New Issue
Block a user