fix build issues with mepo
This commit is contained in:
parent
ba96aacd7f
commit
e5186824de
3 changed files with 6 additions and 42 deletions
5
.SRCINFO
5
.SRCINFO
|
@ -1,7 +1,7 @@
|
||||||
pkgbase = mepo
|
pkgbase = mepo
|
||||||
pkgdesc = Fast, simple, and hackable OSM map viewer for Linux
|
pkgdesc = Fast, simple, and hackable OSM map viewer for Linux
|
||||||
pkgver = 1.1
|
pkgver = 1.1
|
||||||
pkgrel = 2
|
pkgrel = 4
|
||||||
url = https://git.sr.ht/~mil/mepo
|
url = https://git.sr.ht/~mil/mepo
|
||||||
arch = i686
|
arch = i686
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
|
@ -22,7 +22,6 @@ pkgbase = mepo
|
||||||
depends = ncurses
|
depends = ncurses
|
||||||
depends = findutils
|
depends = findutils
|
||||||
source = mepo-1.1.tar.gz::https://git.sr.ht/~mil/mepo/archive/1.1.tar.gz
|
source = mepo-1.1.tar.gz::https://git.sr.ht/~mil/mepo/archive/1.1.tar.gz
|
||||||
source = hardcoded-geoclue-lib-path.patch
|
sha512sums = 51e7ba2b3d159b0eb49526530cc6cf7200c734d565c319c923507e734b26c6bf0588b8275c2fac7c963af21c8a575a7a9e3708ffdf83b68a35082a979fb4c523
|
||||||
sha512sums = ad76ba18d297bda5a9df73db5c709049e3fcb7388de819632836e58d2cce858c7b1cacad4f6f22accc73663df13347c0f53bd87738c61445cb355d90fd814f75
|
|
||||||
|
|
||||||
pkgname = mepo
|
pkgname = mepo
|
||||||
|
|
15
PKGBUILD
15
PKGBUILD
|
@ -2,7 +2,7 @@
|
||||||
# Contributor: Rene Hickersberger <r@renehsz.com>
|
# Contributor: Rene Hickersberger <r@renehsz.com>
|
||||||
pkgname=mepo
|
pkgname=mepo
|
||||||
pkgver=1.1
|
pkgver=1.1
|
||||||
pkgrel=2
|
pkgrel=3
|
||||||
pkgdesc="Fast, simple, and hackable OSM map viewer for Linux"
|
pkgdesc="Fast, simple, and hackable OSM map viewer for Linux"
|
||||||
arch=('i686' 'x86_64' 'arm' 'aarch64')
|
arch=('i686' 'x86_64' 'arm' 'aarch64')
|
||||||
url="https://git.sr.ht/~mil/mepo"
|
url="https://git.sr.ht/~mil/mepo"
|
||||||
|
@ -11,15 +11,8 @@ depends=('jq' 'curl' 'zenity' 'xorg-xwininfo' 'geoclue' 'ncurses' 'findutils')
|
||||||
makedepends=('zig>=0.9' 'sdl2' 'sdl2_image' 'sdl2_ttf' 'sdl2_gfx')
|
makedepends=('zig>=0.9' 'sdl2' 'sdl2_image' 'sdl2_ttf' 'sdl2_gfx')
|
||||||
checkdepends=('zig>=0.9')
|
checkdepends=('zig>=0.9')
|
||||||
changelog=
|
changelog=
|
||||||
source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
|
source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
|
||||||
"hardcoded-geoclue-lib-path.patch")
|
sha512sums=('51e7ba2b3d159b0eb49526530cc6cf7200c734d565c319c923507e734b26c6bf0588b8275c2fac7c963af21c8a575a7a9e3708ffdf83b68a35082a979fb4c523')
|
||||||
sha512sums=('ad76ba18d297bda5a9df73db5c709049e3fcb7388de819632836e58d2cce858c7b1cacad4f6f22accc73663df13347c0f53bd87738c61445cb355d90fd814f75')
|
|
||||||
|
|
||||||
prepare() {
|
|
||||||
cd "$pkgname-$pkgver"
|
|
||||||
|
|
||||||
patch --strip=1 < hardcoded-geoclue-lib-path.patch
|
|
||||||
}
|
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "$pkgname-$pkgver"
|
cd "$pkgname-$pkgver"
|
||||||
|
@ -41,9 +34,9 @@ package() {
|
||||||
mkdir -p "$pkgdir/usr/share/applications"
|
mkdir -p "$pkgdir/usr/share/applications"
|
||||||
mkdir -p "$pkgdir/usr/share/pixmaps"
|
mkdir -p "$pkgdir/usr/share/pixmaps"
|
||||||
mkdir -p "$pkgdir/usr/share/man/man1"
|
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 scripts/mepo_* "$pkgdir/usr/bin/"
|
||||||
install "zig-out/bin/mepo" "$pkgdir/usr/bin/"
|
install "zig-out/bin/mepo" "$pkgdir/usr/bin/"
|
||||||
|
sed -i 's:/usr/libexec:/usr/lib:g' $pkgdir/usr/bin/mepo_ui_menu_user_pin_updater.sh
|
||||||
install "zig-out/share/applications/mepo.desktop" "$pkgdir/usr/share/applications"
|
install "zig-out/share/applications/mepo.desktop" "$pkgdir/usr/share/applications"
|
||||||
install "zig-out/share/pixmaps/mepo.png" "$pkgdir/usr/share/pixmaps"
|
install "zig-out/share/pixmaps/mepo.png" "$pkgdir/usr/share/pixmaps"
|
||||||
install "mepo.1" "$pkgdir/usr/share/man/man1"
|
install "mepo.1" "$pkgdir/usr/share/man/man1"
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
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
|
|
Loading…
Add table
Reference in a new issue