From b9ccaba497cd27b5417088e656d3033b5921b478 Mon Sep 17 00:00:00 2001
From: Joe Bo Run <joborun@disroot.org>
Date: Wed, 28 Sep 2022 01:58:21 +0300
Subject: [PATCH] upg gtk3 openbox-patched

---
 gtk3/PKGBUILD            | 44 +++++++++++++++++++++++++---------------
 gtk3/PKGBUILD-arch       |  8 ++++++--
 openbox-patched/PKGBUILD |  6 +++---
 3 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/gtk3/PKGBUILD b/gtk3/PKGBUILD
index 1f06485..0efc734 100644
--- a/gtk3/PKGBUILD
+++ b/gtk3/PKGBUILD
@@ -5,10 +5,10 @@
 # Website		: https://pozol.eu
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
-pkgbase=gtk3
-pkgname=(gtk3 gtk3-docs gtk3-demos)
-pkgver=3.24.34+r154+g56100ab49a
-pkgrel=01  # silly rebuild after 2 days by Arch because they forgot to create the dbug pkg
+#pkgbase=gtk3
+pkgname=gtk3 # gtk3-docs gtk3-demos)
+pkgver=3.24.34+r156+g812b3930d0
+pkgrel=01
 epoch=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
 arch=(x86_64)
@@ -23,7 +23,7 @@ makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson
              wayland-protocols)
 #options=(debug) # uncomment to produce the gtk3-debug pkg
 optdepends=('evince: Default print preview command')
-_commit=56100ab49ab729f1d98b66e84f3ed899a8105c43  # gtk-3-24
+_commit=812b3930d0bb11d67d4a2c159d037c8c0d440c50  # gtk-3-24
 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
         gtk-query-immodules-3.0.hook)
 
@@ -34,6 +34,11 @@ pkgver() {
 
 prepare() {
   cd gtk
+
+  # https://bugs.archlinux.org/task/76018
+  # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4381#note_1465559
+  git revert -n da4066774b926880631af099469d308714b5606c
+
 }
 
 build() {
@@ -93,17 +98,22 @@ END
   _pick demo usr/share/man/man1/gtk3-{demo,demo-application,icon-browser,widget-factory}.1
 }
 
-package_gtk3-docs() {
-  pkgdesc+=" (documentation)"
-  depends=()
-  mv docs/* "$pkgdir"
-}
-
-package_gtk3-demos() {
-  pkgdesc+=" (demo applications)"
-  depends=(gtk3)
-  mv demo/* "$pkgdir"
-}
+#########
+# To make the following pkgs uncomment the pkgbase and pkgnames and the following two sections
+#
+#
+#package_gtk3-docs() {
+#  pkgdesc+=" (documentation)"
+#  depends=()
+#  mv docs/* "$pkgdir"
+#}
+#
+#package_gtk3-demos() {
+#  pkgdesc+=" (demo applications)"
+#  depends=(gtk3)
+#  mv demo/* "$pkgdir"
+#}
+###########
 
 #---- license gpg-key sha256sums ----
 
@@ -112,3 +122,5 @@ license=(LGPL)
 sha256sums=(SKIP
 	a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229) # gtk-query-immodules-3.0.hook
  
+ 
+ 
diff --git a/gtk3/PKGBUILD-arch b/gtk3/PKGBUILD-arch
index ff6a07a..8158b47 100644
--- a/gtk3/PKGBUILD-arch
+++ b/gtk3/PKGBUILD-arch
@@ -3,7 +3,7 @@
 
 pkgbase=gtk3
 pkgname=(gtk3 gtk3-docs gtk3-demos)
-pkgver=3.24.34+r154+g56100ab49a
+pkgver=3.24.34+r156+g812b3930d0
 pkgrel=1
 epoch=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
@@ -18,7 +18,7 @@ makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson
              wayland-protocols)
 license=(LGPL)
 options=(debug)
-_commit=56100ab49ab729f1d98b66e84f3ed899a8105c43  # gtk-3-24
+_commit=812b3930d0bb11d67d4a2c159d037c8c0d440c50  # gtk-3-24
 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
         gtk-query-immodules-3.0.hook)
 sha256sums=('SKIP'
@@ -31,6 +31,10 @@ pkgver() {
 
 prepare() {
   cd gtk
+
+  # https://bugs.archlinux.org/task/76018
+  # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4381#note_1465559
+  git revert -n da4066774b926880631af099469d308714b5606c
 }
 
 build() {
diff --git a/openbox-patched/PKGBUILD b/openbox-patched/PKGBUILD
index 3b5b523..cae66cf 100644
--- a/openbox-patched/PKGBUILD
+++ b/openbox-patched/PKGBUILD
@@ -8,8 +8,8 @@
 pkgname=openbox-patched
 _pkgname=openbox
 pkgver=3.6.1
-pkgrel=06
-pkgdesc='Openbox with Rounded Corners patch and anything else I deem useful.'
+pkgrel=07
+pkgdesc='Openbox with Rounded Corners patch and anything else deemed useful'
 url='http://openbox.org'
 arch=('x86_64')
 install="${pkgname}.install"
@@ -18,7 +18,7 @@ backup=('etc/xdg/openbox/menu.xml'
         'etc/xdg/openbox/autostart'
         'etc/xdg/openbox/environment')
 depends=('libxml2' 'libxinerama' 'libxrandr'
-         'libxcursor' 'pango' 'imlib2' 'librsvg' 'libsm''python-pyxdg')
+         'libxcursor' 'pango' 'imlib2' 'librsvg' 'libsm' 'python-pyxdg')
 groups=('lxde' 'lxde-gtk3')
 provides=('libobrender.so' $_pkgname)
 conflicts=($_pkgname)