Date: Wednesday, October 16, 2019 @ 17:21:21 Author: yan12125 Revision: 516368
upgpkg: openbox 3.6.1-5 - fixes compatibility with KDE 5.17 See: FS#64139 The new patch incorporates the absolute path, so the sed command in package() is no longer needed. Also change the maintainer to myself. Added: openbox/trunk/openbox-kde-paths.patch Modified: openbox/trunk/PKGBUILD -------------------------+ PKGBUILD | 15 ++++++++------- openbox-kde-paths.patch | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-10-16 16:54:48 UTC (rev 516367) +++ PKGBUILD 2019-10-16 17:21:21 UTC (rev 516368) @@ -1,4 +1,5 @@ -# Maintainer: Florian pritz <[email protected]> +# Maintainer: Chih-Hsuan Yen <[email protected]> +# Contributor: Florian pritz <[email protected]> # Contributor: Bartłomiej Piotrowski <[email protected]> # Contributor: Brad Fanella <[email protected]> # Contributor: Andrea Scarpino <[email protected]> @@ -6,7 +7,7 @@ pkgname=openbox pkgver=3.6.1 -pkgrel=4 +pkgrel=5 pkgdesc='Highly configurable and lightweight X11 window manager' arch=('x86_64') url='http://openbox.org' @@ -21,11 +22,13 @@ 'etc/xdg/openbox/autostart' 'etc/xdg/openbox/environment') source=(http://openbox.org/dist/openbox/$pkgname-$pkgver.tar.gz{,.asc} openbox-3.5.0-title-matching.patch - openbox-3.5.0-which-2.20.patch) + openbox-3.5.0-which-2.20.patch + $pkgname-kde-paths.patch) md5sums=('b72794996c6a3ad94634727b95f9d204' 'SKIP' '0a11d7149da210a31ef88f8a9c717711' - '7ca3b5244bb092d46f5bcf1e2bdf4a18') + '7ca3b5244bb092d46f5bcf1e2bdf4a18' + 'f7df0df8c1d2da279e48d0fdc984fb71') validpgpkeys=(4B71379A9D5263D112A85620A5A4E99C711D3B61) prepare() { @@ -33,6 +36,7 @@ patch -Np1 -i "$srcdir"/openbox-3.5.0-title-matching.patch # OB#5277 patch -Np1 -i "$srcdir"/openbox-3.5.0-which-2.20.patch # FS#11455 + patch -Np1 -i "$srcdir"/$pkgname-kde-paths.patch # FS#64139 sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ data/autostart/openbox-xdg-autostart @@ -57,7 +61,4 @@ "$pkgdir"/usr/share/gnome{,-session} \ "$pkgdir"/usr/share/man/man1/openbox-gnome-session.1 \ "$pkgdir"/usr/share/xsessions/openbox-gnome.desktop - - sed -i 's:startkde:/usr/bin/\0:' \ - "$pkgdir"/usr/share/xsessions/openbox-kde.desktop } Added: openbox-kde-paths.patch =================================================================== --- openbox-kde-paths.patch (rev 0) +++ openbox-kde-paths.patch 2019-10-16 17:21:21 UTC (rev 516368) @@ -0,0 +1,22 @@ +diff --git a/data/xsession/openbox-kde-session.in b/data/xsession/openbox-kde-session.in +index 35722796..ee91c16f 100644 +--- a/data/xsession/openbox-kde-session.in ++++ b/data/xsession/openbox-kde-session.in +@@ -17,4 +17,4 @@ xprop -root -remove _NET_NUMBER_OF_DESKTOPS \ + + # Run KDE with Openbox as its window manager + export KDEWM="@bindir@/openbox" +-exec startkde "$@" ++exec /usr/bin/startplasma-x11 "$@" +diff --git a/data/xsession/openbox-kde.desktop.in b/data/xsession/openbox-kde.desktop.in +index bc78a97c..a9bcc219 100644 +--- a/data/xsession/openbox-kde.desktop.in ++++ b/data/xsession/openbox-kde.desktop.in +@@ -2,6 +2,6 @@ + Name=KDE/Openbox + Comment=Use the Openbox window manager inside of the K Desktop Environment + Exec=@bindir@/openbox-kde-session +-TryExec=startkde ++TryExec=/usr/bin/startplasma-x11 + Icon=openbox + Type=Application
