2 files changed, 47 insertions, 48 deletions
diff --git a/pcr/qgis/PKGBUILD b/pcr/qgis/PKGBUILD
index f76848c8f..864c16ab7 100644
--- a/pcr/qgis/PKGBUILD
+++ b/pcr/qgis/PKGBUILD
@@ -1,19 +1,18 @@
-# Maintainer (Arch): Doug Newgard <scimmia at archlinux dot info>
-# Maintainer (Arch): XavierCLL <xavier.corredor.llano (a) gmail.com>
-# Contributor (Arch): SaultDon <sault.don gmail>
-# Contributor (Arch): Lantald < lantald at gmx.com >
-# Contributor (Arch): Thomas Dziedzic < gostrc at gmail >
-# Contributor (Arch): dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor (Arch): Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-# Contributor (Arch): Eric Forgeot < http://esclinux.tk >
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Maintainer: Doug Newgard <scimmia at archlinux dot info>
+# Maintainer: XavierCLL <xavier.corredor.llano (a) gmail.com>
+# Contributor: SaultDon <sault.don gmail>
+# Contributor: Lantald < lantald at gmx.com >
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
+# Contributor: Eric Forgeot < http://esclinux.tk >
 
 # Globe Plugin and Map Server are disabled in cmake by default.
 # Uncomment them in the build() portion if you'd like them enabled.
 # You will also need to install osgearth or fcgi, respectively, before building.
 
 pkgname=qgis
-pkgver=2.12.1
+pkgver=2.12.3
 pkgrel=1.parabola1
 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats, without nonfree ElvenSword resource'
 url='http://qgis.org/'
@@ -28,8 +27,8 @@ install="$pkgname.install"
 mksource=("http://qgis.org/downloads/$pkgname-$pkgver.tar.bz2")
 source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.bz2"
         "libre.patch")
-mkmd5sums=('b47a7e040341164fd2b8f7970055e3d0')
-md5sums=('9399b11476a6df55e3446b1bb6101679'
+mkmd5sums=('f57ad5f04451d30032dbdd1836e0cb22')
+md5sums=('37ff345be0bde384448b8c2527e523f7'
          '6c5f082d7f41f45762030a80aa89d5ff')
 
 mksource() {
@@ -47,6 +46,13 @@ prepare() {
   # Fixing shebang for .py files
   sed -i 's/\(env \|\/usr\/bin\/\)python$/&2/' $(find . -iname "*.py")
 
+  # Remove mime types already defined by freedesktop.org
+  sed -e '/type="image\/tiff"/,/<\/mime-type>/d' \
+      -e '/type="image\/jpeg"/,/<\/mime-type>/d' \
+      -e '/type="image\/jp2"/,/<\/mime-type>/d' \
+      -e '/type="application\/x-adobe-mif"/,/<\/mime-type>/d' \
+      -i debian/qgis.xml
+
   # Fix console.py for new pyqt build system
   sed -e '/from PyQt4.QtCore/ s/$/, QT_VERSION/' \
       -e '/import pyqtconfig/d' \
@@ -65,14 +71,7 @@ build() {
     -DENABLE_TESTS=FALSE \
     -DCMAKE_SKIP_RPATH=TRUE \
     -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    -DWITH_INTERNAL_QWTPOLAR=FALSE \
-    -DWITH_INTERNAL_SIX=FALSE \
-    -DWITH_INTERNAL_DATEUTIL=FALSE \
-    -DWITH_INTERNAL_HTTPLIB2=FALSE \
-    -DWITH_INTERNAL_JINJA2=FALSE \
-    -DWITH_INTERNAL_MARKUPSAFE=FALSE \
-    -DWITH_INTERNAL_PYGMENTS=FALSE \
-    -DWITH_INTERNAL_PYTZ=FALSE \
+    -DWITH_INTERNAL_{QWTPOLAR,DATEUTIL,HTTPLIB2,JINJA2,MARKUPSAFE,PYGMENTS,PYTZ,SIX}=FALSE \
 #    -DWITH_SERVER=TRUE \
 #    -DWITH_GLOBE=TRUE
 
@@ -80,31 +79,31 @@ build() {
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname-$pkgver/build
 
   # Add optional deps based on selected or autodetected options
-  [[ -n "$(awk -F= '/^GRASS_PREFIX:/ {print $2}' build/CMakeCache.txt)" ]] && \
-    optdepends+=('grass6: GRASS6 plugin')
-  [[ -n "$(awk -F= '/^GRASS_PREFIX7:/ {print $2}' build/CMakeCache.txt)" ]] && \
-    optdepends+=('grass: GRASS7 plugin')
-  [[ "$(awk -F= '/^WITH_SERVER:/ {print $2}' build/CMakeCache.txt)" == "TRUE" ]] && \
-    optdepends+=('fcgi: Map Server')
-  [[ "$(awk -F= '/^WITH_GLOBE:/ {print $2}' build/CMakeCache.txt)" == "TRUE" ]] && \
-    optdepends+=('osgearth: Globe plugin')
-
-  make -C build DESTDIR="$pkgdir" install
-
-  # install some freedesktop.org compatibility
+  [[ -n "$(sed -n '/^GRASS_PREFIX:/ s/.*=//p' CMakeCache.txt)" ]] && optdepends+=('grass6: GRASS6 plugin')
+  [[ -n "$(sed -n '/^GRASS_PREFIX7:/ s/.*=//p' CMakeCache.txt)" ]] && optdepends+=('grass: GRASS7 plugin')
+  [[ "$(sed -n '/^WITH_SERVER:/ s/.*=//p' CMakeCache.txt)" == "TRUE" ]] && optdepends+=('fcgi: Map Server')
+  [[ "$(sed -n '/^WITH_GLOBE:/ s/.*=//p' CMakeCache.txt)" == "TRUE" ]] && optdepends+=('osgearth: Globe plugin')
+
+  make DESTDIR="$pkgdir" install
+
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # install desktop files and icons
   install -Dm644 debian/{qgis,qbrowser}.desktop -t "$pkgdir/usr/share/applications/"
-  install -Dm644 debian/qgis-icon512x512.png "$pkgdir/usr/share/pixmaps/qgis.png"
-  install -Dm644 debian/qbrowser-icon512x512.png "$pkgdir/usr/share/pixmaps/qbrowser.png"
-  install -Dm644 images/icons/qgis-mime-icon.png "$pkgdir/usr/share/pixmaps/qgis-mime.png"
-
-  # TODO: these aren't working for some reason, ie, .qgs files are not opened by QGIS...
-  # Appears to be a conflict with some file types being defaulted to google-chrome/chromium if that's installed as well.
-  for mime in debian/mime/application/*.desktop
-    do install -Dm644 "$mime" -t "$pkgdir/usr/share/mimelnk/application/"
+  for icon in qgis-icon{,-16x16,-60x60} qbrowser-icon{,-60x60}; do
+    local _resolution="${icon##*-}"; [[ "$_resolution" == "icon" ]] && _resolution="512x512"
+    install -Dm644 images/icons/$icon.png "$pkgdir/usr/share/icons/hicolor/$_resolution/apps/${icon%%-*}.png"
   done
+  for icon in {qgis,qbrowser}_icon; do
+    install -Dm644 images/icons/$icon.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/${icon%%_*}.svg"
+  done
+
+  # install mime information and icon
+  install -Dm644 debian/qgis.xml "$pkgdir/usr/share/mime/packages/qgis.xml"
+  install -Dm644 images/icons/qgis-mime-icon.png "$pkgdir/usr/share/icons/hicolor/128x128/mimetypes/qgis-mime.png"
 
   # compile python files, since the cmake option doesn't seem to account for DESTDIR
   python2 -m compileall -q "$pkgdir"
diff --git a/pcr/qgis/qgis.install b/pcr/qgis/qgis.install
index 584660bf9..5ee51bc0e 100644
--- a/pcr/qgis/qgis.install
+++ b/pcr/qgis/qgis.install
@@ -1,13 +1,13 @@
-## arg 1:  the new package version
 post_install() {
-	/usr/bin/update-desktop-database -q
+  update-desktop-database -q
+  gtk-update-icon-cache -q usr/share/icons/hicolor
+  update-mime-database usr/share/mime
 }
-## arg 1:  the new package version
-## arg 2:  the old package version
+
 post_upgrade() {
-	/usr/bin/update-desktop-database -q
+  post_install
 }
-## arg 1:  the old package version
+
 post_remove() {
-	/usr/bin/update-desktop-database -q
+  post_install
 }