Update to 20180722-alt1

5 files changed, 33 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c17ec77df1e..df367a22b622 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
-# Generated by makepkg 5.0.1
-# Sun Apr 24 07:22:15 UTC 2016
+# Generated by makepkg 5.1.1
+# Thu Nov 29 08:47:35 UTC 2018
 pkgbase = mapsoft
 	pkgdesc = Programs for working with maps and geodata
-	pkgver = 20160202
+	pkgver = 20180722
 	pkgrel = 1
 	url = http://slazav.mccme.ru/prog/mapsoft.htm
 	arch = i686
@@ -27,10 +27,10 @@ pkgbase = mapsoft
 	depends = pixman
 	depends = proj
 	depends = zlib
-	source = https://github.com/ushakov/mapsoft/archive/20160202-alt1.tar.gz
-	source = giflib42.patch
-	sha256sums = 9138deccec892d939b860ab7aebd8053eb390989ffb5ce41304be0b9588fdbc1
-	sha256sums = 356d474d362d84f933d1aa7f11f7d13cccb1031c8d578ecc2a601c39dd88f467
+	source = https://github.com/ushakov/mapsoft/archive/20180722-alt1.tar.gz
+	source = scons.patch
+	sha256sums = 1dfab671946550c6fe52add9d2c76f342025d3aa628cf70c26553f306ff08737
+	sha256sums = 4c39ef1b6ae1b6ff4726a04929270dbf9a86b7c7016040cd855a81951afbfbf4
 
 pkgname = mapsoft
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..a7ea2e0a6040
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.tar.*
+pkg
+src
diff --git a/PKGBUILD b/PKGBUILD
index dfe24aaae8a4..3555f7e190ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,32 @@
 # Maintainer: Nikolay Korotkiy <sikmir@gmail.com>
-
 pkgname=mapsoft
-pkgver=20160202
+pkgver=20180722
 pkgrel=1
-pkgdesc="Programs for working with maps and geodata"
+pkgdesc='Programs for working with maps and geodata'
 arch=('i686' 'x86_64')
-url="http://slazav.mccme.ru/prog/mapsoft.htm"
+url='http://slazav.mccme.ru/prog/mapsoft.htm'
 license=('GPL')
 depends=('cairomm' 'curl' 'giflib4' 'gtkmm' 'libjpeg-turbo' 'libpng' 'libtiff' 'libusb' 'libxml2' 'libyaml' 'libzip' 'pixman' 'proj' 'zlib')
 makedepends=('boost' 'netpbm' 'perl' 'scons' 'transfig')
 source=("https://github.com/ushakov/${pkgname}/archive/${pkgver}-alt1.tar.gz"
-        "giflib42.patch")
-sha256sums=('9138deccec892d939b860ab7aebd8053eb390989ffb5ce41304be0b9588fdbc1'
-            '356d474d362d84f933d1aa7f11f7d13cccb1031c8d578ecc2a601c39dd88f467')
+        'scons.patch')
+sha256sums=('1dfab671946550c6fe52add9d2c76f342025d3aa628cf70c26553f306ff08737'
+            '4c39ef1b6ae1b6ff4726a04929270dbf9a86b7c7016040cd855a81951afbfbf4')
 
 prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}-alt1
-  patch -Np1 <../giflib42.patch
+  cd ${pkgname}-${pkgver}-alt1
+
+  patch -Np1 < ../scons.patch
 }
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}-alt1
+  cd ${pkgname}-${pkgver}-alt1
+
   scons -j1 -Q prefix=${pkgdir} -Q minimal=1
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}-alt1
+  cd ${pkgname}-${pkgver}-alt1
+
   scons -j1 -Q prefix=${pkgdir} install
 }
diff --git a/giflib42.patch b/giflib42.patch
deleted file mode 100644
index f121d5dcf258..000000000000
--- a/giflib42.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur mapsoft-20160202-alt1-orig/core/loaders/image_gif.cpp mapsoft-20160202-alt1/core/loaders/image_gif.cpp
---- mapsoft-20160202-alt1-orig/core/loaders/image_gif.cpp	2016-02-02 10:06:27.000000000 +0300
-+++ mapsoft-20160202-alt1/core/loaders/image_gif.cpp	2016-04-24 01:00:26.646894860 +0300
-@@ -1,8 +1,14 @@
- #include "image_gif.h"
--#include <gif_lib.h>
-+#include <giflib4/gif_lib.h>
- 
- namespace image_gif{
- 
-+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4)
-+void PrintGifError(){
-+  std::cerr <<  GifErrorString();
-+}
-+#endif
-+
- iPoint
- size(const char *file){
- 
-diff -Naur mapsoft-20160202-alt1-orig/man/SConscript mapsoft-20160202-alt1/man/SConscript
---- mapsoft-20160202-alt1-orig/man/SConscript	2016-02-02 10:06:27.000000000 +0300
-+++ mapsoft-20160202-alt1/man/SConscript	2016-04-24 01:00:49.733561646 +0300
-@@ -5,7 +5,7 @@
- def m4pod2man(env, name, ext, deps):
-    """Setup command for pod2man conversion by <name> argument"""
-    cmd = env.Command(name+'.'+ext, name+'.m4pod',
--     "m4 %s.m4pod | pod2man -n %s -c mapsoft -r mapsoft > %s.%s"
-+     "m4 %s.m4pod | /usr/bin/core_perl/pod2man -n %s -c mapsoft -r mapsoft > %s.%s"
-       % (name, name, name, ext), chdir = 1)
-    env.Depends(cmd, map (lambda(s): "inc/"+s+".m4", Split(deps)))
- e.AddMethod(m4pod2man)
diff --git a/scons.patch b/scons.patch
new file mode 100644
index 000000000000..2c4280e54915
--- /dev/null
+++ b/scons.patch
@@ -0,0 +1,10 @@
+--- mapsoft-20180722-alt1/SConstruct.orig	2018-11-29 11:36:12.955661421 +0300
++++ mapsoft-20180722-alt1/SConstruct	2018-11-29 11:38:21.523645029 +0300
+@@ -17,6 +17,7 @@
+ # Create environment, add some methods
+ 
+ env = Environment ()
++env.AppendENVPath('PATH', '/usr/bin/core_perl')
+ Export('env')
+ 
+ # UseLibs -- use pkg-config libraries