[arch-commits] Commit in openbox/repos/community-x86_64 (7 files)
Chih-Hsuan Yen
yan12125 at archlinux.org
Wed Oct 16 17:21:44 UTC 2019
Date: Wednesday, October 16, 2019 @ 17:21:43
Author: yan12125
Revision: 516369
archrelease: copy trunk to community-x86_64
Added:
openbox/repos/community-x86_64/PKGBUILD
(from rev 516368, openbox/trunk/PKGBUILD)
openbox/repos/community-x86_64/openbox-3.5.0-title-matching.patch
(from rev 516368, openbox/trunk/openbox-3.5.0-title-matching.patch)
openbox/repos/community-x86_64/openbox-3.5.0-which-2.20.patch
(from rev 516368, openbox/trunk/openbox-3.5.0-which-2.20.patch)
openbox/repos/community-x86_64/openbox-kde-paths.patch
(from rev 516368, openbox/trunk/openbox-kde-paths.patch)
Deleted:
openbox/repos/community-x86_64/PKGBUILD
openbox/repos/community-x86_64/openbox-3.5.0-title-matching.patch
openbox/repos/community-x86_64/openbox-3.5.0-which-2.20.patch
------------------------------------+
PKGBUILD | 128 +++++++++++++++++------------------
openbox-3.5.0-title-matching.patch | 22 +++---
openbox-3.5.0-which-2.20.patch | 22 +++---
openbox-kde-paths.patch | 22 ++++++
4 files changed, 108 insertions(+), 86 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-16 17:21:21 UTC (rev 516368)
+++ PKGBUILD 2019-10-16 17:21:43 UTC (rev 516369)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Florian pritz <bluewind at xinu.at>
-# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Brad Fanella <bradfanella at archlinux.us>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: tobias <tobias at archlinux.org>
-
-pkgname=openbox
-pkgver=3.6.1
-pkgrel=4
-pkgdesc='Highly configurable and lightweight X11 window manager'
-arch=('x86_64')
-url='http://openbox.org'
-license=('GPL')
-provides=(libobrender.so)
-depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
- 'libxcursor' 'pango' 'imlib2' 'librsvg' 'libsm')
-optdepends=('plasma-workspace: for the KDE/Openbox xsession'
- 'python2-xdg: for the openbox-xdg-autostart script')
-groups=('lxde' 'lxde-gtk3' 'lxqt')
-backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml'
- '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)
-md5sums=('b72794996c6a3ad94634727b95f9d204'
- 'SKIP'
- '0a11d7149da210a31ef88f8a9c717711'
- '7ca3b5244bb092d46f5bcf1e2bdf4a18')
-validpgpkeys=(4B71379A9D5263D112A85620A5A4E99C711D3B61)
-
-prepare() {
- cd $pkgname-$pkgver
-
- 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
-
- sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
- data/autostart/openbox-xdg-autostart
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr \
- --with-x \
- --enable-startup-notification \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/openbox
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- # GNOME Panel is no longer available in the official repositories
- rm -r "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control,openbox-gnome-session} \
- "$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
-}
Copied: openbox/repos/community-x86_64/PKGBUILD (from rev 516368, openbox/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-10-16 17:21:43 UTC (rev 516369)
@@ -0,0 +1,64 @@
+# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
+# Contributor: Florian pritz <bluewind at xinu.at>
+# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+
+pkgname=openbox
+pkgver=3.6.1
+pkgrel=5
+pkgdesc='Highly configurable and lightweight X11 window manager'
+arch=('x86_64')
+url='http://openbox.org'
+license=('GPL')
+provides=(libobrender.so)
+depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
+ 'libxcursor' 'pango' 'imlib2' 'librsvg' 'libsm')
+optdepends=('plasma-workspace: for the KDE/Openbox xsession'
+ 'python2-xdg: for the openbox-xdg-autostart script')
+groups=('lxde' 'lxde-gtk3' 'lxqt')
+backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml'
+ '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
+ $pkgname-kde-paths.patch)
+md5sums=('b72794996c6a3ad94634727b95f9d204'
+ 'SKIP'
+ '0a11d7149da210a31ef88f8a9c717711'
+ '7ca3b5244bb092d46f5bcf1e2bdf4a18'
+ 'f7df0df8c1d2da279e48d0fdc984fb71')
+validpgpkeys=(4B71379A9D5263D112A85620A5A4E99C711D3B61)
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ 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
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-x \
+ --enable-startup-notification \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/openbox
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ # GNOME Panel is no longer available in the official repositories
+ rm -r "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control,openbox-gnome-session} \
+ "$pkgdir"/usr/share/gnome{,-session} \
+ "$pkgdir"/usr/share/man/man1/openbox-gnome-session.1 \
+ "$pkgdir"/usr/share/xsessions/openbox-gnome.desktop
+}
Deleted: openbox-3.5.0-title-matching.patch
===================================================================
--- openbox-3.5.0-title-matching.patch 2019-10-16 17:21:21 UTC (rev 516368)
+++ openbox-3.5.0-title-matching.patch 2019-10-16 17:21:43 UTC (rev 516369)
@@ -1,11 +0,0 @@
---- openbox-3.5.0/openbox/client.c 2011-08-01 22:14:58.000000000 +0200
-+++ openbox-3.5.0/openbox/client.c 2011-10-22 14:59:56.000000000 +0200
-@@ -883,7 +883,7 @@
- !g_pattern_match(app->role,
- strlen(self->role), self->role, NULL))
- match = FALSE;
-- else if (app->title &&
-+ else if (app->title && self->title &&
- !g_pattern_match(app->title,
- strlen(self->title), self->title, NULL))
- match = FALSE;
Copied: openbox/repos/community-x86_64/openbox-3.5.0-title-matching.patch (from rev 516368, openbox/trunk/openbox-3.5.0-title-matching.patch)
===================================================================
--- openbox-3.5.0-title-matching.patch (rev 0)
+++ openbox-3.5.0-title-matching.patch 2019-10-16 17:21:43 UTC (rev 516369)
@@ -0,0 +1,11 @@
+--- openbox-3.5.0/openbox/client.c 2011-08-01 22:14:58.000000000 +0200
++++ openbox-3.5.0/openbox/client.c 2011-10-22 14:59:56.000000000 +0200
+@@ -883,7 +883,7 @@
+ !g_pattern_match(app->role,
+ strlen(self->role), self->role, NULL))
+ match = FALSE;
+- else if (app->title &&
++ else if (app->title && self->title &&
+ !g_pattern_match(app->title,
+ strlen(self->title), self->title, NULL))
+ match = FALSE;
Deleted: openbox-3.5.0-which-2.20.patch
===================================================================
--- openbox-3.5.0-which-2.20.patch 2019-10-16 17:21:21 UTC (rev 516368)
+++ openbox-3.5.0-which-2.20.patch 2019-10-16 17:21:43 UTC (rev 516369)
@@ -1,11 +0,0 @@
---- openbox-3.5.0/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000
-+++ openbox-3.5.0/data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000
-@@ -8,7 +8,7 @@
- #
- #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
- # @libexecdir@/gnome-settings-daemon &
--#elif which gnome-settings-daemon >/dev/null; then
-+#elif which gnome-settings-daemon >/dev/null 2>&1; then
- # gnome-settings-daemon &
- #fi
-
Copied: openbox/repos/community-x86_64/openbox-3.5.0-which-2.20.patch (from rev 516368, openbox/trunk/openbox-3.5.0-which-2.20.patch)
===================================================================
--- openbox-3.5.0-which-2.20.patch (rev 0)
+++ openbox-3.5.0-which-2.20.patch 2019-10-16 17:21:43 UTC (rev 516369)
@@ -0,0 +1,11 @@
+--- openbox-3.5.0/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000
++++ openbox-3.5.0/data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000
+@@ -8,7 +8,7 @@
+ #
+ #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
+ # @libexecdir@/gnome-settings-daemon &
+-#elif which gnome-settings-daemon >/dev/null; then
++#elif which gnome-settings-daemon >/dev/null 2>&1; then
+ # gnome-settings-daemon &
+ #fi
+
Copied: openbox/repos/community-x86_64/openbox-kde-paths.patch (from rev 516368, openbox/trunk/openbox-kde-paths.patch)
===================================================================
--- openbox-kde-paths.patch (rev 0)
+++ openbox-kde-paths.patch 2019-10-16 17:21:43 UTC (rev 516369)
@@ -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
More information about the arch-commits
mailing list