[arch-commits] Commit in openbox/repos (7 files)
Chih-Hsuan Yen
yan12125 at archlinux.org
Sun May 24 02:58:37 UTC 2020
Date: Sunday, May 24, 2020 @ 02:58:36
Author: yan12125
Revision: 632738
archrelease: copy trunk to community-testing-x86_64
Added:
openbox/repos/community-testing-x86_64/
openbox/repos/community-testing-x86_64/PKGBUILD
(from rev 632737, openbox/trunk/PKGBUILD)
openbox/repos/community-testing-x86_64/debian-887908.patch
(from rev 632737, openbox/trunk/debian-887908.patch)
openbox/repos/community-testing-x86_64/openbox-3.5.0-title-matching.patch
(from rev 632737, openbox/trunk/openbox-3.5.0-title-matching.patch)
openbox/repos/community-testing-x86_64/openbox-3.5.0-which-2.20.patch
(from rev 632737, openbox/trunk/openbox-3.5.0-which-2.20.patch)
openbox/repos/community-testing-x86_64/openbox-kde-paths.patch
(from rev 632737, openbox/trunk/openbox-kde-paths.patch)
openbox/repos/community-testing-x86_64/py3.patch
(from rev 632737, openbox/trunk/py3.patch)
------------------------------------+
PKGBUILD | 74 +++++++++++++++
debian-887908.patch | 31 ++++++
openbox-3.5.0-title-matching.patch | 11 ++
openbox-3.5.0-which-2.20.patch | 11 ++
openbox-kde-paths.patch | 22 ++++
py3.patch | 163 +++++++++++++++++++++++++++++++++++
6 files changed, 312 insertions(+)
Copied: openbox/repos/community-testing-x86_64/PKGBUILD (from rev 632737, openbox/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2020-05-24 02:58:36 UTC (rev 632738)
@@ -0,0 +1,74 @@
+# 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=7
+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')
+makedepends=('python')
+optdepends=('plasma-workspace: for the KDE/Openbox xsession'
+ 'python-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
+ py3.patch
+ debian-887908.patch)
+md5sums=('b72794996c6a3ad94634727b95f9d204'
+ 'SKIP'
+ '0a11d7149da210a31ef88f8a9c717711'
+ '7ca3b5244bb092d46f5bcf1e2bdf4a18'
+ 'f7df0df8c1d2da279e48d0fdc984fb71'
+ '67ae9735c283637ef6d11b17a3f81953'
+ '4ff275746641e840605e9a74043079fe')
+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
+ # modified from https://github.com/troycurtisjr/openbox/commit/acfbbc4ea40932f183617bb7006700140fe5f61e
+ patch -Np1 -i "$srcdir"/py3.patch
+ # Taken from https://sources.debian.org/data/main/o/openbox/3.6.1-9/debian/patches/887908.patch
+ # For https://bugs.archlinux.org/task/66738
+ patch -Np1 -i "$srcdir"/debian-887908.patch
+
+ # py3.patch modifies configure.ac
+ autoreconf -ifv
+}
+
+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
+}
Copied: openbox/repos/community-testing-x86_64/debian-887908.patch (from rev 632737, openbox/trunk/debian-887908.patch)
===================================================================
--- community-testing-x86_64/debian-887908.patch (rev 0)
+++ community-testing-x86_64/debian-887908.patch 2020-05-24 02:58:36 UTC (rev 632738)
@@ -0,0 +1,31 @@
+Description: Fix toggled hover and pressed images masks not loaded
+Author: "E. Serradilla" <eserradi at gmx.com>
+Debian-Bugs: https://bugs.debian.org/887908
+
+--- a/obrender/theme.c
++++ b/obrender/theme.c
+@@ -1494,8 +1494,10 @@ static void read_button_styles(XrmDataba
+ READ_BUTTON_MASK_COPY(disabled, btn->unpressed_mask);
+ READ_BUTTON_MASK_COPY(hover, btn->unpressed_mask);
+ if (toggled_mask) {
+- READ_BUTTON_MASK_COPY(pressed_toggled, btn->unpressed_toggled_mask);
+- READ_BUTTON_MASK_COPY(hover_toggled, btn->unpressed_toggled_mask);
++ g_snprintf(name, 128, "%s_toggled_pressed.xbm", btnname);
++ READ_MASK_COPY(name, btn->pressed_toggled_mask, btn->unpressed_toggled_mask);
++ g_snprintf(name, 128, "%s_toggled_hover.xbm", btnname);
++ READ_MASK_COPY(name, btn->hover_toggled_mask, btn->unpressed_toggled_mask);
+ }
+
+ #define READ_BUTTON_APPEARANCE(typedots, type, fallback) \
+@@ -1532,8 +1534,8 @@ static void read_button_styles(XrmDataba
+ READ_BUTTON_APPEARANCE("disabled", disabled, 0);
+ READ_BUTTON_APPEARANCE("hover", hover, 0);
+ if (toggled_mask) {
+- READ_BUTTON_APPEARANCE("unpressed.toggled", unpressed_toggled, 1);
+- READ_BUTTON_APPEARANCE("pressed.toggled", pressed_toggled, 0);
+- READ_BUTTON_APPEARANCE("hover.toggled", hover_toggled, 0);
++ READ_BUTTON_APPEARANCE("toggled.unpressed", unpressed_toggled, 1);
++ READ_BUTTON_APPEARANCE("toggled.pressed", pressed_toggled, 0);
++ READ_BUTTON_APPEARANCE("toggled.hover", hover_toggled, 0);
+ }
+ }
Copied: openbox/repos/community-testing-x86_64/openbox-3.5.0-title-matching.patch (from rev 632737, openbox/trunk/openbox-3.5.0-title-matching.patch)
===================================================================
--- community-testing-x86_64/openbox-3.5.0-title-matching.patch (rev 0)
+++ community-testing-x86_64/openbox-3.5.0-title-matching.patch 2020-05-24 02:58:36 UTC (rev 632738)
@@ -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;
Copied: openbox/repos/community-testing-x86_64/openbox-3.5.0-which-2.20.patch (from rev 632737, openbox/trunk/openbox-3.5.0-which-2.20.patch)
===================================================================
--- community-testing-x86_64/openbox-3.5.0-which-2.20.patch (rev 0)
+++ community-testing-x86_64/openbox-3.5.0-which-2.20.patch 2020-05-24 02:58:36 UTC (rev 632738)
@@ -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-testing-x86_64/openbox-kde-paths.patch (from rev 632737, openbox/trunk/openbox-kde-paths.patch)
===================================================================
--- community-testing-x86_64/openbox-kde-paths.patch (rev 0)
+++ community-testing-x86_64/openbox-kde-paths.patch 2020-05-24 02:58:36 UTC (rev 632738)
@@ -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
Copied: openbox/repos/community-testing-x86_64/py3.patch (from rev 632737, openbox/trunk/py3.patch)
===================================================================
--- community-testing-x86_64/py3.patch (rev 0)
+++ community-testing-x86_64/py3.patch 2020-05-24 02:58:36 UTC (rev 632738)
@@ -0,0 +1,163 @@
+From acfbbc4ea40932f183617bb7006700140fe5f61e Mon Sep 17 00:00:00 2001
+From: Troy Curtis Jr <troycurtisjr at gmail.com>
+Date: Wed, 13 Sep 2017 21:59:48 -0500
+Subject: [PATCH] Add python3 support to openbox-xdg-autostart.
+
+Updated syntax in openbox-xdg-autostart to support both python2 and
+python3.
+
+Added a configure substitution to set the choosen python at build time.
+
+https://bugzilla.icculus.org/show_bug.cgi?id=6444
+---
+ .gitignore | 1 +
+ configure.ac | 3 +
+ ...xdg-autostart => openbox-xdg-autostart.in} | 70 +++++++++----------
+ 3 files changed, 38 insertions(+), 36 deletions(-)
+ rename data/autostart/{openbox-xdg-autostart => openbox-xdg-autostart.in} (77%)
+
+diff --git a/configure.ac b/configure.ac
+index ca1602670..9a31e9845 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -103,6 +103,8 @@ AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h grp.h locale.h pwd.h)
+ AC_CHECK_HEADERS(signal.h string.h stdio.h stdlib.h unistd.h sys/stat.h)
+ AC_CHECK_HEADERS(sys/select.h sys/socket.h sys/time.h sys/types.h sys/wait.h)
+
++AM_PATH_PYTHON([2],,)
++
+ AC_PATH_PROG([SED], [sed], [no])
+ if test "$SED" = "no"; then
+ AC_MSG_ERROR([The program "sed" is not available. This program is required to build Openbox.])
+@@ -259,6 +261,7 @@ AC_CONFIG_FILES([
+ obrender/version.h
+ obt/version.h
+ version.h
++ data/autostart/openbox-xdg-autostart
+ ])
+ AC_CONFIG_COMMANDS([doc],
+ [test -d doc || mkdir doc])
+diff --git a/data/autostart/openbox-xdg-autostart b/data/autostart/openbox-xdg-autostart.in
+similarity index 77%
+rename from data/autostart/openbox-xdg-autostart
+rename to data/autostart/openbox-xdg-autostart.in
+index 04a17a199..3c365b112 100755
+--- a/data/autostart/openbox-xdg-autostart
++++ b/data/autostart/openbox-xdg-autostart.in
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!@PYTHON@
+
+ # openbox-xdg-autostart runs things based on the XDG autostart specification
+ # Copyright (C) 2008 Dana Jansens
+@@ -28,9 +28,7 @@ try:
+ from xdg.DesktopEntry import DesktopEntry
+ from xdg.Exceptions import ParsingError
+ except ImportError:
+- print
+- print >>sys.stderr, "ERROR:", ME, "requires PyXDG to be installed"
+- print
++ sys.stderr.write("\nERROR: %s requires PyXDG to be installed\n" % ME)
+ sys.exit(1)
+
+ def main(argv=sys.argv):
+@@ -51,7 +49,7 @@ def main(argv=sys.argv):
+ try:
+ autofile = AutostartFile(path)
+ except ParsingError:
+- print "Invalid .desktop file: " + path
++ print("Invalid .desktop file: " + path)
+ else:
+ if not autofile in files:
+ files.append(autofile)
+@@ -99,9 +97,9 @@ class AutostartFile:
+
+ def _alert(self, str, info=False):
+ if info:
+- print "\t ", str
++ print("\t ", str)
+ else:
+- print "\t*", str
++ print("\t*", str)
+
+ def _showInEnvironment(self, envs, verbose=False):
+ default = not self.de.getOnlyShowIn()
+@@ -146,14 +144,14 @@ class AutostartFile:
+
+ def display(self, envs):
+ if self._shouldRun(envs):
+- print "[*] " + self.de.getName()
++ print("[*] " + self.de.getName())
+ else:
+- print "[ ] " + self.de.getName()
++ print("[ ] " + self.de.getName())
+ self._alert("File: " + self.path, info=True)
+ if self.de.getExec():
+ self._alert("Executes: " + self.de.getExec(), info=True)
+ self._shouldRun(envs, True)
+- print
++ print()
+
+ def run(self, envs):
+ here = os.getcwd()
+@@ -165,34 +163,34 @@ class AutostartFile:
+ os.chdir(here)
+
+ def show_help():
+- print "Usage:", ME, "[OPTION]... [ENVIRONMENT]..."
+- print
+- print "This tool will run xdg autostart .desktop files"
+- print
+- print "OPTIONS"
+- print " --list Show a list of the files which would be run"
+- print " Files which would be run are marked with an asterix"
+- print " symbol [*]. For files which would not be run,"
+- print " information is given for why they are excluded"
+- print " --help Show this help and exit"
+- print " --version Show version and copyright information"
+- print
+- print "ENVIRONMENT specifies a list of environments for which to run autostart"
+- print "applications. If none are specified, only applications which do not "
+- print "limit themselves to certain environments will be run."
+- print
+- print "ENVIRONMENT can be one or more of:"
+- print " GNOME Gnome Desktop"
+- print " KDE KDE Desktop"
+- print " ROX ROX Desktop"
+- print " XFCE XFCE Desktop"
+- print " Old Legacy systems"
+- print
++ print("Usage:", ME, "[OPTION]... [ENVIRONMENT]...")
++ print()
++ print("This tool will run xdg autostart .desktop files")
++ print()
++ print("OPTIONS")
++ print(" --list Show a list of the files which would be run")
++ print(" Files which would be run are marked with an asterix")
++ print(" symbol [*]. For files which would not be run,")
++ print(" information is given for why they are excluded")
++ print(" --help Show this help and exit")
++ print(" --version Show version and copyright information")
++ print()
++ print("ENVIRONMENT specifies a list of environments for which to run autostart")
++ print("applications. If none are specified, only applications which do not ")
++ print("limit themselves to certain environments will be run.")
++ print()
++ print("ENVIRONMENT can be one or more of:")
++ print(" GNOME Gnome Desktop")
++ print(" KDE KDE Desktop")
++ print(" ROX ROX Desktop")
++ print(" XFCE XFCE Desktop")
++ print(" Old Legacy systems")
++ print()
+
+ def show_version():
+- print ME, VERSION
+- print "Copyright (c) 2008 Dana Jansens"
+- print
++ print(ME, VERSION)
++ print("Copyright (c) 2008 Dana Jansens")
++ print()
+
+ if __name__ == "__main__":
+ sys.exit(main())
More information about the arch-commits
mailing list