summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gis/qgis/qgis.SlackBuild15
-rw-r--r--gis/qgis/qgis.info6
2 files changed, 11 insertions, 10 deletions
diff --git a/gis/qgis/qgis.SlackBuild b/gis/qgis/qgis.SlackBuild
index a2c463e8d9..3d24b91656 100644
--- a/gis/qgis/qgis.SlackBuild
+++ b/gis/qgis/qgis.SlackBuild
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=qgis
-VERSION=${VERSION:-2.18.17}
+VERSION=${VERSION:-2.18.18}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -61,14 +61,14 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
WITHGRASS=""
if pkg-config --exists grass; then
@@ -113,7 +113,7 @@ cd build
fi
cd -
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
find $PKG/usr/man -type f -exec gzip -9 {} \;
@@ -122,6 +122,7 @@ install -D -m 0644 debian/qgis.desktop \
$PKG/usr/share/applications/qgis.desktop
install -D -m 0644 debian/qgis.xml \
$PKG/usr/share/mime/packages/qgis.xml
+sed -i "s_image/jpeg;__" $PKG/usr/share/applications/qgis.desktop
mkdir -p $PKG/usr/share/pixmaps
ln -s /usr/share/qgis/images/icons/qgis-icon.png $PKG/usr/share/pixmaps/qgis.png
diff --git a/gis/qgis/qgis.info b/gis/qgis/qgis.info
index 6875eaac87..91e35ce6c1 100644
--- a/gis/qgis/qgis.info
+++ b/gis/qgis/qgis.info
@@ -1,8 +1,8 @@
PRGNAM="qgis"
-VERSION="2.18.17"
+VERSION="2.18.18"
HOMEPAGE="http://qgis.org/"
-DOWNLOAD="http://qgis.org/downloads/qgis-2.18.17.tar.bz2"
-MD5SUM="d3b23c76a84a8d050aa5f5e58c762347"
+DOWNLOAD="http://qgis.org/downloads/qgis-2.18.18.tar.bz2"
+MD5SUM="297a0bf4e04e00f7f8d091691499f69d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="gdal Jinja2 libspatialindex numpy OWSLib Pygments psycopg2 pyspatialite qwtpolar"