Date: Sun, 10 Apr 2011 17:32:38 GMT From: Olivier Duchateau <duchateau.olivier@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/156312: [UPDATE] x11-wm/xfce4-session to 4.8.1 Message-ID: <201104101732.p3AHWcCL073582@red.freebsd.org> Resent-Message-ID: <201104101740.p3AHe8MX035459@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 156312 >Category: ports >Synopsis: [UPDATE] x11-wm/xfce4-session to 4.8.1 >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: Sun Apr 10 17:40:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Olivier Duchateau >Release: FreeBSD 8.2-RELEASE >Organization: >Environment: FreeBSD bornem.errements.net 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Fri Feb 18 02:24:46 UTC 2011 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: To work with this patch, sysutils/policykit need to be installed. PolicyKit.conf is now deprecated. We must add .pkla file in /usr/local/etc/polkit-1/localauthority/50-local.d directory. Mine looks like [Restart] Identity=unix-group:users Action=org.freedesktop.consolekit.system.restart ResultAny=yes ResultInactive=yes ResultActive=yes [Shutdown] Identity=unix-group:users Action=org.freedesktop.consolekit.system.stop ResultAny=yes ResultInactive=yes ResultActive=yes 'users' is main group on my system. Good documentation http://hal.freedesktop.org/docs/polkit/pklocalauthority.8.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 2011-03-03 11:12:29.000000000 +0100 +++ xfce4-session/Makefile 2011-04-10 18:29:20.000000000 +0200 @@ -6,32 +6,44 @@ # PORTNAME= xfce4-session -PORTVERSION= 4.8.0 +PORTVERSION= 4.8.1 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} +MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= oliver@FreeBSD.org COMMENT= Session manager for the Xfce 4 desktop environment BUILD_DEPENDS= iceauth:${PORTSDIR}/x11/iceauth -RUN_DEPENDS= iceauth:${PORTSDIR}/x11/iceauth +RUN_DEPENDS= iceauth:${PORTSDIR}/x11/iceauth \ + console-kit-daemon:${PORTSDIR}/sysutils/consolekit LIB_DEPENDS= wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib + dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + hal.1:${PORTSDIR}/sysutils/hal \ + upower-glib.1:${PORTSDIR}/sysutils/upower \ + polkit.2:${PORTSDIR}/sysutils/policykit USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig +USE_GNOME= gnomehack gtk20 intltool intlhack pkgconfig USE_LDCONFIG= yes -USE_XFCE= configenv libgui libmenu libutil xfconf +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 + +OPTIONS= NLS "Enable Native Language Support" on + MAN1= xfce4-session.1 xfce4-session-logout.1 -#PLIST_SUB= VERSION="${PORTVERSION:R}" PLIST_SUB= VERSION="4.6" .if !defined(WITHOUT_NLS) diff -urN /usr/ports/x11-wm/xfce4-session/distinfo xfce4-session/distinfo --- /usr/ports/x11-wm/xfce4-session/distinfo 2011-03-03 11:12:29.000000000 +0100 +++ xfce4-session/distinfo 2011-04-10 18:12:10.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-session-4.8.0.tar.bz2) = b93b6e06e28c97c1968cf9283b82618f4a4fdbf2ba838e8303e38122867a25d3 -SIZE (xfce4/xfce4-session-4.8.0.tar.bz2) = 1462995 +SHA256 (xfce4/xfce4-session-4.8.1.tar.bz2) = 1df52a77d87ed4d27b4f40a2f03a0b6334422d64bdc4e31b9aac22e25e68b829 +SIZE (xfce4/xfce4-session-4.8.1.tar.bz2) = 1469105 diff -urN /usr/ports/x11-wm/xfce4-session/files/patch-Makefile.in xfce4-session/files/patch-Makefile.in --- /usr/ports/x11-wm/xfce4-session/files/patch-Makefile.in 2010-05-31 17:27:31.000000000 +0200 +++ xfce4-session/files/patch-Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ ---- Makefile.in.orig 2010-05-21 18:58:41.000000000 +0200 -+++ Makefile.in 2010-05-24 12:01:05.000000000 +0200 -@@ -293,7 +293,6 @@ - top_srcdir = @top_srcdir@ - SUBDIRS = \ - libxfsm \ -- doc \ - engines \ - icons \ - po \ -@@ -809,7 +808,7 @@ - dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-local distclean-tags \ -- distcleancheck distdir distuninstallcheck dvi dvi-am html \ -+ distcleancheck distdir distuninstallcheck dvi dvi-am \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ -@@ -821,8 +820,6 @@ - uninstall uninstall-am - - --html: -- (cd doc && $(MAKE) $(AM_MAKEFLAGS) html) - - distclean-local: - rm -rf xfce4-session.spec *.cache *~ 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 1970-01-01 01:00:00.000000000 +0100 +++ xfce4-session/files/patch-xfce4-session_xfsm-shutdown-helper.c 2011-04-10 18:12:10.000000000 +0200 @@ -0,0 +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> + #endif + ++#include <sys/param.h> ++#include <sys/user.h> ++#include <sys/sysctl.h> + #include <dbus/dbus.h> + #include <dbus/dbus-glib-lowlevel.h> + diff -urN /usr/ports/x11-wm/xfce4-session/pkg-plist xfce4-session/pkg-plist --- /usr/ports/x11-wm/xfce4-session/pkg-plist 2011-03-03 11:12:29.000000000 +0100 +++ xfce4-session/pkg-plist 2011-04-10 18:21:37.000000000 +0200 @@ -10,6 +10,11 @@ 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 lib/xfce4/session/splash-engines/libbalou.la lib/xfce4/session/splash-engines/libbalou.so @@ -19,12 +24,31 @@ lib/xfce4/session/splash-engines/libsimple.a lib/xfce4/session/splash-engines/libsimple.la lib/xfce4/session/splash-engines/libsimple.so -libdata/pkgconfig/xfce4-session-2.0.pc -lib/xfce4/session/balou-export-theme -lib/xfce4/session/balou-install-theme lib/xfce4/session/xfsm-shutdown-helper +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 +%%DOCSDIR%%/html/el/index.html +%%DOCSDIR%%/html/gl/images +%%DOCSDIR%%/html/gl/index.html +%%DOCSDIR%%/html/it/images +%%DOCSDIR%%/html/it/index.html +%%DOCSDIR%%/html/ja/images +%%DOCSDIR%%/html/ja/index.html +%%DOCSDIR%%/html/ru/images +%%DOCSDIR%%/html/ru/index.html +%%DOCSDIR%%/html/sv/images +%%DOCSDIR%%/html/sv/index.html +%%DOCSDIR%%/html/ug/images +%%DOCSDIR%%/html/ug/index.html +%%DOCSDIR%%/html/xfce4-session.css 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 @@ -34,7 +58,7 @@ 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/6%%VERSION%%4/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 @@ -101,139 +125,48 @@ %%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 @dirrm share/xfce4/tips +@dirrmtry share/xfce4/panel-plugins @dirrmtry share/xfce4 @dirrm share/themes/Default/balou @dirrmtry share/themes/Default @dirrmtry share/themes -%%NLS%%@dirrmtry share/applications -%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/zh_TW -%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/zh_CN -%%NLS%%@dirrmtry share/locale/vi/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/vi %%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ur_PK %%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ur -%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/uk %%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ug -%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/tr -%%NLS%%@dirrmtry share/locale/ta/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/ta -%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/sv -%%NLS%%@dirrmtry share/locale/sq/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/sq -%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/sk %%NLS%%@dirrmtry share/locale/si/LC_MESSAGES %%NLS%%@dirrmtry share/locale/si -%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/ru -%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/ro -%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/pt_BR -%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/pt -%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/pl -%%NLS%%@dirrmtry share/locale/pa/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/pa -%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/nl -%%NLS%%@dirrmtry share/locale/nb/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/nb -%%NLS%%@dirrmtry share/locale/ms/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/ms %%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES %%NLS%%@dirrmtry share/locale/mr -%%NLS%%@dirrmtry share/locale/mk/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/mk -%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/lv -%%NLS%%@dirrmtry share/locale/lt/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/lt -%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/ko %%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES %%NLS%%@dirrmtry share/locale/kk -%%NLS%%@dirrmtry share/locale/ka/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/ka -%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/ja -%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/it -%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/id -%%NLS%%@dirrmtry share/locale/hu/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/hu -%%NLS%%@dirrmtry share/locale/hi/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/hi -%%NLS%%@dirrmtry share/locale/he/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/he -%%NLS%%@dirrmtry share/locale/gu/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/gu -%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/gl -%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/fr -%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/fi -%%NLS%%@dirrmtry share/locale/fa/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/fa -%%NLS%%@dirrmtry share/locale/eu/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/eu -%%NLS%%@dirrmtry share/locale/et/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/et -%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/es -%%NLS%%@dirrmtry share/locale/eo/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/eo -%%NLS%%@dirrmtry share/locale/en_GB/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/en_GB -%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/el %%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES %%NLS%%@dirrmtry share/locale/dz -%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/de -%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/da -%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/cs -%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/ca %%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES %%NLS%%@dirrmtry share/locale/bn_IN -%%NLS%%@dirrmtry share/locale/be/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/be -%%NLS%%@dirrmtry share/locale/az/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/az %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ast -%%NLS%%@dirrmtry share/locale/ar/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/ar -%%NLS%%@dirrmtry share/locale/am/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/am -@dirrmtry share/icons/hicolor/scalable/apps -@dirrmtry share/icons/hicolor/scalable -@dirrmtry share/icons/hicolor/72x72/apps -@dirrmtry share/icons/hicolor/72x72 -@dirrmtry share/icons/hicolor/64x64/apps -@dirrmtry share/icons/hicolor/64x64 -@dirrmtry share/icons/hicolor/48x48/apps -@dirrmtry share/icons/hicolor/48x48 -@dirrmtry share/icons/hicolor/128x128/apps -@dirrmtry share/icons/hicolor/128x128 +@dirrm %%DOCSDIR%%/html/ug +@dirrm %%DOCSDIR%%/html/sv +@dirrm %%DOCSDIR%%/html/ru +@dirrm %%DOCSDIR%%/html/ja +@dirrm %%DOCSDIR%%/html/it +@dirrm %%DOCSDIR%%/html/gl +@dirrm %%DOCSDIR%%/html/el +@dirrm %%DOCSDIR%%/html/da +@dirrm %%DOCSDIR%%/html/C/images +@dirrm %%DOCSDIR%%/html/C +@dirrm %%DOCSDIR%%/html +@dirrm %%DOCSDIR%% @dirrm lib/xfce4/session/splash-engines @dirrm lib/xfce4/session +@dirrmtry lib/xfce4/panel/plugins +@dirrmtry lib/xfce4/panel @dirrmtry lib/xfce4 @dirrm include/xfce4/xfce4-session-%%VERSION%%/libxfsm @dirrm include/xfce4/xfce4-session-%%VERSION%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104101732.p3AHWcCL073582>