diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | proj_api.patch | 12 |
3 files changed, 10 insertions, 27 deletions
@@ -1,9 +1,9 @@ # Generated by makepkg 5.1.3 -# Mon Sep 16 12:44:08 UTC 2019 +# Fri Oct 4 17:05:56 UTC 2019 pkgbase = mapsoft pkgdesc = Programs for working with maps and geodata pkgver = 20190916 - pkgrel = 1 + pkgrel = 2 url = http://slazav.mccme.ru/prog/mapsoft.htm arch = x86_64 license = GPL @@ -22,11 +22,9 @@ pkgbase = mapsoft depends = libyaml depends = libzip depends = proj - source = https://github.com/ushakov/mapsoft/archive/20190916-alt1.tar.gz - source = proj_api.patch + source = https://github.com/ushakov/mapsoft/archive/20190916-alt2.tar.gz source = scons.patch - sha256sums = ac74bd448da507ff732652d84b2b7400d01092210dfcc2f8c3c35ff93aa09a58 - sha256sums = 55c44eb94e71c7da87bb9d98f53a72cfa936d7f3380782674b93ec13779e95bc + sha256sums = 90c28ba478cc7923b368930704ee8ecadebc571380b8f48b11eeddb67b059f25 sha256sums = 5c1430eda36cc13aba489e2467f01b101872e066c19982ba2accd3f230a56e96 pkgname = mapsoft @@ -1,35 +1,32 @@ # Maintainer: Nikolay Korotkiy <sikmir@gmail.com> pkgname=mapsoft pkgver=20190916 -pkgrel=1 +pkgrel=2 pkgdesc='Programs for working with maps and geodata' arch=(x86_64) url='http://slazav.mccme.ru/prog/mapsoft.htm' license=('GPL') depends=('curl' 'giflib' 'gtkmm' 'libjpeg-turbo' 'libtiff' 'libusb' 'libxml2' 'libyaml' 'libzip' 'proj') makedepends=('boost' 'netpbm' 'perl' 'scons' 'transfig') -source=("https://github.com/ushakov/${pkgname}/archive/${pkgver}-alt1.tar.gz" - 'proj_api.patch' +source=("https://github.com/ushakov/${pkgname}/archive/${pkgver}-alt2.tar.gz" 'scons.patch') -sha256sums=('ac74bd448da507ff732652d84b2b7400d01092210dfcc2f8c3c35ff93aa09a58' - '55c44eb94e71c7da87bb9d98f53a72cfa936d7f3380782674b93ec13779e95bc' +sha256sums=('90c28ba478cc7923b368930704ee8ecadebc571380b8f48b11eeddb67b059f25' '5c1430eda36cc13aba489e2467f01b101872e066c19982ba2accd3f230a56e96') prepare() { - cd ${pkgname}-${pkgver}-alt1 + cd ${pkgname}-${pkgver}-alt2 - patch -Np1 < ../proj_api.patch patch -Np1 < ../scons.patch } build() { - cd ${pkgname}-${pkgver}-alt1 + cd ${pkgname}-${pkgver}-alt2 scons -j1 -Q prefix=${pkgdir} -Q minimal=1 } package() { - cd ${pkgname}-${pkgver}-alt1 + cd ${pkgname}-${pkgver}-alt2 scons -j1 -Q prefix=${pkgdir} install } diff --git a/proj_api.patch b/proj_api.patch deleted file mode 100644 index 73fdf7866bfe..000000000000 --- a/proj_api.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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{ |