summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/proj/jni.patch11
-rw-r--r--system/proj/proj.SlackBuild8
-rw-r--r--system/proj/proj.info10
3 files changed, 21 insertions, 8 deletions
diff --git a/system/proj/jni.patch b/system/proj/jni.patch
new file mode 100644
index 0000000000..5b69aba8bf
--- /dev/null
+++ b/system/proj/jni.patch
@@ -0,0 +1,11 @@
+diff -Nur proj-4.8.0.a/src/jniproj.c proj-4.8.0.b/src/jniproj.c
+--- proj-4.8.0.a/src/jniproj.c 2012-02-20 17:11:24.000000000 -0800
++++ proj-4.8.0.b/src/jniproj.c 2012-12-29 22:04:56.199425359 -0800
+@@ -49,7 +49,6 @@
+ #include <math.h>
+ #include <string.h>
+ #include "projects.h"
+-#include "org_proj4_PJ.h"
+ #include <jni.h>
+
+ #define PJ_FIELD_NAME "ptr"
diff --git a/system/proj/proj.SlackBuild b/system/proj/proj.SlackBuild
index 84d9344343..45db4839a6 100644
--- a/system/proj/proj.SlackBuild
+++ b/system/proj/proj.SlackBuild
@@ -2,18 +2,17 @@
# Slackware build script for proj
# Written by Kyle Guinn <elyk03@gmail.com>
+# Maintained by Benjamin Trigona-Harany <bosth@alumni.sfu.ca>
PRGNAM=proj
-VERSION=${VERSION:-4.6.0}
+VERSION=${VERSION:-4.8.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -52,6 +51,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
-o -perm 400 \) -exec chmod 644 {} \;
+# remove header that is no longer part of source
+patch -p1 < $CWD/jni.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/system/proj/proj.info b/system/proj/proj.info
index d465cc1cb8..3ac6544167 100644
--- a/system/proj/proj.info
+++ b/system/proj/proj.info
@@ -1,10 +1,10 @@
PRGNAM="proj"
-VERSION="4.6.0"
+VERSION="4.8.0"
HOMEPAGE="http://trac.osgeo.org/proj/"
-DOWNLOAD="http://download.osgeo.org/proj/proj-4.6.0.tar.gz"
-MD5SUM="975d9b5954869e53523726a9c0e0e070"
+DOWNLOAD="http://download.osgeo.org/proj/proj-4.8.0.tar.gz"
+MD5SUM="d815838c92a29179298c126effbb1537"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Kyle Guinn"
-EMAIL="elyk03@gmail.com"
+MAINTAINER="Benjamin Trigona-Harany"
+EMAIL="bosth@alumni.sfu.ca"