update to version 3.4.5

2 files changed, 57 insertions, 116 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f098675a0763..79bdd808fad3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,52 +1,45 @@
 pkgbase = qgis-ltr
-	pkgdesc = Geographic Information System (GIS); Old Long Term Release
-	pkgver = 2.18.27
+	pkgdesc = Geographic Information System (GIS); Long Term Release
+	pkgver = 3.4.5
 	pkgrel = 1
 	url = https://qgis.org/
-	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
+	makedepends = fcgi
 	makedepends = gsl
-	makedepends = perl
+	makedepends = python-six
+	makedepends = qt5-tools
 	makedepends = txt2tags
-	depends = expat
-	depends = gcc-libs
+	makedepends = sip
+	depends = desktop-file-utils
 	depends = gdal
-	depends = geos
-	depends = glibc
-	depends = libspatialite
-	depends = postgresql-libs
-	depends = proj
-	depends = qt4
-	depends = qca-qt4
-	depends = qjson
-	depends = qscintilla-qt4
-	depends = qwt-qt4
-	depends = qwtpolar-qt4
+	depends = hicolor-icon-theme
+	depends = libzip
+	depends = python-qscintilla-qt5
+	depends = qca
+	depends = qt5-3d
+	depends = qt5-serialport
+	depends = qt5-webkit
+	depends = qt5-xmlpatterns
+	depends = qtkeychain
+	depends = qwtpolar
 	depends = spatialindex
-	depends = sqlite
-	depends = python2
-	depends = python2-httplib2
-	depends = python2-future
-	depends = python2-qscintilla-qt4
-	depends = sip
-	depends = python2-sip
-	depends = python2-six
-	optdepends = gpsbabel: GPS Tool plugin
+	depends = python-sip
+	optdepends = fcgi: Map server
+	optdepends = gpsbabel: GPS Tools plugin
 	optdepends = gsl: Georeferencer plugin
-	optdepends = python2-gdal: DB Manager plugin; Processing plugin
-	optdepends = python2-jinja: MetaSearch plugin
-	optdepends = python2-owslib: MetaSearch plugin
-	optdepends = python2-psycopg2: DB Manager plugin; Processing plugin
-	optdepends = python2-pygments: MetaSearch plugin; DB Manager plugin
-	optdepends = python2-pyspatialite: DB Manager plugin; Processing plugin
-	optdepends = python2-yaml: Processing plugin
-	optdepends = saga-gis-ltr: Saga processing tools
-	provides = qgis=2.18.27
+	optdepends = python-gdal: DB Manager plugin; Processing plugin
+	optdepends = python-jinja: MetaSearch plugin
+	optdepends = python-owslib: MetaSearch plugin
+	optdepends = python-psycopg2: DB Manager plugin; Processing plugin
+	optdepends = python-pygments: MetaSearch plugin
+	optdepends = python-numpy: Processing plugin
+	optdepends = python-yaml: Processing plugin
+	provides = qgis=3.4.5
 	conflicts = qgis
-	source = https://qgis.org/downloads/qgis-2.18.27.tar.bz2
-	md5sums = e74924dd823c6926e7b522002f3826ce
+	source = https://qgis.org/downloads/qgis-3.4.5.tar.bz2
+	md5sums = aea127eefd777f24873cb26be8f7e0fc
 
 pkgname = qgis-ltr
 
diff --git a/PKGBUILD b/PKGBUILD
index b9005d928e9f..84a3022858a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,102 +13,50 @@
 
 _pkgname=qgis
 pkgname="$_pkgname"-ltr
-pkgver=2.18.27
+pkgver=3.4.5
 pkgrel=1
-pkgdesc='Geographic Information System (GIS); Old Long Term Release'
+pkgdesc='Geographic Information System (GIS); Long Term Release'
 url='https://qgis.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('expat' 'gcc-libs' 'gdal' 'geos' 'glibc' 'libspatialite' 'postgresql-libs' 'proj'
-         'qt4' 'qca-qt4' 'qjson' 'qscintilla-qt4' 'qwt-qt4' 'qwtpolar-qt4' 'spatialindex' 'sqlite'
-         'python2' 'python2-httplib2' 'python2-future' 'python2-qscintilla-qt4' 'sip' 'python2-sip' 'python2-six')
-makedepends=('cmake' 'gsl' 'perl' 'txt2tags')
-optdepends=('gpsbabel: GPS Tool plugin'
+license=(GPL)
+arch=(x86_64)
+depends=(desktop-file-utils gdal hicolor-icon-theme libzip python-qscintilla-qt5 qca qt5-3d
+         qt5-serialport qt5-webkit qt5-xmlpatterns qtkeychain qwtpolar spatialindex python-sip)
+makedepends=(cmake fcgi gsl python-six qt5-tools txt2tags sip)
+optdepends=('fcgi: Map server'
+            'gpsbabel: GPS Tools plugin'
             'gsl: Georeferencer plugin'
-            'python2-gdal: DB Manager plugin; Processing plugin'
-            'python2-jinja: MetaSearch plugin'
-            'python2-owslib: MetaSearch plugin'
-            'python2-psycopg2: DB Manager plugin; Processing plugin'
-            'python2-pygments: MetaSearch plugin; DB Manager plugin'
-            'python2-pyspatialite: DB Manager plugin; Processing plugin'
-            'python2-yaml: Processing plugin'
-            'saga-gis-ltr: Saga processing tools')
+            'python-gdal: DB Manager plugin; Processing plugin'
+            'python-jinja: MetaSearch plugin'
+            'python-owslib: MetaSearch plugin'
+            'python-psycopg2: DB Manager plugin; Processing plugin'
+            'python-pygments: MetaSearch plugin'
+            'python-numpy: Processing plugin'
+            'python-yaml: Processing plugin')
 provides=("$_pkgname=$pkgver")
 conflicts=("$_pkgname")
 source=("https://qgis.org/downloads/$_pkgname-$pkgver.tar.bz2")
 # curl https://qgis.org/downloads/qgis-latest-ltr.tar.bz2.md5
-md5sums=('e74924dd823c6926e7b522002f3826ce')
+md5sums=('aea127eefd777f24873cb26be8f7e0fc')
 
 prepare() {
-  cd "$_pkgname-$pkgver"
-
-  # Make sure we find the -qt4 versions of qwt and qwtpolar
-  sed -i '/QWT_LIBRARY_NAMES/ s/qwt /qwt-qt4 /' cmake/FindQwt.cmake
-  sed -i '/PATH_SUFFIXES/ s/qwt$/&-qt4/;/LIBRARY NAMES/ s/qwtpolar/&-qt4/' cmake/FindQwtPolar.cmake
-
-  # Fix references to "python"
-  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
-
-  [[ -d build ]] || mkdir build
+  mkdir -p build
 }
 
 build() {
-  cd "$_pkgname-$pkgver"/build
-
-  cmake -G "Unix Makefiles" ../ \
+  cd build
+  cmake -G "Unix Makefiles" ../"$_pkgname-$pkgver" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_3D=TRUE \
+    -DWITH_SERVER=TRUE \
+    -DWITH_CUSTOM_WIDGETS=TRUE \
+    -DBINDINGS_GLOBAL_INSTALL=TRUE \
     -DQGIS_MANUAL_SUBDIR=share/man \
-    -DENABLE_TESTS=FALSE \
-    -DWITH_QTWEBKIT=FALSE \
-    -DWITH_INTERNAL_QWTPOLAR=FALSE \
-    -DWITH_INTERNAL_{MARKUPSAFE,OWSLIB,DATEUTIL,PYTZ,YAML,NOSE2,SIX,FUTURE}=FALSE \
-#    -DWITH_SERVER=TRUE \
-#    -DWITH_GLOBE=TRUE
-
+    -DWITH_QWTPOLAR=TRUE \
+    -DWITH_INTERNAL_QWTPOLAR=FALSE
   make
-
-  # Rebuild srs database, QGIS distributes an old, buggy one
-  LD_LIBRARY_PATH="$PWD/output/lib/" make synccrsdb
-  mv /tmp/srs.db ../resources/
 }
 
 package() {
-  cd "$_pkgname-$pkgver"/build
-
-  # Add optional deps based on selected or autodetected options
-  [[ -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-qt4: Globe plugin')
-
+  cd build
   make DESTDIR="$pkgdir" install
-
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  # install desktop files and icons
-  install -Dm644 debian/{qgis,qbrowser}.desktop -t "$pkgdir/usr/share/applications/"
-  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 _prog in qgis qbrowser; do
-    install -Dm644 images/icons/${_prog}_icon.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/$_prog.svg"
-  done
-
-  # install mime information and icons
-  install -Dm644 debian/qgis.xml -t "$pkgdir/usr/share/mime/packages/"
-  install -Dm644 images/icons/qgis-mime-icon.png "$pkgdir/usr/share/icons/hicolor/128x128/mimetypes/qgis-mime.png"
-  for _type in asc ddf dem dt0 dxf gml img mime mldata qgs qlr qml qpt shp sqlite; do
-    install -Dm644 images/icons/qgis_${_type}_icon.svg "$pkgdir/usr/share/icons/hicolor/scalable/mimetypes/qgis-$_type.svg"
-  done
-
-  # compile python files, since the cmake option doesn't seem to account for DESTDIR
-  python2 -m compileall -q "$pkgdir"
 }