summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO23
-rw-r--r--.gitignore5
-rw-r--r--PKGBUILD30
3 files changed, 27 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2503d6884b61..e7fbd422da75 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,24 @@
-pkgbase = qmapshack-hg
+pkgbase = qmapshack-git
pkgdesc = Plan your next outdoor trip
- pkgver = 1.13.0.r50.55dee1ae0d55
- pkgrel = 1
- url = https://bitbucket.org/maproom/qmapshack/
+ pkgver = 1.16.1.r11.g2bf08eb5
+ pkgrel = 2
+ url = https://github.com/Maproom/qmapshack/wiki
arch = x86_64
license = GPL3
makedepends = cmake
- makedepends = mercurial
+ makedepends = git
+ depends = alglib
+ depends = dav1d
depends = gdal
- depends = desktop-file-utils
- depends = quazip
+ depends = proj
+ depends = qt5-tools
depends = qt5-webengine
+ depends = quazip
depends = routino>=3.1
provides = qmapshack
conflicts = qmapshack
- source = qmapshack-hg::hg+https://bitbucket.org/maproom/qmapshack
+ replaces = qmapshack-hg
+ source = qmapshack-git::git+https://github.com/Maproom/qmapshack.git
sha256sums = SKIP
-pkgname = qmapshack-hg
-
+pkgname = qmapshack-git
diff --git a/.gitignore b/.gitignore
index 5468a6e0a529..bb81f18d3490 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
/pkg
-/qmapshack-*.pkg.tar.xz
-/qmapshack-*.tar.gz
-/qmapshack-hg
+/*.tar.*
+/qmapshack-git
/src
diff --git a/PKGBUILD b/PKGBUILD
index 5a47d0e41df1..ec6ccc138667 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,30 @@
# Maintainer: Sanpi <sanpi+aur@homecomputing.fr>
-pkgname='qmapshack-hg'
-pkgver=1.13.0.r50.55dee1ae0d55
-pkgrel=1
+pkgname='qmapshack-git'
+pkgver=1.16.1.r11.g2bf08eb5
+pkgrel=2
pkgdesc='Plan your next outdoor trip'
arch=('x86_64')
-url='https://bitbucket.org/maproom/qmapshack/'
+url='https://github.com/Maproom/qmapshack/wiki'
license=('GPL3')
-depends=('gdal' 'desktop-file-utils' 'quazip' 'qt5-webengine' 'routino>=3.1')
-makedepends=('cmake' 'mercurial')
+depends=('alglib' 'dav1d' 'gdal' 'proj' 'qt5-tools' 'qt5-webengine' 'quazip' 'routino>=3.1')
+makedepends=('cmake' 'git')
conflicts=('qmapshack')
provides=('qmapshack')
-source=("$pkgname::hg+https://bitbucket.org/maproom/qmapshack")
+replaces=('qmapshack-hg')
+source=("$pkgname::git+https://github.com/Maproom/qmapshack.git")
sha256sums=('SKIP')
pkgver() {
cd "$pkgname"
- hg log -r . --template '{latesttag}.r{latesttagdistance}.{node|short}' | sed 's/V //'
+ git describe --long --tags | sed 's/^V_//' | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
- cd "$pkgname"
-
- sed -i "s/set(VERSION_SUFFIX \"develop\")/set(VERSION_SUFFIX \"r${pkgver#*r}\")/" CMakeLists.txt
- [ ! -f cmake/Modules/FindPROJ4.cmake ] && patch --quiet -p1 < FindPROJ4.patch
- [ ! -f cmake/Modules/FindQuaZip5.cmake ] && patch --quiet -p1 < FindQuaZip5.patch
- cmake ./ -DCMAKE_INSTALL_PREFIX=/usr
- make
+ cmake -S $pkgname -B build -DCMAKE_INSTALL_PREFIX='/usr'
+ cmake --build build
}
package() {
- cd "$pkgname"
-
- make DESTDIR="${pkgdir}" install
+ DESTDIR="$pkgdir" cmake --install build
}