Date: Thu, 17 May 2012 19:58:15 GMT From: Olivier Duchateau <duchateau.olivier@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/168059: [UPDATE] x11-wm/xfce4-session to 4.10.0 Message-ID: <201205171958.q4HJwFLV004140@red.freebsd.org> Resent-Message-ID: <201205172000.q4HK0CGL005131@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 168059 >Category: ports >Synopsis: [UPDATE] x11-wm/xfce4-session to 4.10.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu May 17 20:00:12 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Olivier Duchateau >Release: FreeBSD 8.2-RELEASE-p3 i386 >Organization: >Environment: >Description: Announce: http://mail.xfce.org/pipermail/xfce/2012-April/030375.html >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN /usr/ports/x11-wm/xfce4-session/Makefile xfce4-session/Makefile --- /usr/ports/x11-wm/xfce4-session/Makefile 2012-02-20 01:06:26.000000000 +0100 +++ xfce4-session/Makefile 2012-05-17 20:35:41.000000000 +0200 @@ -6,14 +6,15 @@ # PORTNAME= xfce4-session -PORTVERSION= 4.8.3 +PORTVERSION= 4.10.0 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} -MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org -COMMENT= Session manager for the Xfce 4 desktop environment +COMMENT= Xfce's session manager + +CONFLICTS= xfce4-utils-4.8.* BUILD_DEPENDS= iceauth:${PORTSDIR}/x11/iceauth RUN_DEPENDS= iceauth:${PORTSDIR}/x11/iceauth \ @@ -28,19 +29,19 @@ INSTALLS_ICONS= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack gtk20 intltool intlhack pkgconfig +USE_GNOME= gnomehack gtk20 glib20 intltool intlhack pkgconfig desktopfileutils USE_LDCONFIG= yes USE_XFCE= configenv libmenu libutil panel xfconf USE_XORG= x11 sm ice -CONFIGURE_ARGS+= --enable-panel-plugin \ - --enable-session-screenshots \ - --enable-legacy-sm \ - --disable-gnome \ - --disable-libgnome-keyring +CONFIGURE_ARGS+=--enable-legacy-sm \ + --disable-libgnome-keyring + +SUB_FILES= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS= NLS "Enable Native Language Support" on \ - HAL "Enable HAL Support" off +OPTIONS= NLS "Enable Native Language Support" on \ + GNUPG "Add support of GNU Privacy Guard" off .include <bsd.port.options.mk> @@ -56,13 +57,15 @@ CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif -.if !defined(WITHOUT_HAL) -LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal -.else -CONFIGURE_ARGS+=--disable-hal + +.if defined(WITH_GNUPG) +RUN_DEPENDS+= gpg-agent:${PORTSDIR}/security/gnupg .endif post-install: - @${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${PKGMESSAGE} + @${ECHO_MSG} + @${CAT} ${PKGMESSAGE} + @${ECHO_MSG} + @-update-desktop-database .include <bsd.port.mk> diff -urN /usr/ports/x11-wm/xfce4-session/distinfo xfce4-session/distinfo --- /usr/ports/x11-wm/xfce4-session/distinfo 2012-02-20 01:06:26.000000000 +0100 +++ xfce4-session/distinfo 2012-05-17 20:35:41.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-session-4.8.3.tar.bz2) = f0801b8c0ffa7e5d41b29b8df281ac127adf467bf50e8ded8aebe5a02bd99338 -SIZE (xfce4/xfce4-session-4.8.3.tar.bz2) = 1594643 +SHA256 (xfce4/xfce4-session-4.10.0.tar.bz2) = bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce +SIZE (xfce4/xfce4-session-4.10.0.tar.bz2) = 1257385 diff -urN /usr/ports/x11-wm/xfce4-session/files/patch-scripts_xflock4 xfce4-session/files/patch-scripts_xflock4 --- /usr/ports/x11-wm/xfce4-session/files/patch-scripts_xflock4 1970-01-01 01:00:00.000000000 +0100 +++ xfce4-session/files/patch-scripts_xflock4 2012-05-17 20:35:40.000000000 +0200 @@ -0,0 +1,11 @@ +--- scripts/xflock4.orig 2012-04-28 22:43:27.000000000 +0200 ++++ scripts/xflock4 2012-05-16 22:18:05.000000000 +0200 +@@ -21,7 +21,7 @@ + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + # + +-PATH=/bin:/usr/bin ++PATH=/bin:/usr/bin:/usr/local/bin + export PATH + + # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running diff -urN /usr/ports/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-shutdown-helper.c xfce4-session/files/patch-xfce4-session_xfsm-shutdown-helper.c --- /usr/ports/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-shutdown-helper.c 2011-04-25 13:59:52.000000000 +0200 +++ xfce4-session/files/patch-xfce4-session_xfsm-shutdown-helper.c 2012-05-17 20:35:40.000000000 +0200 @@ -1,12 +1,12 @@ ---- xfce4-session/xfsm-shutdown-helper.c.orig 2010-11-03 21:11:37.000000000 +0100 -+++ xfce4-session/xfsm-shutdown-helper.c 2010-11-16 17:15:07.000000000 +0100 -@@ -58,6 +58,9 @@ - #include <errno.h> +--- xfce4-session/xfsm-shutdown.c.orig 2012-04-28 22:43:27.000000000 +0200 ++++ xfce4-session/xfsm-shutdown.c 2012-05-17 20:32:41.000000000 +0200 +@@ -52,6 +52,9 @@ + #include <signal.h> #endif +#include <sys/param.h> +#include <sys/user.h> +#include <sys/sysctl.h> - #include <dbus/dbus.h> - #include <dbus/dbus-glib-lowlevel.h> + #include <dbus/dbus-glib.h> + #include <dbus/dbus-glib-lowlevel.h> diff -urN /usr/ports/x11-wm/xfce4-session/files/pkg-message.in xfce4-session/files/pkg-message.in --- /usr/ports/x11-wm/xfce4-session/files/pkg-message.in 1970-01-01 01:00:00.000000000 +0100 +++ xfce4-session/files/pkg-message.in 2012-05-17 20:35:40.000000000 +0200 @@ -0,0 +1,17 @@ +To be able to shutdown or reboot your system, you'll have to add a .pkla file +in %%LOCALBASE%%/etc/polkit-1/localauthority/50-local.d directory. Which looks +like this (replace PUTYOURGROUPHERE by your group): + +[Restart] +Identity=unix-group:PUTYOURGROUPHERE +Action=org.freedesktop.consolekit.system.restart +ResultAny=yes +ResultInactive=yes +ResultActive=yes + +[Shutdown] +Identity=unix-group:PUTYOURGROUPHERE +Action=org.freedesktop.consolekit.system.stop +ResultAny=yes +ResultInactive=yes +ResultActive=yes diff -urN /usr/ports/x11-wm/xfce4-session/pkg-descr xfce4-session/pkg-descr --- /usr/ports/x11-wm/xfce4-session/pkg-descr 2007-04-11 18:26:51.000000000 +0200 +++ xfce4-session/pkg-descr 2012-05-17 20:35:41.000000000 +0200 @@ -1,6 +1,4 @@ -The session manager allows the user to save sessions and restore them -after login. It is capable of saving several different sessions. It -comes with three splash screen engines. And at last it helps you to -log out, reboot, and shutdown the system. +The session manager controls all aspects of the startup and the +shutdown of the user session. -WWW: http://www.xfce.org/projects/xfce4-session/ +WWW: http://docs.xfce.org/xfce/xfce4-session/start diff -urN /usr/ports/x11-wm/xfce4-session/pkg-message xfce4-session/pkg-message --- /usr/ports/x11-wm/xfce4-session/pkg-message 2011-04-25 13:59:52.000000000 +0200 +++ xfce4-session/pkg-message 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -To be able to shutdown or reboot your system, you'll have to add a .pkla file -in %%LOCALBASE%%/etc/polkit-1/localauthority/50-local.d directory. Which looks -like this (replace PUTYOURGROUPHERE by your group): - -[Restart] -Identity=unix-group:PUTYOURGROUPHERE -Action=org.freedesktop.consolekit.system.restart -ResultAny=yes -ResultInactive=yes -ResultActive=yes - -[Shutdown] -Identity=unix-group:PUTYOURGROUPHERE -Action=org.freedesktop.consolekit.system.stop -ResultAny=yes -ResultInactive=yes -ResultActive=yes diff -urN /usr/ports/x11-wm/xfce4-session/pkg-plist xfce4-session/pkg-plist --- /usr/ports/x11-wm/xfce4-session/pkg-plist 2012-02-20 01:06:26.000000000 +0100 +++ xfce4-session/pkg-plist 2012-05-17 20:35:40.000000000 +0200 @@ -1,18 +1,18 @@ +bin/startxfce4 bin/xfce4-session bin/xfce4-session-logout bin/xfce4-session-settings -bin/xfce4-tips -etc/xdg/autostart/xfce4-tips-autostart.desktop +bin/xflock4 +etc/xdg/autostart/xscreensaver.desktop etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml +etc/xdg/xfce4/Xft.xrdb +etc/xdg/xfce4/xinitrc include/xfce4/xfce4-session-%%VERSION%%/libxfsm/xfsm-splash-engine.h include/xfce4/xfce4-session-%%VERSION%%/libxfsm/xfsm-splash-rc.h lib/libxfsm-%%VERSION%%.a lib/libxfsm-%%VERSION%%.la lib/libxfsm-%%VERSION%%.so lib/libxfsm-%%VERSION%%.so.0 -lib/xfce4/panel/plugins/libxfsm-logout-plugin.a -lib/xfce4/panel/plugins/libxfsm-logout-plugin.la -lib/xfce4/panel/plugins/libxfsm-logout-plugin.so lib/xfce4/session/balou-export-theme lib/xfce4/session/balou-install-theme lib/xfce4/session/splash-engines/libbalou.a @@ -28,39 +28,7 @@ libdata/pkgconfig/xfce4-session-2.0.pc share/applications/xfce-session-settings.desktop share/applications/xfce4-session-logout.desktop -%%DOCSDIR%%/html/C/images/xfsm-advanced.png -%%DOCSDIR%%/html/C/images/xfsm-general.png -%%DOCSDIR%%/html/C/images/xfsm-splash.png -%%DOCSDIR%%/html/C/index.html -%%DOCSDIR%%/html/da/images -%%DOCSDIR%%/html/da/index.html -%%DOCSDIR%%/html/el/images/xfsm-advanced.png -%%DOCSDIR%%/html/el/images/xfsm-general.png -%%DOCSDIR%%/html/el/images/xfsm-splash.png -%%DOCSDIR%%/html/el/index.html -%%DOCSDIR%%/html/gl/images -%%DOCSDIR%%/html/gl/index.html -%%DOCSDIR%%/html/hr/images -%%DOCSDIR%%/html/hr/index.html -%%DOCSDIR%%/html/it/images -%%DOCSDIR%%/html/it/index.html -%%DOCSDIR%%/html/ja/images -%%DOCSDIR%%/html/ja/index.html -%%DOCSDIR%%/html/pt_BR/images -%%DOCSDIR%%/html/pt_BR/index.html -%%DOCSDIR%%/html/ru/images -%%DOCSDIR%%/html/ru/index.html -%%DOCSDIR%%/html/sv/images -%%DOCSDIR%%/html/sv/index.html -%%DOCSDIR%%/html/tr/images -%%DOCSDIR%%/html/tr/index.html -%%DOCSDIR%%/html/ug/images -%%DOCSDIR%%/html/ug/index.html -%%DOCSDIR%%/html/xfce4-session.css -%%DOCSDIR%%/html/zh_CN/images -%%DOCSDIR%%/html/zh_CN/index.html share/icons/hicolor/128x128/apps/xfce4-session.png -share/icons/hicolor/48x48/apps/xfce4-autostart-editor.png share/icons/hicolor/48x48/apps/xfce4-session.png share/icons/hicolor/48x48/apps/xfce4-splash.png share/icons/hicolor/48x48/apps/xfsm-hibernate.png @@ -68,9 +36,6 @@ share/icons/hicolor/48x48/apps/xfsm-reboot.png share/icons/hicolor/48x48/apps/xfsm-shutdown.png share/icons/hicolor/48x48/apps/xfsm-suspend.png -share/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png -share/icons/hicolor/72x72/apps/xfsm-trash-hilight.png -share/icons/hicolor/72x72/apps/xfsm-trash-normal.png share/icons/hicolor/scalable/apps/xfce4-session.svg share/icons/hicolor/scalable/apps/xfsm-shutdown.svg %%NLS%%share/locale/am/LC_MESSAGES/xfce4-session.mo @@ -139,8 +104,6 @@ %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo share/themes/Default/balou/logo.png share/themes/Default/balou/themerc -share/xfce4/panel-plugins/xfsm-logout-plugin.desktop -share/xfce4/tips/tips @dirrmtry share/xfce4/tips @dirrmtry share/xfce4/panel-plugins @dirrmtry share/xfce4 @@ -167,23 +130,6 @@ %%NLS%%@dirrmtry share/locale/bn_IN %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ast -@dirrm %%DOCSDIR%%/html/zh_CN -@dirrm %%DOCSDIR%%/html/ug -@dirrm %%DOCSDIR%%/html/tr -@dirrm %%DOCSDIR%%/html/sv -@dirrm %%DOCSDIR%%/html/ru -@dirrm %%DOCSDIR%%/html/pt_BR -@dirrm %%DOCSDIR%%/html/ja -@dirrm %%DOCSDIR%%/html/it -@dirrm %%DOCSDIR%%/html/hr -@dirrm %%DOCSDIR%%/html/gl -@dirrm %%DOCSDIR%%/html/el/images -@dirrm %%DOCSDIR%%/html/el -@dirrm %%DOCSDIR%%/html/da -@dirrm %%DOCSDIR%%/html/C/images -@dirrm %%DOCSDIR%%/html/C -@dirrm %%DOCSDIR%%/html -@dirrm %%DOCSDIR%% @dirrmtry share/applications @dirrm lib/xfce4/session/splash-engines @dirrm lib/xfce4/session @@ -198,3 +144,5 @@ @dirrmtry etc/xdg/xfce4 @dirrmtry etc/xdg/autostart @dirrmtry etc/xdg +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205171958.q4HJwFLV004140>