summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Hummel2023-11-21 07:51:09 -0700
committerDavid Hummel2023-11-21 07:51:09 -0700
commit279ad03568a24da7eaffda0dc7b0c9dd5f109ef9 (patch)
treef8a54df59c896ec29a86991be599c04e0d5c94ed
parent4aaf684b86e2b7928d0d512685fc4ca96692ecd0 (diff)
downloadaur-279ad03568a24da7eaffda0dc7b0c9dd5f109ef9.tar.gz
Removed upstream merged libxml2 v2.12.0 patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
2 files changed, 2 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5f65a5cb94a2..d70d0ca82350 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mapnik-git
pkgdesc = Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps (git version)
- pkgver = 4.0.0.r13800.gd745e43
+ pkgver = 4.0.0.r13802.g437feeb
pkgrel = 1
url = https://github.com/mapnik/mapnik
arch = i686
@@ -34,14 +34,12 @@ pkgbase = mapnik-git
source = git+https://github.com/mapnik/mapnik.git
source = mapnik-cmake-harfbuzz.patch
source = mapnik-datasource-ogr-test.patch
- source = mapnik-libxml2_loader.patch
source = mapnik-plugins-input-ogr-cmakelists.patch
source = mapnik-test-cmakelists.patch
source = git+https://github.com/mapnik/test-data.git
sha256sums = SKIP
sha256sums = 90f541c0845e3c7005564fa113771ce01cf2bcfd57662b7fa8849aabf4151638
sha256sums = 3fcf178e646df526e9a5c278f56ad16e4f75d2f27108e7b33419649a46b92f52
- sha256sums = 505b3e9337f27c4be4822a37e37b335bff6f6322d5ec3d8da55b4792b05662b5
sha256sums = 36bb2426f4de823f10b4e5025bd9e0eccfac069084bfe99093a8348c3ae9124e
sha256sums = fd15a5bb2829bfb3cbebbf380c5c3fb14d57727198c6e851afae717681d15796
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 97f2796c50b8..fc7db8d63be3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
# Maintainer: David Hummel <david dot hummel at gmail point com>
pkgname=mapnik-git
-pkgver=4.0.0.r13800.gd745e43
+pkgver=4.0.0.r13802.g437feeb
pkgrel=1
pkgdesc='Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps (git version)'
arch=('i686' 'x86_64')
@@ -40,14 +40,12 @@ provides=('mapnik')
source=('git+https://github.com/mapnik/mapnik.git'
'mapnik-cmake-harfbuzz.patch'
'mapnik-datasource-ogr-test.patch'
- 'mapnik-libxml2_loader.patch' # Support libxml2 >= v2.12.0
'mapnik-plugins-input-ogr-cmakelists.patch' # Fix build after #4420
'mapnik-test-cmakelists.patch' # Fix build after #4420
'git+https://github.com/mapnik/test-data.git')
sha256sums=('SKIP'
'90f541c0845e3c7005564fa113771ce01cf2bcfd57662b7fa8849aabf4151638'
'3fcf178e646df526e9a5c278f56ad16e4f75d2f27108e7b33419649a46b92f52'
- '505b3e9337f27c4be4822a37e37b335bff6f6322d5ec3d8da55b4792b05662b5'
'36bb2426f4de823f10b4e5025bd9e0eccfac069084bfe99093a8348c3ae9124e'
'fd15a5bb2829bfb3cbebbf380c5c3fb14d57727198c6e851afae717681d15796'
'SKIP')
@@ -61,7 +59,6 @@ prepare() {
cd mapnik || exit
patch -Np1 < ../mapnik-cmake-harfbuzz.patch
patch -Np1 < ../mapnik-datasource-ogr-test.patch
- patch -Np1 < ../mapnik-libxml2_loader.patch
patch -Np1 < ../mapnik-plugins-input-ogr-cmakelists.patch
patch -Np1 < ../mapnik-test-cmakelists.patch
git submodule init \