summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Hummel2024-06-29 15:09:56 -0700
committerDavid Hummel2024-06-29 15:09:56 -0700
commit0bd4afa5799d6a71e7a2d0748f851f3f8ec46fe4 (patch)
tree2cb1d8b073fb9a784b0b60faa32beb701ba760e4
parent366552c2b593a628fc3670a2240ec3bd443c8006 (diff)
downloadaur-0bd4afa5799d6a71e7a2d0748f851f3f8ec46fe4.tar.gz
Update pkgrel
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD21
2 files changed, 17 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1ab682603ee9..ea4b6171470e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mod_tile
pkgdesc = A daemon and apache module for rendering and serving Mapnik raster tiles
pkgver = 0.7.2
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/openstreetmap/mod_tile
arch = i686
arch = x86_64
@@ -9,20 +9,19 @@ pkgbase = mod_tile
checkdepends = jq
makedepends = apache
makedepends = apr
- makedepends = boost
- makedepends = cairo
makedepends = cmake
makedepends = glib2
makedepends = iniparser
makedepends = mapnik
- optdepends = ceph-libs: RADOS tile storage support
optdepends = libmemcached: Memcached tile storage support
source = https://github.com/openstreetmap/mod_tile/archive/v0.7.2/mod_tile-0.7.2.tar.gz
+ source = v0.7.2_fixes.patch::https://github.com/openstreetmap/mod_tile/compare/v0.7.2...cda77b0a69fe1489f762ed72e89205381f9608af.patch
source = renderd.service
source = renderd-postgresql.service
source = renderd.sysusers
source = renderd.tmpfiles
sha256sums = 7988335986d9dadc5275cd955c5af14d3648addb68b16866bb79f27aa76797e3
+ sha256sums = 062e8f1b0024db625212284bc93fceba5a89920ba8e086b84edd024ef9b5c268
sha256sums = 7bb1c67f92e9d253cecbb2f17048fba151a67e470c231fc33605937917b0567a
sha256sums = d6c009e95380d8a9be41f0bd077638cb6adbebb74fff238a2bfc9fbbb3ed49fa
sha256sums = cd6871cdb3e640912c95499e97fe1a2496ba95f102ec65f112bcd546ba736514
@@ -33,15 +32,11 @@ pkgname = mod_tile
install = mod_tile.install
depends = apache
depends = apr
- depends = cairo
- depends = curl
depends = glib2
provides = mod_tile
pkgname = renderd
pkgdesc = A daemon that renders map tiles using mapnik
- depends = cairo
- depends = curl
depends = glib2
depends = iniparser
depends = mapnik
diff --git a/PKGBUILD b/PKGBUILD
index 7a006e78f63a..f6d97384dbbb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,22 @@
pkgname=('mod_tile' 'renderd')
pkgver=0.7.2
-pkgrel=1
+pkgrel=2
pkgdesc='A daemon and apache module for rendering and serving Mapnik raster tiles'
arch=('i686' 'x86_64')
url='https://github.com/openstreetmap/mod_tile'
license=('GPL-2.0-or-later')
-optdepends=('ceph-libs: RADOS tile storage support'
- 'libmemcached: Memcached tile storage support')
-makedepends=('apache' 'apr' 'boost' 'cairo' 'cmake' 'glib2' 'iniparser' 'mapnik')
+optdepends=('libmemcached: Memcached tile storage support')
+makedepends=('apache' 'apr' 'cmake' 'glib2' 'iniparser' 'mapnik')
checkdepends=('jq')
source=("${url}/archive/v${pkgver}/mod_tile-${pkgver}.tar.gz"
+ "v0.7.2_fixes.patch::${url}/compare/v${pkgver}...cda77b0a69fe1489f762ed72e89205381f9608af.patch"
'renderd.service'
'renderd-postgresql.service'
'renderd.sysusers'
'renderd.tmpfiles')
sha256sums=('7988335986d9dadc5275cd955c5af14d3648addb68b16866bb79f27aa76797e3'
+ '062e8f1b0024db625212284bc93fceba5a89920ba8e086b84edd024ef9b5c268'
'7bb1c67f92e9d253cecbb2f17048fba151a67e470c231fc33605937917b0567a'
'd6c009e95380d8a9be41f0bd077638cb6adbebb74fff238a2bfc9fbbb3ed49fa'
'cd6871cdb3e640912c95499e97fe1a2496ba95f102ec65f112bcd546ba736514'
@@ -28,6 +29,8 @@ prepare() {
rm -rf mod_tile
fi
mv mod_tile-${pkgver} mod_tile
+ cd mod_tile || exit
+ patch -Np1 < ../v0.7.2_fixes.patch
}
build() {
@@ -39,7 +42,11 @@ build() {
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \
-DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \
- -DENABLE_TESTS:BOOL=ON
+ -DENABLE_TESTS:BOOL=ON \
+ -DUSE_CAIRO:BOOL=OFF \
+ -DUSE_CURL:BOOL=OFF \
+ -DUSE_RADOS:BOOL=OFF
+
cmake --build build
}
@@ -51,7 +58,7 @@ check() {
}
package_mod_tile() {
- depends=('apache' 'apr' 'cairo' 'curl' 'glib2')
+ depends=('apache' 'apr' 'glib2')
install="${pkgname}.install"
pkgdesc='An Apache 2 module to deliver map tiles'
provides=('mod_tile')
@@ -73,7 +80,7 @@ package_mod_tile() {
package_renderd() {
backup=('etc/renderd.conf')
- depends=('cairo' 'curl' 'glib2' 'iniparser' 'mapnik')
+ depends=('glib2' 'iniparser' 'mapnik')
pkgdesc='A daemon that renders map tiles using mapnik'
provides=('renderd')