Skip to content

Commit

Permalink
pkg: danctnix: osk-sdl: upgrade to 0.67
Browse files Browse the repository at this point in the history
*Remove unneeded quiet line. It doesn't do anything in our hook

*Ensure IFS is reset. Not resetting IFS may conflict with other hooks and kernel command line variables

*Change PKGBUILD to build 0.67
  • Loading branch information
ShapeShifter499 committed Sep 19, 2022
1 parent 8c0e195 commit de08042
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 71 deletions.
31 changes: 11 additions & 20 deletions PKGBUILDS/danctnix/osk-sdl/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
# Maintainer: Danct12 <[email protected]>
# Contributor: Lance G. <[email protected]>

pkgname=osk-sdl
pkgver=0.66
pkgrel=4
pkgver=0.67
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)

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"
}
osk-sdl-install)

build() {
arch-meson "$pkgname-$pkgver" _build
arch-meson "$pkgname"-41f67e26b8e8466c0613ea51ff602c19e01c7009 _build
meson compile -C _build
}

Expand All @@ -37,8 +29,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=('c5b230111f47645d9fdd379d8e020311'
'eae94cd34d31bb1a2ba4945267496c67'
'397d60aee88c4cda995562083c164e66')
10 changes: 0 additions & 10 deletions PKGBUILDS/danctnix/osk-sdl/fix-compiling-for-gcc12.patch

This file was deleted.

39 changes: 0 additions & 39 deletions PKGBUILDS/danctnix/osk-sdl/fix-config-parsing-with-libstdc++.patch

This file was deleted.

5 changes: 3 additions & 2 deletions PKGBUILDS/danctnix/osk-sdl/osk-sdl-hooks
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -58,12 +57,14 @@ EOF
fi
fi

IFS=,
OLDIFS="$IFS"; IFS=,
if [ -n "${osk_kms}" ]; then
for i in $osk_kms
do
echo "Resetting $i module"
rmmod -f "$i"
done
fi
IFS="$OLDIFS"
unset OLDIFS
}

0 comments on commit de08042

Please sign in to comment.