Compare commits

...

10 commits

Author SHA1 Message Date
Bobby Hamblin
6ed0aae823 upgrade to 1.2.1 2024-05-28 11:22:54 -07:00
Bobby Hamblin
e9ceac32ce fix dependency checks and build flag 2023-08-17 10:04:25 -07:00
Bobby Hamblin
09eb498002 update mepo to 1.2.0 2023-08-13 20:47:06 -07:00
Bobby Hamblin
3258daabb6 update pkgsums 2023-04-03 09:55:42 -07:00
Bobby Hamblin
f7cb9ac3c8 add sdl2_image and sdl2_ttf as runtime dependencies 2023-03-22 16:04:25 -07:00
Bobby Hamblin
a318923598 add sdl2_gfx as a runtime dependency 2023-03-21 22:38:53 -07:00
Bobby Hamblin
b1ba1e64fa update mepo to 1.1.2 2023-02-01 12:21:53 -08:00
Bobby Hamblin
6cf766273a update mepo to 1.1.1 2023-01-22 18:03:20 -05:00
Bobby Hamblin
45f14790d7 update srcinfo 2022-12-16 13:07:42 -08:00
Bobby Hamblin
e5186824de fix build issues with mepo 2022-12-16 13:06:04 -08:00
3 changed files with 18 additions and 54 deletions

View file

@ -1,19 +1,16 @@
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.2.1
pkgrel = 2 pkgrel = 1
url = https://git.sr.ht/~mil/mepo url = https://git.sr.ht/~mil/mepo
arch = i686 arch = i686
arch = x86_64 arch = x86_64
arch = arm arch = arm
arch = aarch64 arch = aarch64
license = GPL3 license = GPL3
checkdepends = zig>=0.9 checkdepends = zig>=0.12.0
makedepends = zig>=0.9 makedepends = zig>=0.12.0
makedepends = sdl2 makedepends = sdl2
makedepends = sdl2_image
makedepends = sdl2_ttf
makedepends = sdl2_gfx
depends = jq depends = jq
depends = curl depends = curl
depends = zenity depends = zenity
@ -21,8 +18,10 @@ pkgbase = mepo
depends = geoclue depends = geoclue
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 depends = sdl2_gfx
source = hardcoded-geoclue-lib-path.patch depends = sdl2_image
sha512sums = ad76ba18d297bda5a9df73db5c709049e3fcb7388de819632836e58d2cce858c7b1cacad4f6f22accc73663df13347c0f53bd87738c61445cb355d90fd814f75 depends = sdl2_ttf
source = mepo-1.2.1.tar.gz::https://git.sr.ht/~mil/mepo/archive/1.2.1.tar.gz
sha512sums = 1db1218a1cc43e4c4838f2b96c47ed3c0589efef2bff3aa7175a658e227b339032c22c0af3a4c95eb6b95a759d62315fd2a3fdf5e11706847c7fa02db5c7d63e
pkgname = mepo pkgname = mepo

View file

@ -1,30 +1,23 @@
# Maintainer: Robert Hamblin <hamblingreen@hotmail.com> # Maintainer: Robert Hamblin <hamblingreen@hotmail.com>
# Contributor: Rene Hickersberger <r@renehsz.com> # Contributor: Rene Hickersberger <r@renehsz.com>
pkgname=mepo pkgname=mepo
pkgver=1.1 pkgver=1.2.1
pkgrel=2 pkgrel=1
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"
license=('GPL3') license=('GPL3')
depends=('jq' 'curl' 'zenity' 'xorg-xwininfo' 'geoclue' 'ncurses' 'findutils') depends=('jq' 'curl' 'zenity' 'xorg-xwininfo' 'geoclue' 'ncurses' 'findutils' 'sdl2_gfx' 'sdl2_image' 'sdl2_ttf')
makedepends=('zig>=0.9' 'sdl2' 'sdl2_image' 'sdl2_ttf' 'sdl2_gfx') makedepends=('zig>=0.12.0' 'sdl2')
checkdepends=('zig>=0.9') checkdepends=('zig>=0.12.0')
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=('1db1218a1cc43e4c4838f2b96c47ed3c0589efef2bff3aa7175a658e227b339032c22c0af3a4c95eb6b95a759d62315fd2a3fdf5e11706847c7fa02db5c7d63e')
sha512sums=('ad76ba18d297bda5a9df73db5c709049e3fcb7388de819632836e58d2cce858c7b1cacad4f6f22accc73663df13347c0f53bd87738c61445cb355d90fd814f75')
prepare() {
cd "$pkgname-$pkgver"
patch --strip=1 < hardcoded-geoclue-lib-path.patch
}
build() { build() {
cd "$pkgname-$pkgver" cd "$pkgname-$pkgver"
zig build -Drelease-safe=true zig build -Doptimize=ReleaseSafe
zig-out/bin/mepo -docman > mepo.1 zig-out/bin/mepo -docman > mepo.1
} }
@ -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"

View file

@ -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