diff --git a/PKGBUILD b/PKGBUILD index 3e11bb1..cf19d20 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,24 +1,31 @@ # Maintainer: Robert Hamblin # Contributor: Rene Hickersberger pkgname=mepo -pkgver=1.1 -pkgrel=2 +pkgver=1.1.1 +pkgrel=1 pkgdesc="Fast, simple, and hackable OSM map viewer for Linux" arch=('i686' 'x86_64' 'arm' 'aarch64') url="https://git.sr.ht/~mil/mepo" license=('GPL3') depends=('jq' 'curl' 'zenity' 'xorg-xwininfo' 'geoclue' 'ncurses' 'findutils') -makedepends=('zig>=0.9' 'sdl2' 'sdl2_image' 'sdl2_ttf' 'sdl2_gfx') -checkdepends=('zig>=0.9') +makedepends=('zig>=0.10' 'sdl2' 'sdl2_image' 'sdl2_ttf' 'sdl2_gfx') +checkdepends=('zig>=0.10') changelog= -source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") -sha256sums=('dc4e5a47e1ff9d11c9e0d1ebe95a451498b537fb6aff818fe449a9033e9c4b47') -sha512sums=('51e7ba2b3d159b0eb49526530cc6cf7200c734d565c319c923507e734b26c6bf0588b8275c2fac7c963af21c8a575a7a9e3708ffdf83b68a35082a979fb4c523') +source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz" + "hardcoded-geoclue-lib-path.patch") +sha512sums=('ad76ba18d297bda5a9df73db5c709049e3fcb7388de819632836e58d2cce858c7b1cacad4f6f22accc73663df13347c0f53bd87738c61445cb355d90fd814f75') + +prepare() { + cd "$pkgname-$pkgver" + + patch --strip=1 < hardcoded-geoclue-lib-path.patch +} build() { cd "$pkgname-$pkgver" zig build -Drelease-safe=true + zig-out/bin/mepo -docman > mepo.1 } check() { @@ -31,7 +38,14 @@ package() { cd "$pkgname-$pkgver" mkdir -p "$pkgdir/usr/bin" + mkdir -p "$pkgdir/usr/share/applications" + mkdir -p "$pkgdir/usr/share/pixmaps" + mkdir -p "$pkgdir/usr/share/man/man1" + sed -i 's:/usr/libexec:/usr/lib:g' $pkgdir/usr/bin/mepo_ui_menu_user_pin_updater.sh install scripts/mepo_* "$pkgdir/usr/bin/" install "zig-out/bin/mepo" "$pkgdir/usr/bin/" + install "zig-out/share/applications/mepo.desktop" "$pkgdir/usr/share/applications" + install "zig-out/share/pixmaps/mepo.png" "$pkgdir/usr/share/pixmaps" + install "mepo.1" "$pkgdir/usr/share/man/man1" } diff --git a/hardcoded-geoclue-lib-path.patch b/hardcoded-geoclue-lib-path.patch new file mode 100644 index 0000000..499c39b --- /dev/null +++ b/hardcoded-geoclue-lib-path.patch @@ -0,0 +1,28 @@ +diff --unified --recursive --text mepo-1.1.1/scripts/mepo_ui_menu_user_pin_updater.sh mepo-1.1.1.new/scripts/mepo_ui_menu_user_pin_updater.sh +--- mepo-1.1.1/scripts/mepo_ui_menu_user_pin_updater.sh 2022-11-17 08:38:59.000000000 -0800 ++++ mepo-1.1.1.new/scripts/mepo_ui_menu_user_pin_updater.sh 2022-11-17 22:08:24.151186131 -0800 +@@ -26,9 +26,9 @@ + coordsviageoclue() { + supportsgeoclue || return 1 + +- /usr/libexec/geoclue-2.0/demos/agent > /dev/null & ++ /usr/lib/geoclue-2.0/demos/agent > /dev/null & + AGENTPID=$! +- LC_NUMERIC=en_US.UTF-8 /usr/libexec/geoclue-2.0/demos/where-am-i -t $MEPO_TIMEOUT_GEOCLUE | ++ LC_NUMERIC=en_US.UTF-8 /usr/lib/geoclue-2.0/demos/where-am-i -t $MEPO_TIMEOUT_GEOCLUE | + grep -E "Latitude|Longitude:" -m2 | + cut -d: -f2 | + tr -d "° " | +@@ -37,8 +37,8 @@ + } + + supportsgeoclue() { +- stat /usr/libexec/geoclue-2.0/demos/agent > /dev/null 2> /dev/null && +- stat /usr/libexec/geoclue-2.0/demos/where-am-i > /dev/null 2> /dev/null ++ stat /usr/lib/geoclue-2.0/demos/agent > /dev/null 2> /dev/null && ++ stat /usr/lib/geoclue-2.0/demos/where-am-i > /dev/null 2> /dev/null + } + + coordsviagpsd() { +Only in mepo-1.1.1.new/: zig-cache +Only in mepo-1.1.1.new/: zig-out