diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-06-07 01:41:16 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-06-07 02:29:32 -0300 |
| commit | 70722320804ded6f34570f0e82d5a1c80033fc44 (patch) | |
| tree | 96e7ad5ae2304d7b8b3e4646e8a9199f200796a6 | |
| parent | bc4bc0437b0e05f8830968a9c2e494bb35684030 (diff) | |
| download | aports-70722320804ded6f34570f0e82d5a1c80033fc44.tar.bz2 aports-70722320804ded6f34570f0e82d5a1c80033fc44.tar.xz | |
testing/mapserver: modernize, fix build with new proj4
| -rw-r--r-- | testing/mapserver/APKBUILD | 15 | ||||
| -rw-r--r-- | testing/mapserver/fix-build-new-proj4.patch | 13 |
2 files changed, 20 insertions, 8 deletions
diff --git a/testing/mapserver/APKBUILD b/testing/mapserver/APKBUILD index c8f3d24fbd..c143236097 100644 --- a/testing/mapserver/APKBUILD +++ b/testing/mapserver/APKBUILD @@ -10,14 +10,12 @@ license="MIT" depends="geos gdal proj4 cairo curl fcgi freetype libjpeg libpng libxml2 libpq giflib protobuf-c" depends_dev="cmake postgresql-dev geos-dev gdal-dev jpeg-dev giflib-dev libxml2-dev proj4-dev fcgi-dev curl-dev freetype-dev cairo-dev protobuf-c-dev" makedepends="$depends_dev" -install="" subpackages="$pkgname-dev" -source="http://download.osgeo.org/mapserver/$pkgname-$pkgver.tar.gz" - -builddir="$srcdir/$pkgname-$pkgver" +source="http://download.osgeo.org/mapserver/$pkgname-$pkgver.tar.gz + fix-build-new-proj4.patch + " build() { - cd "$builddir" mkdir build; cd build cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -43,14 +41,15 @@ build() { -DWITH_HARFBUZZ=OFF \ -DWITH_EXEMPI=OFF \ -DWITH_PROTOBUFC=ON - make -j1 || return 1 + make -j1 } package() { cd "$builddir"/build - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install rm -rf "$pkgdir"/usr/share/ chmod -x "$pkgdir"/usr/include/mapserver/*.h } -sha512sums="8622488c47ee1f7c245566aa3ceb2d91074742e9acb8deaa0044f2b6a9fd71e5eaa65b388997ab37f974cc6f7272f40e41d84ef6ad3449976229bbe01e6289a4 mapserver-7.2.1.tar.gz" +sha512sums="8622488c47ee1f7c245566aa3ceb2d91074742e9acb8deaa0044f2b6a9fd71e5eaa65b388997ab37f974cc6f7272f40e41d84ef6ad3449976229bbe01e6289a4 mapserver-7.2.1.tar.gz +ab5c60a17d0266df76b8118b383a127268b5944b3dcc6797240add8029e24dc2a330a4f34f77b5f2dcd7147b73e092ddbf5bdb24661df0f09f6cce182f5b081c fix-build-new-proj4.patch" diff --git a/testing/mapserver/fix-build-new-proj4.patch b/testing/mapserver/fix-build-new-proj4.patch new file mode 100644 index 0000000000..55b7a80647 --- /dev/null +++ b/testing/mapserver/fix-build-new-proj4.patch @@ -0,0 +1,13 @@ +diff --git a/mapproject.h b/mapproject.h +index c296677..4695e90 100644 +--- a/mapproject.h ++++ b/mapproject.h +@@ -38,6 +38,7 @@ extern "C" { + #endif + + #ifdef USE_PROJ ++#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H + # include <proj_api.h> + #if PJ_VERSION >= 470 && PJ_VERSION < 480 + void pj_clear_initcache(); + |