summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaansu2022-05-22 21:22:22 -0700
committerRaansu2022-05-22 21:22:22 -0700
commitc75468e26cb1dc4bae3cb2b979e18d1d95324ffb (patch)
tree579a6ef18bb979cfb1190d26d5f3f3deced11ce7
parenta395b8c5c76e5381b9f9e3490b1e201a04ab4a02 (diff)
downloadaur-c75468e26cb1dc4bae3cb2b979e18d1d95324ffb.tar.gz
Patch to fix compiling with GCC 12
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD13
-rw-r--r--fix-compiling-for-gcc12.patch10
3 files changed, 23 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 20cd4ae9c501..5b36b62bdd62 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = osk-sdl
pkgdesc = SDL2 On-screen Keyboard for FDE
pkgver = 0.66
- pkgrel = 4
+ pkgrel = 5
url = https://gitlab.com/postmarketOS/osk-sdl
arch = x86_64
license = GPL3
@@ -16,8 +16,10 @@ pkgbase = osk-sdl
source = osk-sdl-0.66.tar.gz::https://gitlab.com/postmarketOS/osk-sdl/-/archive/0.66/osk-sdl-0.66.tar.gz
source = osk-sdl-hooks
source = osk-sdl-install
+ source = fix-compiling-for-gcc12.patch
md5sums = fb608060dea423d221bdfff9a6101624
md5sums = 3a4a2945ce9fa98451273833e1a615cd
md5sums = 3025fb91626943901f33437ac74a748c
+ md5sums = c97cc198285b90fea7aa864537d165b1
pkgname = osk-sdl
diff --git a/PKGBUILD b/PKGBUILD
index ba24660fecc6..e3890e3d7c95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Danct12 <danct12@disroot.org>
pkgname=osk-sdl
pkgver=0.66
-pkgrel=4
+pkgrel=5
pkgdesc="SDL2 On-screen Keyboard for FDE"
arch=(x86_64)
url="https://gitlab.com/postmarketOS/osk-sdl"
@@ -11,7 +11,13 @@ depends=(device-mapper cryptsetup sdl2 sdl2_ttf mesa ttf-dejavu)
makedepends=(scdoc meson)
source=($pkgname-$pkgver.tar.gz::https://gitlab.com/postmarketOS/osk-sdl/-/archive/$pkgver/$pkgname-$pkgver.tar.gz
osk-sdl-hooks
- osk-sdl-install)
+ osk-sdl-install
+ fix-compiling-for-gcc12.patch)
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -u -p0 --input="${srcdir}/fix-compiling-for-gcc12.patch"
+}
build() {
arch-meson "$pkgname-$pkgver" _build
@@ -30,4 +36,5 @@ package() {
}
md5sums=('fb608060dea423d221bdfff9a6101624'
'3a4a2945ce9fa98451273833e1a615cd'
- '3025fb91626943901f33437ac74a748c')
+ '3025fb91626943901f33437ac74a748c'
+ 'c97cc198285b90fea7aa864537d165b1')
diff --git a/fix-compiling-for-gcc12.patch b/fix-compiling-for-gcc12.patch
new file mode 100644
index 000000000000..aa0e9eaa60b1
--- /dev/null
+++ b/fix-compiling-for-gcc12.patch
@@ -0,0 +1,10 @@
+--- src/keyboard.h
++++ src/keyboard.h
+@@ -27,6 +27,7 @@
+ #include <list>
+ #include <string>
+ #include <vector>
++#include <array>
+
+ constexpr char KEYCAP_BACKSPACE[] = "\u2190";
+ constexpr char KEYCAP_SHIFT[] = "\u2191";