Compare commits
No commits in common. "6ed0aae8231af921e3d09950163cf2292fb8968a" and "ba96aacd7fa91d7916c44b2b1729f2161538bab5" have entirely different histories.
6ed0aae823
...
ba96aacd7f
3 changed files with 54 additions and 18 deletions
19
.SRCINFO
19
.SRCINFO
|
|
@ -1,16 +1,19 @@
|
|||
pkgbase = mepo
|
||||
pkgdesc = Fast, simple, and hackable OSM map viewer for Linux
|
||||
pkgver = 1.2.1
|
||||
pkgrel = 1
|
||||
pkgver = 1.1
|
||||
pkgrel = 2
|
||||
url = https://git.sr.ht/~mil/mepo
|
||||
arch = i686
|
||||
arch = x86_64
|
||||
arch = arm
|
||||
arch = aarch64
|
||||
license = GPL3
|
||||
checkdepends = zig>=0.12.0
|
||||
makedepends = zig>=0.12.0
|
||||
checkdepends = zig>=0.9
|
||||
makedepends = zig>=0.9
|
||||
makedepends = sdl2
|
||||
makedepends = sdl2_image
|
||||
makedepends = sdl2_ttf
|
||||
makedepends = sdl2_gfx
|
||||
depends = jq
|
||||
depends = curl
|
||||
depends = zenity
|
||||
|
|
@ -18,10 +21,8 @@ pkgbase = mepo
|
|||
depends = geoclue
|
||||
depends = ncurses
|
||||
depends = findutils
|
||||
depends = sdl2_gfx
|
||||
depends = sdl2_image
|
||||
depends = sdl2_ttf
|
||||
source = mepo-1.2.1.tar.gz::https://git.sr.ht/~mil/mepo/archive/1.2.1.tar.gz
|
||||
sha512sums = 1db1218a1cc43e4c4838f2b96c47ed3c0589efef2bff3aa7175a658e227b339032c22c0af3a4c95eb6b95a759d62315fd2a3fdf5e11706847c7fa02db5c7d63e
|
||||
source = mepo-1.1.tar.gz::https://git.sr.ht/~mil/mepo/archive/1.1.tar.gz
|
||||
source = hardcoded-geoclue-lib-path.patch
|
||||
sha512sums = ad76ba18d297bda5a9df73db5c709049e3fcb7388de819632836e58d2cce858c7b1cacad4f6f22accc73663df13347c0f53bd87738c61445cb355d90fd814f75
|
||||
|
||||
pkgname = mepo
|
||||
|
|
|
|||
25
PKGBUILD
25
PKGBUILD
|
|
@ -1,23 +1,30 @@
|
|||
# Maintainer: Robert Hamblin <hamblingreen@hotmail.com>
|
||||
# Contributor: Rene Hickersberger <r@renehsz.com>
|
||||
pkgname=mepo
|
||||
pkgver=1.2.1
|
||||
pkgrel=1
|
||||
pkgver=1.1
|
||||
pkgrel=2
|
||||
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' 'sdl2_gfx' 'sdl2_image' 'sdl2_ttf')
|
||||
makedepends=('zig>=0.12.0' 'sdl2')
|
||||
checkdepends=('zig>=0.12.0')
|
||||
depends=('jq' 'curl' 'zenity' 'xorg-xwininfo' 'geoclue' 'ncurses' 'findutils')
|
||||
makedepends=('zig>=0.9' 'sdl2' 'sdl2_image' 'sdl2_ttf' 'sdl2_gfx')
|
||||
checkdepends=('zig>=0.9')
|
||||
changelog=
|
||||
source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
|
||||
sha512sums=('1db1218a1cc43e4c4838f2b96c47ed3c0589efef2bff3aa7175a658e227b339032c22c0af3a4c95eb6b95a759d62315fd2a3fdf5e11706847c7fa02db5c7d63e')
|
||||
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 -Doptimize=ReleaseSafe
|
||||
zig build -Drelease-safe=true
|
||||
zig-out/bin/mepo -docman > mepo.1
|
||||
}
|
||||
|
||||
|
|
@ -34,9 +41,9 @@ package() {
|
|||
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/"
|
||||
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/pixmaps/mepo.png" "$pkgdir/usr/share/pixmaps"
|
||||
install "mepo.1" "$pkgdir/usr/share/man/man1"
|
||||
|
|
|
|||
28
hardcoded-geoclue-lib-path.patch
Normal file
28
hardcoded-geoclue-lib-path.patch
Normal file
|
|
@ -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
|
||||
Loading…
Add table
Reference in a new issue