[arch-commits] Commit in openbox/trunk (PKGBUILD debian-887908.patch)

[Chih-Hsuan Yen]

    Date: Sunday, May 24, 2020 @ 02:57:43
  Author: yan12125
Revision: 632737

upgpkg: openbox 3.6.1-7; add a patch from Debian for https://bugs.archlinux.org/task/66738

Added:
  openbox/trunk/debian-887908.patch
Modified:
  openbox/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   11 ++++++++---
 debian-887908.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-24 02:06:57 UTC (rev 632736)
+++ PKGBUILD	2020-05-24 02:57:43 UTC (rev 632737)
@@ -7,7 +7,7 @@
 
 pkgname=openbox
 pkgver=3.6.1
-pkgrel=6
+pkgrel=7
 pkgdesc='Highly configurable and lightweight X11 window manager'
 arch=('x86_64')
 url='http://openbox.org'
@@ -25,13 +25,15 @@
         openbox-3.5.0-title-matching.patch
         openbox-3.5.0-which-2.20.patch
         $pkgname-kde-paths.patch
-        py3.patch)
+        py3.patch
+        debian-887908.patch)
 md5sums=('b72794996c6a3ad94634727b95f9d204'
          'SKIP'
          '0a11d7149da210a31ef88f8a9c717711'
          '7ca3b5244bb092d46f5bcf1e2bdf4a18'
          'f7df0df8c1d2da279e48d0fdc984fb71'
-         '67ae9735c283637ef6d11b17a3f81953')
+         '67ae9735c283637ef6d11b17a3f81953'
+         '4ff275746641e840605e9a74043079fe')
 validpgpkeys=(4B71379A9D5263D112A85620A5A4E99C711D3B61)
 
 prepare() {
@@ -42,6 +44,9 @@
   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

Added: debian-887908.patch
===================================================================
--- debian-887908.patch	                        (rev 0)
+++ debian-887908.patch	2020-05-24 02:57:43 UTC (rev 632737)
@@ -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);
+     }
+ }