diff --git a/PKGBUILDS/danctnix/osk-sdl/PKGBUILD b/PKGBUILDS/danctnix/osk-sdl/PKGBUILD index 0c2a7cba..d833928f 100644 --- a/PKGBUILDS/danctnix/osk-sdl/PKGBUILD +++ b/PKGBUILDS/danctnix/osk-sdl/PKGBUILD @@ -1,29 +1,26 @@ # Maintainer: Danct12 # Contributor: Lance G. - pkgname=osk-sdl -pkgver=0.66 -pkgrel=4 +pkgver=0.67.r1.g41f67e2 +pkgrel=1 pkgdesc="SDL2 On-screen Keyboard for FDE" arch=(x86_64 armv7h aarch64) url="https://gitlab.com/postmarketOS/osk-sdl" license=('GPL3') -depends=(device-mapper cryptsetup sdl2 sdl2_ttf mesa ttf-dejavu) +depends=(device-mapper cryptsetup sdl2 sdl2_ttf mesa ttf-dejavu libglvnd) makedepends=(scdoc meson) -source=($pkgname-$pkgver.tar.gz::https://gitlab.com/postmarketOS/osk-sdl/-/archive/$pkgver/$pkgname-$pkgver.tar.gz +_commit="41f67e26b8e8466c0613ea51ff602c19e01c7009" # include 0.67 and fixes +source=(git+https://gitlab.com/postmarketOS/osk-sdl.git#commit=${_commit} osk-sdl-hooks - osk-sdl-install - fix-compiling-for-gcc12.patch - fix-config-parsing-with-libstdc++.patch) + osk-sdl-install) -prepare() { - cd "$pkgname-$pkgver" - patch -u -p0 --input="${srcdir}/fix-compiling-for-gcc12.patch" - patch -u -p0 --input="${srcdir}/fix-config-parsing-with-libstdc++.patch" +pkgver() { + cd "$pkgname" + git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } build() { - arch-meson "$pkgname-$pkgver" _build + arch-meson "$pkgname" _build meson compile -C _build } @@ -37,8 +34,7 @@ package() { install -Dm644 ${srcdir}/osk-sdl-hooks ${pkgdir}/usr/lib/initcpio/hooks/osk-sdl install -Dm644 ${srcdir}/osk-sdl-install ${pkgdir}/usr/lib/initcpio/install/osk-sdl } -md5sums=('fb608060dea423d221bdfff9a6101624' - '32b89734fc22fe0dc470e10c3c2e8034' - '397d60aee88c4cda995562083c164e66' - '8fef952dada64ff63040b5406e71ecac' - 'e6dff50a2f9a27d5de92437394e9cfda') + +md5sums=('SKIP' + 'eae94cd34d31bb1a2ba4945267496c67' + '397d60aee88c4cda995562083c164e66') diff --git a/PKGBUILDS/danctnix/osk-sdl/fix-compiling-for-gcc12.patch b/PKGBUILDS/danctnix/osk-sdl/fix-compiling-for-gcc12.patch deleted file mode 100644 index 424b691d..00000000 --- a/PKGBUILDS/danctnix/osk-sdl/fix-compiling-for-gcc12.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/keyboard.h -+++ src/keyboard.h -@@ -22,6 +22,7 @@ - #include "config.h" - #include - #include -+#include - #include - #include - #include diff --git a/PKGBUILDS/danctnix/osk-sdl/fix-config-parsing-with-libstdc++.patch b/PKGBUILDS/danctnix/osk-sdl/fix-config-parsing-with-libstdc++.patch deleted file mode 100644 index 2e60e4f2..00000000 --- a/PKGBUILDS/danctnix/osk-sdl/fix-config-parsing-with-libstdc++.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- src/config.cpp -+++ src/config.cpp -@@ -175,24 +175,26 @@ - std::istringstream iss(line); - std::string id, eq, val; - -- bool error = false; -- -- if (!(iss >> id)) { -- continue; -- } else if (id[0] == '#') { -+ iss >> id; -+ if (iss.fail()) { - continue; - } else if (id.empty()) { - continue; -- } else if (!(iss >> eq >> val >> std::ws) || eq != "=" || iss.get() != EOF) { -- error = true; -+ } else if (id[0] == '#') { -+ continue; - } - -- if (error) { -+ iss >> eq >> val; -+ // check that: -+ // 1) fail/bad bits aren't set -+ // 2) eq field is '=' -+ // 3) that there are no trailing fields, after ignoring any trailing whitespace -+ if (iss.fail() || eq.compare("=") || !(iss >> std::ws).eof()) { - SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Syntax error on line %d", lineno); - return false; -- } else { -- Config::options[id] = val; - } -+ -+ Config::options[id] = val; - } - return true; - } diff --git a/PKGBUILDS/danctnix/osk-sdl/osk-sdl-hooks b/PKGBUILDS/danctnix/osk-sdl/osk-sdl-hooks index 4c730561..4922f1ae 100644 --- a/PKGBUILDS/danctnix/osk-sdl/osk-sdl-hooks +++ b/PKGBUILDS/danctnix/osk-sdl/osk-sdl-hooks @@ -7,7 +7,6 @@ run_hook() { export SDL_VIDEODRIVER=kmsdrm modprobe -a -q dm-crypt >/dev/null 2>&1 - [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" if [ -n "${cryptdevice}" ]; then DEPRECATED_CRYPT=0 @@ -58,7 +57,7 @@ EOF fi fi - IFS=, + OLDIFS="$IFS"; IFS=, if [ -n "${osk_kms}" ]; then for i in $osk_kms do @@ -66,4 +65,6 @@ EOF rmmod -f "$i" done fi + IFS="$OLDIFS" + unset OLDIFS }