summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
-rw-r--r--proj_api.patch12
3 files changed, 19 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f7c613cb92f8..cb6bc9835cc2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,7 +3,7 @@
pkgbase = mapsoft
pkgdesc = Programs for working with maps and geodata
pkgver = 20190213
- pkgrel = 1
+ pkgrel = 2
url = http://slazav.mccme.ru/prog/mapsoft.htm
arch = x86_64
license = GPL
@@ -24,9 +24,11 @@ pkgbase = mapsoft
depends = proj
source = https://github.com/ushakov/mapsoft/archive/20190213-alt1.tar.gz
source = mapsoft_mapview.desktop
+ source = proj_api.patch
source = scons.patch
sha256sums = 49f06f337ad71f63edfacfb06a9bb0d536a991853eea7255373071eed001a171
sha256sums = f6b0c49271c21f44e2f007b3096c0d80e662c0dc9ff8b66e60c82402b1826096
+ sha256sums = 55c44eb94e71c7da87bb9d98f53a72cfa936d7f3380782674b93ec13779e95bc
sha256sums = 5c1430eda36cc13aba489e2467f01b101872e066c19982ba2accd3f230a56e96
pkgname = mapsoft
diff --git a/PKGBUILD b/PKGBUILD
index a980bd6f255e..da067372ac2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Nikolay Korotkiy <sikmir@gmail.com>
pkgname=mapsoft
pkgver=20190213
-pkgrel=1
+pkgrel=2
pkgdesc='Programs for working with maps and geodata'
arch=(x86_64)
url='http://slazav.mccme.ru/prog/mapsoft.htm'
@@ -10,14 +10,17 @@ depends=('curl' 'giflib' 'gtkmm' 'libjpeg-turbo' 'libtiff' 'libusb' 'libxml2' 'l
makedepends=('boost' 'netpbm' 'perl' 'scons' 'transfig')
source=("https://github.com/ushakov/${pkgname}/archive/${pkgver}-alt1.tar.gz"
'mapsoft_mapview.desktop'
+ 'proj_api.patch'
'scons.patch')
sha256sums=('49f06f337ad71f63edfacfb06a9bb0d536a991853eea7255373071eed001a171'
'f6b0c49271c21f44e2f007b3096c0d80e662c0dc9ff8b66e60c82402b1826096'
+ '55c44eb94e71c7da87bb9d98f53a72cfa936d7f3380782674b93ec13779e95bc'
'5c1430eda36cc13aba489e2467f01b101872e066c19982ba2accd3f230a56e96')
prepare() {
cd ${pkgname}-${pkgver}-alt1
+ patch -Np1 < ../proj_api.patch
patch -Np1 < ../scons.patch
}
diff --git a/proj_api.patch b/proj_api.patch
new file mode 100644
index 000000000000..73fdf7866bfe
--- /dev/null
+++ b/proj_api.patch
@@ -0,0 +1,12 @@
+--- mapsoft-20190213-alt1/core/geo/geo_convs.h.orig 2019-07-03 13:50:16.688113621 +0300
++++ mapsoft-20190213-alt1/core/geo/geo_convs.h 2019-07-03 13:50:33.388314659 +0300
+@@ -9,6 +9,9 @@
+ #include "options/options.h"
+ #include "2d/image.h"
+ #include "2d/conv_aff.h"
++#ifndef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
++#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
++#endif
+ #include <proj_api.h>
+
+ namespace convs{