Update to xfce4-session 4.8.0.

Disable support for HAL & upower (linux-only), policykit and consolekit
(sudo backend for shutdown/reboot works just fine atm)
This commit is contained in:
landry 2011-01-18 20:36:51 +00:00
parent e64ff1b3ae
commit 8e043b2447
7 changed files with 102 additions and 76 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.44 2010/11/22 08:37:06 espie Exp $
# $OpenBSD: Makefile,v 1.45 2011/01/18 20:36:51 landry Exp $
COMMENT= Xfce4 session manager
XFCE_PROJECT= xfce4-session
REVISION= 4
SHARED_LIBS += xfsm-4.6 0.0 # .0.0
@ -16,20 +15,28 @@ PERMIT_PACKAGE_FTP= Yes
MODULES= x11/xfce4
DESKTOP_FILES= Yes
CONFIGURE_ARGS= --enable-session-screenshots
LIB_DEPENDS= x11/xfce4/libxfcegui4 \
x11/xfce4/xfconf \
CONFIGURE_ARGS= --disable-linker-opts \
--disable-hal \
--disable-polkit \
--disable-consolekit \
--disable-upower
#CONFIGURE_ARGS+= --enable-session-screenshots
#XXX session-screenshots broken?
# http://bugzilla.xfce.org/show_bug.cgi?id=6885
LIB_DEPENDS= x11/xfce4/libxfce4ui>=4.8.0\
x11/xfce4/xfce4-panel>=4.8.0 \
x11/xfce4/xfconf>=4.8.0 \
devel/libwnck
WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender XRes atk-1.0 c cairo dbus-1 \
dbus-glib-1 expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
gio-2.0 glade-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \
gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \
gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \
pixman-1 png pthread startup-notification-1 xfce4util xml2 z \
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 wnck-1 xfconf-0 xfcegui4
gthread-2.0 xcb-render wnck-1 xfconf-0 GL Xxf86vm drm \
xcb-shm xfce4panel-1.0 xfce4ui-1
FAKE_FLAGS= settingsdir=${PREFIX}/share/examples/xfce4-session

View File

@ -1,5 +1,5 @@
MD5 (xfce4/xfce4-session-4.6.2.tar.bz2) = nZiQEw5F4OlHZZHtm6LJ1Q==
RMD160 (xfce4/xfce4-session-4.6.2.tar.bz2) = PEUCjVeu5ZUKSF12B5nQx0rac14=
SHA1 (xfce4/xfce4-session-4.6.2.tar.bz2) = Kld4oVQ/l4RfEYoYbi27io6j/0s=
SHA256 (xfce4/xfce4-session-4.6.2.tar.bz2) = cl4mklTDTFMKy2cPXM0P1ptXy+nyF2q9hJn8XW3NMKg=
SIZE (xfce4/xfce4-session-4.6.2.tar.bz2) = 1385541
MD5 (xfce4/xfce4-session-4.8.0.tar.bz2) = dUC9Z1EkIRcghAmti3NmaA==
RMD160 (xfce4/xfce4-session-4.8.0.tar.bz2) = oZ40+JGSLyBIKMrOlZlieFbLNF4=
SHA1 (xfce4/xfce4-session-4.8.0.tar.bz2) = R3GkPY+lE9NjzPlv9DganEXoM7k=
SHA256 (xfce4/xfce4-session-4.8.0.tar.bz2) = uTtuBuKMl8GWjPkoO4Jhj0pP2/K6g46DA+OBIoZ6JdM=
SIZE (xfce4/xfce4-session-4.8.0.tar.bz2) = 1462995

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-xfce4-tips_Makefile_in,v 1.2 2010/06/05 15:26:33 landry Exp $
--- xfce4-tips/Makefile.in.orig Fri May 21 18:58:41 2010
+++ xfce4-tips/Makefile.in Wed Jun 2 20:43:04 2010
@@ -338,7 +338,7 @@ xfce4_tips_CFLAGS = \
xfce4_tips_LDADD = \
@LIBXFCEGUI4_LIBS@
$OpenBSD: patch-xfce4-tips_Makefile_in,v 1.3 2011/01/18 20:36:51 landry Exp $
--- xfce4-tips/Makefile.in.orig Wed Nov 3 21:11:43 2010
+++ xfce4-tips/Makefile.in Fri Nov 5 23:49:30 2010
@@ -366,7 +366,7 @@ xfce4_tips_LDADD = \
@LIBXFCE4UI_LIBS@ \
@XFCONF_LIBS@
-desktopdir = $(sysconfdir)/xdg/autostart
+desktopdir = $(prefix)/share/examples/xfce4-session

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-xfce4-tips_main_c,v 1.1 2007/05/08 14:14:03 steven Exp $
--- xfce4-tips/main.c.orig Tue Apr 24 23:40:51 2007
+++ xfce4-tips/main.c Tue Apr 24 23:41:12 2007
@@ -115,11 +115,11 @@ next_cb(GtkWidget *btn, GtkTextBuffer *textbuf)
switch (option) {
case OPTION_TIPS:
- strcpy(buffer, "fortune " TIPSDIR "/tips");
+ strcpy(buffer, "/usr/games/fortune " TIPSDIR "/tips");
break;
case OPTION_FORTUNES:
- strcpy(buffer, "fortune");
+ strcpy(buffer, "/usr/games/fortune");
break;
}

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2009/03/08 17:16:53 landry Exp $
@comment $OpenBSD: PFRAG.shared,v 1.5 2011/01/18 20:36:51 landry Exp $
@lib lib/libxfsm-4.6.so.${LIBxfsm-4.6_VERSION}
lib/xfce4/splash/engines/libbalou.so
lib/xfce4/splash/engines/libmice.so
lib/xfce4/splash/engines/libsimple.so
lib/xfce4/panel/plugins/libxfsm-logout-plugin.so
lib/xfce4/session/splash-engines/libbalou.so
lib/xfce4/session/splash-engines/libmice.so
lib/xfce4/session/splash-engines/libsimple.so

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.17 2010/11/11 10:09:34 landry Exp $
@comment $OpenBSD: PLIST,v 1.18 2011/01/18 20:36:51 landry Exp $
@conflict xfce4-toys-*
%%SHARED%%
@bin bin/xfce4-session
@ -15,21 +15,59 @@ lib/libxfsm-4.6.la
lib/pkgconfig/
lib/pkgconfig/xfce4-session-2.0.pc
lib/xfce4/
lib/xfce4/splash/
lib/xfce4/splash/engines/
lib/xfce4/splash/engines/libbalou.a
lib/xfce4/splash/engines/libbalou.la
lib/xfce4/splash/engines/libmice.a
lib/xfce4/splash/engines/libmice.la
lib/xfce4/splash/engines/libsimple.a
lib/xfce4/splash/engines/libsimple.la
libexec/balou-export-theme
libexec/balou-install-theme
@bin libexec/xfsm-shutdown-helper
lib/xfce4/panel/
lib/xfce4/panel/plugins/
lib/xfce4/panel/plugins/libxfsm-logout-plugin.a
lib/xfce4/panel/plugins/libxfsm-logout-plugin.la
lib/xfce4/session/
lib/xfce4/session/balou-export-theme
lib/xfce4/session/balou-install-theme
lib/xfce4/session/splash-engines/
lib/xfce4/session/splash-engines/libbalou.a
lib/xfce4/session/splash-engines/libbalou.la
lib/xfce4/session/splash-engines/libmice.a
lib/xfce4/session/splash-engines/libmice.la
lib/xfce4/session/splash-engines/libsimple.a
lib/xfce4/session/splash-engines/libsimple.la
@bin lib/xfce4/session/xfsm-shutdown-helper
@man man/man1/xfce4-session-logout.1
@man man/man1/xfce4-session.1
share/applications/xfce-session-settings.desktop
share/applications/xfce4-session-logout.desktop
share/doc/pkg-readmes/${FULLPKGNAME}
share/doc/xfce4-session/
share/doc/xfce4-session/html/
share/doc/xfce4-session/html/C/
share/doc/xfce4-session/html/C/images/
share/doc/xfce4-session/html/C/images/xfsm-advanced.png
share/doc/xfce4-session/html/C/images/xfsm-general.png
share/doc/xfce4-session/html/C/images/xfsm-splash.png
share/doc/xfce4-session/html/C/index.html
share/doc/xfce4-session/html/da/
share/doc/xfce4-session/html/da/images
share/doc/xfce4-session/html/da/index.html
share/doc/xfce4-session/html/el/
share/doc/xfce4-session/html/el/images
share/doc/xfce4-session/html/el/index.html
share/doc/xfce4-session/html/gl/
share/doc/xfce4-session/html/gl/images
share/doc/xfce4-session/html/gl/index.html
share/doc/xfce4-session/html/it/
share/doc/xfce4-session/html/it/images
share/doc/xfce4-session/html/it/index.html
share/doc/xfce4-session/html/ja/
share/doc/xfce4-session/html/ja/images
share/doc/xfce4-session/html/ja/index.html
share/doc/xfce4-session/html/ru/
share/doc/xfce4-session/html/ru/images
share/doc/xfce4-session/html/ru/index.html
share/doc/xfce4-session/html/sv/
share/doc/xfce4-session/html/sv/images
share/doc/xfce4-session/html/sv/index.html
share/doc/xfce4-session/html/ug/
share/doc/xfce4-session/html/ug/images
share/doc/xfce4-session/html/ug/index.html
share/doc/xfce4-session/html/xfce4-session.css
share/examples/xfce4-session/
@sample ${SYSCONFDIR}/xdg/
@sample ${SYSCONFDIR}/xdg/xfce4/xfconf/
@ -78,6 +116,9 @@ share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/xfce4-session.mo
share/locale/be/LC_MESSAGES/xfce4-session.mo
share/locale/bn/
share/locale/bn/LC_MESSAGES/
share/locale/bn/LC_MESSAGES/xfce4-session.mo
share/locale/bn_IN/
share/locale/bn_IN/LC_MESSAGES/
share/locale/bn_IN/LC_MESSAGES/xfce4-session.mo
@ -112,6 +153,7 @@ share/locale/he/LC_MESSAGES/xfce4-session.mo
share/locale/hi/
share/locale/hi/LC_MESSAGES/
share/locale/hi/LC_MESSAGES/xfce4-session.mo
share/locale/hr/LC_MESSAGES/xfce4-session.mo
share/locale/hu/LC_MESSAGES/xfce4-session.mo
share/locale/id/LC_MESSAGES/xfce4-session.mo
share/locale/it/LC_MESSAGES/xfce4-session.mo
@ -177,22 +219,10 @@ share/themes/Default/balou/
share/themes/Default/balou/logo.png
share/themes/Default/balou/themerc
share/xfce4/
share/xfce4/doc/
share/xfce4/doc/C/
share/xfce4/doc/C/images/
share/xfce4/doc/C/images/xfsm-advanced.png
share/xfce4/doc/C/images/xfsm-general.png
share/xfce4/doc/C/images/xfsm-splash.png
share/xfce4/doc/C/xfce4-session.html
share/xfce4/doc/fr/
share/xfce4/doc/fr/images/
share/xfce4/doc/fr/images/xfsm-advanced.png
share/xfce4/doc/fr/images/xfsm-general.png
share/xfce4/doc/fr/images/xfsm-splash.png
share/xfce4/doc/fr/xfce4-session.html
share/xfce4/panel-plugins/
share/xfce4/panel-plugins/xfsm-logout-plugin.desktop
share/xfce4/tips/
share/xfce4/tips/tips
share/xfce4/tips/tips.dat
@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

View File

@ -1,9 +1,10 @@
$OpenBSD: README,v 1.2 2010/11/11 10:10:52 jasper Exp $
$OpenBSD: README,v 1.3 2011/01/18 20:36:51 landry Exp $
Tips and tricks for a pleasant Xfce desktop environment experience
==================================================================
- installation
Installation
------------
In order to have a basic Xfce desktop, you should install the
following core packages (this will install the required libraries):
$ sudo pkg_add xfce-utils xfce4-panel xfce4-session xfdesktop xfwm4
@ -13,7 +14,7 @@ $ sudo pkg_add xfwm4-themes gtk-xfce-engine
And some cool xfce-companion apps for a nicer desktop:
$ sudo pkg_add xfce4-terminal orage notification-daemon-xfce ristretto
mousepad xfce4-appfinder xfce4-mixer xfprint
mousepad xfce4-appfinder xfce4-mixer xfprint tumbler
Finally, have a look at available panel plugins here:
http://goodies.xfce.org/projects/panel-plugins/start
@ -22,7 +23,8 @@ And make your choice from plugins available in the ports-tree.
If you want the one-line comment for each port, just do:
$ cd /usr/ports/x11/xfce4 && make show=COMMENT
- startup
Startup
-------
Xfce desktop environment is launched through the 'startxfce4' script,
provided by the xfce-utils package. Simply add
'${LOCALBASE}/bin/startxfce4'
@ -31,7 +33,8 @@ If you use gdm or kdm, have a look at
http://wiki.xfce.org/faq#starting_xfce. An xfce4.desktop file is
provided for use by gdm.
- logging out and shutting down the computer
logging out and shutting down the computer
------------------------------------------
If your installation supports complete shutdown, clicking on the logout
button on panel will permit you to either logout, rebooting or halt
the computer, provided you have the needed sudo credentials.
@ -40,15 +43,17 @@ to the /etc/sudoers file using visudo:
$your_username ALL=NOPASSWD: ${TRUEPREFIX}/libexec/xfsm-shutdown-helper
- thunar file manager tips
Thunar file manager tips
------------------------
Thunar can display resizable svg icons if you install the librsvg
package. A nice svg icon theme is provided by the tango-icon-theme
package.
package.
You can have a look at hotplugd(8) if you want some kind of auto-mount
feature in thunar, provided natively by HAL on Linux and FreeBSD.
feature in thunar, provided natively by gudev on Linux and FreeBSD.
Also, see http://thunar.xfce.org/pwiki/documentation/faq.
- terminal, special characters and localized applications
Terminal, special characters and localized applications
-------------------------------------------------------
If you use a particular non-ascii encoding and have problems seeing
special characters in terminal (like accentued characters in french),
you should add this line to your .xinitrc/.xsession before startxfce4: