From 6d5cf6ed0452946711e3fdf878cc6748b498c190 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 5 Nov 2009 17:49:40 +0000
Subject: x11/xfce4-session: remove tips. fix bb shutdown

tips dont work anyways...
---
 x11/xfce4-session/APKBUILD               | 24 ++++++++++++++++--------
 x11/xfce4-session/busybox-shutdown.patch | 13 +++++++++++++
 2 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 x11/xfce4-session/busybox-shutdown.patch

diff --git a/x11/xfce4-session/APKBUILD b/x11/xfce4-session/APKBUILD
index ec03ece0db..a7c42b9b1d 100644
--- a/x11/xfce4-session/APKBUILD
+++ b/x11/xfce4-session/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfce4-session
 pkgver=4.6.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A session manager for Xfce"
 url="http://www.xfce.org/"
 license="GPL2"
@@ -10,15 +10,16 @@ makedepends="pkgconfig libxfcegui4-dev libwnck-dev libglade-dev intltool
 	gettext-dev libiconv-dev iceauth libice-dev libsm-dev expat-dev
 	e2fsprogs-dev zlib-dev"
 depends="hicolor-icon-theme"
-install="xfce4-session.post-install xfce4-session.post-deinstall"
+install=
 source="http://www.xfce.org/archive/xfce-$pkgver/src/$pkgname-$pkgver.tar.bz2
-	$install"
+	busybox-shutdown.patch"
 
 depends_dev="libxfcegui4-dev xfconf-dev"
 
-build ()
-{
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
+	patch -p1 -i ../busybox-shutdown.patch || return 1
+
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/xfce4 \
@@ -27,11 +28,18 @@ build ()
 		--enable-legacy-sm \
 		--disable-gnome \
 		--enable-session-screenshots \
-		--with-shutdown-style=auto || return 1
+		|| return 1
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
+	# tips doesnt work and i dont like them.
+	# just remove to save space
+	rm -f "$pkgdir"/etc/xdg/autostart/xfce4-tips-autostart.desktop \
+		"$pkgdir"/usr/bin/xfce4-tips
 }
 
 md5sums="7628be41ed3511a20cff5673d9d39858  xfce4-session-4.6.1.tar.bz2
-db51db79681eadc47be4932355a77c25  xfce4-session.post-install
-db51db79681eadc47be4932355a77c25  xfce4-session.post-deinstall"
+bfd9132f08f4a92efbe982fb911c511c  busybox-shutdown.patch"
diff --git a/x11/xfce4-session/busybox-shutdown.patch b/x11/xfce4-session/busybox-shutdown.patch
new file mode 100644
index 0000000000..37423618f0
--- /dev/null
+++ b/x11/xfce4-session/busybox-shutdown.patch
@@ -0,0 +1,13 @@
+--- a/xfsm-shutdown-helper/main.c	Thu Nov  5 17:34:17 2009
++++ b/xfsm-shutdown-helper/main.c	Thu Nov  5 17:36:56 2009
+@@ -64,8 +64,8 @@
+ #define POWEROFF_CMD  "/usr/sbin/shutdown -i 5 -g 0 -y"
+ #define REBOOT_CMD    "/usr/sbin/shutdown -i 6 -g 0 -y"
+ #else
+-#define POWEROFF_CMD  "/sbin/shutdown -h now"
+-#define REBOOT_CMD    "/sbin/shutdown -r now"
++#define POWEROFF_CMD  "/sbin/poweroff"
++#define REBOOT_CMD    "/sbin/reboot"
+ #endif
+ 
+ 
-- 
cgit v1.2.3