summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD5
-rw-r--r--merkaartor-git.install12
3 files changed, 4 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ec50f64d833..ff8af786c07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by makepkg 4.2.1
-# Mon Jul 20 14:57:20 UTC 2015
pkgbase = merkaartor-git
pkgdesc = Merkaartor openstreetmap mapping program
- pkgver = 0.18.2.r0.g59d30ce
+ pkgver = 0.18.3.r46.gbbdce9f7
pkgrel = 1
url = http://www.merkaartor.be/
- install = merkaartor-git.install
arch = i686
arch = x86_64
license = GPL2
@@ -13,9 +10,7 @@ pkgbase = merkaartor-git
makedepends = git
depends = qt5-svg
depends = gdal
- depends = qt5-webkit
- depends = desktop-file-utils
- depends = gtk-update-icon-cache
+ depends = hicolor-icon-theme
provides = merkaartor
conflicts = merkaartor
source = git+https://github.com/openstreetmap/merkaartor.git
diff --git a/PKGBUILD b/PKGBUILD
index 22c7e09f9fd..a8fdebf31d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,13 @@
_pkgname=merkaartor
pkgname=$_pkgname-git
-pkgver=0.18.2.r0.g59d30ce
+pkgver=0.18.3.r46.gbbdce9f7
pkgrel=1
pkgdesc='Merkaartor openstreetmap mapping program'
url='http://www.merkaartor.be/'
arch=('i686' 'x86_64')
license=('GPL2')
-depends=('qt5-svg' 'gdal' 'qt5-webkit' 'desktop-file-utils' 'gtk-update-icon-cache')
+depends=('qt5-svg' 'gdal' 'hicolor-icon-theme')
makedepends=('qt5-tools' 'git')
-install="$pkgname.install"
source=("git+https://github.com/openstreetmap/${_pkgname}.git")
md5sums=('SKIP')
provides=("$_pkgname")
diff --git a/merkaartor-git.install b/merkaartor-git.install
deleted file mode 100644
index c317fbaca44..00000000000
--- a/merkaartor-git.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}