some patches

2 files changed, 19 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8933bd910306..abf52e70a463 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cwm
 	pkgdesc = Fork of calmwm, a clean and lightweight window manager
 	pkgver = 7.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/leahneukirchen/cwm
 	changelog = cwm.changelog
 	arch = aarch64
@@ -11,10 +11,14 @@ pkgbase = cwm
 	depends = libxrandr
 	source = https://leahneukirchen.org/releases/cwm-7.1.tar.gz
 	source = https://leahneukirchen.org/releases/cwm-7.1.tar.gz.asc
+	source = fix-overlapping-menu-items.diff::https://github.com/leahneukirchen/cwm/commit/4a6128d5e461515b87da0dabf31dd1c7288b26db.diff
+	source = fix-semi-transparency.diff::https://github.com/leahneukirchen/cwm/commit/9eb763ab8781610b67df44b9914a018d32dfe1fe.diff
 	source = cwm.desktop
 	validpgpkeys = E6F6848A1B95EE313CF5B7EE95FF633C90A8F025
 	sha256sums = 4a58c5cb4312d8d0f03ba657d7656c12d8d7c1277aeb1c05272984501597bd90
 	sha256sums = SKIP
+	sha256sums = a2ec87bb407cbe5adeff60700af7fea264a83f92c7baebdefe85fc3246fb5d50
+	sha256sums = 28055e84b5de69b9a4913ca4ac7576ca05925baf7190c8e1f34afed7c86f92b6
 	sha256sums = SKIP
 
 pkgname = cwm
diff --git a/PKGBUILD b/PKGBUILD
index 752f1dd21ad8..76db072047dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=cwm
 pkgver=7.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Fork of calmwm, a clean and lightweight window manager"
 arch=('aarch64' 'x86_64')
 url="https://github.com/leahneukirchen/cwm"
@@ -14,12 +14,23 @@ license=('BSD')
 depends=('libxft' 'libxrandr')
 changelog=cwm.changelog
 source=("https://leahneukirchen.org/releases/cwm-${pkgver}.tar.gz"{,.asc}
+	'fix-overlapping-menu-items.diff::https://github.com/leahneukirchen/cwm/commit/4a6128d5e461515b87da0dabf31dd1c7288b26db.diff'
+	'fix-semi-transparency.diff::https://github.com/leahneukirchen/cwm/commit/9eb763ab8781610b67df44b9914a018d32dfe1fe.diff'
 	'cwm.desktop')
 sha256sums=('4a58c5cb4312d8d0f03ba657d7656c12d8d7c1277aeb1c05272984501597bd90'
-	    'SKIP'
-	    'SKIP')
+            'SKIP'
+            'a2ec87bb407cbe5adeff60700af7fea264a83f92c7baebdefe85fc3246fb5d50'
+	    '28055e84b5de69b9a4913ca4ac7576ca05925baf7190c8e1f34afed7c86f92b6'
+            'SKIP')
 validpgpkeys=('E6F6848A1B95EE313CF5B7EE95FF633C90A8F025') # Leah Neukirchen <leah@vuxu.org>
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -u -p 1 -l <../fix-overlapping-menu-items.diff
+  # https://marc.info/?l=openbsd-misc&m=167896796615081&w=2
+  patch -u -p 1 -l <../fix-semi-transparency.diff
+}
+
 build() {
   cd $pkgname-$pkgver
   make