aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2019-05-24 10:11:06 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2019-05-24 10:11:06 +0000
commit86c6eb9fa98f0a81a3cae45ed3e187662d6926ae (patch)
tree7f9935bd348eed72c265386390faebf1ed42faea
parent6240a06e4794643629daa3e5b15c8a38719787e4 (diff)
downloadaports-86c6eb9fa98f0a81a3cae45ed3e187662d6926ae.tar.gz
aports-86c6eb9fa98f0a81a3cae45ed3e187662d6926ae.tar.bz2
aports-86c6eb9fa98f0a81a3cae45ed3e187662d6926ae.tar.xz
community/xfce4-session: upgrade to 4.13.2
-rw-r--r--community/xfce4-session/APKBUILD12
-rw-r--r--community/xfce4-session/busybox-shutdown.patch19
-rw-r--r--community/xfce4-session/xfce4-screensaver.patch12
3 files changed, 17 insertions, 26 deletions
diff --git a/community/xfce4-session/APKBUILD b/community/xfce4-session/APKBUILD
index 69dcc77a90..4c5e29e486 100644
--- a/community/xfce4-session/APKBUILD
+++ b/community/xfce4-session/APKBUILD
@@ -1,19 +1,18 @@
# Contributor: Ɓukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xfce4-session
-pkgver=4.13.1
-pkgrel=1
+pkgver=4.13.2
+pkgrel=0
pkgdesc="A session manager for Xfce"
url="https://xfce.org/"
arch="all"
-license="GPL-2.0+"
+license="GPL-2.0-or-later"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
depends="hicolor-icon-theme iceauth dbus-x11"
makedepends="libxfce4ui-dev xfconf-dev libwnck-dev libice-dev xfce4-panel-dev libwnck3-dev dbus-glib-dev"
install=
source="https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
busybox-shutdown.patch
- xfce4-screensaver.patch
"
build() {
@@ -45,6 +44,5 @@ package() {
"$pkgdir"/usr/bin/xfce4-tips
}
-sha512sums="5845e3591919e23ca176199e81075a097ef9d65cbcf23b34d84afc649a307bfa8c6492e3a01855cacff9328da809725213ec1fa9d76024c0a0c25cce3c51da1b xfce4-session-4.13.1.tar.bz2
-745aea2738980b0e8960701af40246b9c3e17ad0c0eb55d1c4629feb7cde472218573c2b27de492c774ae0a5eb503c73088a65df76bde65c9f923edcce03920f busybox-shutdown.patch
-75d9840a3eb3ea1c7891496a5e81164b65e8061c9843f1c4eaeddeca935f56f95c3e12bab9b3cbfc03b15800a31b1a77ec5e4d16e044d8e84138189e390493a1 xfce4-screensaver.patch"
+sha512sums="cb1e63a3df9c4ac3efcb0cce20cb5528f9d1a46731ad4b32634ad5f4a53711f05b40d98464bfd562b4e3d42b2555827ece03e63c6a433e879fa0f0a4ccda6a57 xfce4-session-4.13.2.tar.bz2
+7eab25f534bd4746cf7b8ce8f9245818e47eb0ee73af443c3846dd6d0e3002dced0892142364ce53b688118eafb6d43bbaca8683f85f6103958671328473410c busybox-shutdown.patch"
diff --git a/community/xfce4-session/busybox-shutdown.patch b/community/xfce4-session/busybox-shutdown.patch
index 37423618f0..ca7ac90cc7 100644
--- a/community/xfce4-session/busybox-shutdown.patch
+++ b/community/xfce4-session/busybox-shutdown.patch
@@ -1,13 +1,18 @@
---- 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 @@
+diff --git a/libxfsm/xfsm-shutdown-common.h b/libxfsm/xfsm-shutdown-common.h
+index 3b9fbd0..f7e6dd4 100644
+--- a/libxfsm/xfsm-shutdown-common.h
++++ b/libxfsm/xfsm-shutdown-common.h
+@@ -50,9 +50,12 @@
+ #elif defined(sun) || defined(__sun)
#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"
+-#else
++#elif defined(__GLIBC__)
+ #define POWEROFF_CMD "/sbin/shutdown -h now"
+ #define REBOOT_CMD "/sbin/shutdown -r now"
++#else /* busybox */
+#define POWEROFF_CMD "/sbin/poweroff"
+#define REBOOT_CMD "/sbin/reboot"
#endif
-
+ #ifdef BACKEND_TYPE_FREEBSD
diff --git a/community/xfce4-session/xfce4-screensaver.patch b/community/xfce4-session/xfce4-screensaver.patch
deleted file mode 100644
index 2cb31b04be..0000000000
--- a/community/xfce4-session/xfce4-screensaver.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/scripts/xflock4 b/scripts/xflock4
-index 32770b4..525e6e2 100644
---- a/scripts/xflock4
-+++ b/scripts/xflock4
-@@ -30,6 +30,7 @@ LOCK_CMD=$(xfconf-query -c xfce4-session -p /general/LockCommand)
- # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
- for lock_cmd in \
- "$LOCK_CMD" \
-+ "xfce4-screensaver-command --lock" \
- "xscreensaver-command -lock" \
- "gnome-screensaver-command --lock"
- do