Merge branch 'master' of ssh://projects.parabola.nu:1863/~git/abslibre/abslibre

3 files changed, 36 insertions, 56 deletions

diff --git a/pcr/emacs-git/PKGBUILD b/pcr/emacs-git/PKGBUILD
index 85a73e0b0..3354dd2d9 100644
--- a/pcr/emacs-git/PKGBUILD
+++ b/pcr/emacs-git/PKGBUILD
@@ -1,4 +1,4 @@
-# See AUR interface for current maintainer.
+# Maintainer (Arch): See AUR interface for current maintainer.
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 #
 # TIP: Don't run this on a tmpfs unless you have oodles of RAM.
@@ -7,9 +7,9 @@
 #
 
 pkgname=emacs-git
-pkgver=25.0.50.r122501
+pkgver=25.1.50.r123464
 pkgrel=1
-pkgdesc="GNU Emacs. Official git trunk."
+pkgdesc="GNU Emacs. Master development branch."
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/"
 license=('GPL')
@@ -42,18 +42,20 @@ prepare() {
 
 build() {
   cd "$srcdir/$pkgname"
-  ac_cv_lib_gif_EGifPutExtensionLast=yes \
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib \
-    --localstatedir=/var \
-    --mandir=/usr/share/man \
-    --pdfdir=/usr/share/doc/emacs/pdf \
-    --with-sound=alsa \
-    --without-gconf \
-    --with-x-toolkit=gtk3 \
-    --with-xft
+
+  local _conf=(
+    --prefix=/usr 
+    --sysconfdir=/etc 
+    --libexecdir=/usr/lib 
+    --localstatedir=/var 
+    --mandir=/usr/share/man 
+    --pdfdir=/usr/share/doc/emacs/pdf 
+    --with-sound=alsa 
+    --without-gconf 
+    --with-x-toolkit=gtk3 
+    --with-xft)
+
+  ./configure ${_conf[@]}
 
   # Using "make" instead of "make bootstrap" makes incremental
   # compiling work. Less time recompiling. Yay! But if you may 
@@ -90,9 +92,9 @@ package() {
   find "$pkgdir"/usr/share/emacs/ | xargs chown root:root
 
   # fix permssions on /var/games
+  mkdir -p "$pkgdir"/var/games/emacs
   chmod 775 "$pkgdir"/var/games
   chmod 775 "$pkgdir"/var/games/emacs
-  chmod 664 "$pkgdir"/var/games/emacs/*
   chown -R root:games "$pkgdir"/var/games
 }
 
diff --git a/pcr/qgis/PKGBUILD b/pcr/qgis/PKGBUILD
index cee9c291f..f76848c8f 100644
--- a/pcr/qgis/PKGBUILD
+++ b/pcr/qgis/PKGBUILD
@@ -1,20 +1,21 @@
 # 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): 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>
 
-# Globe Plugin and QGIS Map Server are disabled in cmake by default.
+# 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.0
-pkgrel=2.parabola1
-pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats'
+pkgver=2.12.1
+pkgrel=1.parabola1
+pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats, without nonfree ElvenSword resource'
 url='http://qgis.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -25,12 +26,10 @@ makedepends=('cmake' 'txt2tags' 'perl')
 optdepends=('gpsbabel: GPS Tool plugin')
 install="$pkgname.install"
 mksource=("http://qgis.org/downloads/$pkgname-$pkgver.tar.bz2")
-source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.gz"
-        "console_pyqt4.diff"
+source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.bz2"
         "libre.patch")
-mkmd5sums=('099efb9482a67e3c57f54f4947986e39')
-md5sums=('4f1122610833228e6952028a4f29ba45'
-         '636b0fd147d19f50e82080a5819ae10a'
+mkmd5sums=('b47a7e040341164fd2b8f7970055e3d0')
+md5sums=('9399b11476a6df55e3446b1bb6101679'
          '6c5f082d7f41f45762030a80aa89d5ff')
 
 mksource() {
@@ -43,11 +42,17 @@ mksource() {
 prepare() {
   cd $pkgname-$pkgver
 
-  patch -Np1 -i "$srcdir/console_pyqt4.diff"
+  patch -Np1 -i "$srcdir/libre.patch"
 
   # Fixing shebang for .py files
   sed -i 's/\(env \|\/usr\/bin\/\)python$/&2/' $(find . -iname "*.py")
 
+  # Fix console.py for new pyqt build system
+  sed -e '/from PyQt4.QtCore/ s/$/, QT_VERSION/' \
+      -e '/import pyqtconfig/d' \
+      -e 's/pyqtconfig.*qt_version/QT_VERSION/' \
+      -i python/console/console.py
+
   [[ -d build ]] || mkdir build
 }
 
@@ -83,9 +88,9 @@ package() {
   [[ -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: QGIS Map Server')
+    optdepends+=('fcgi: Map Server')
   [[ "$(awk -F= '/^WITH_GLOBE:/ {print $2}' build/CMakeCache.txt)" == "TRUE" ]] && \
-    optdepends+=('osgearth: QGIS Globe plugin')
+    optdepends+=('osgearth: Globe plugin')
 
   make -C build DESTDIR="$pkgdir" install
 
diff --git a/pcr/qgis/console_pyqt4.diff b/pcr/qgis/console_pyqt4.diff
deleted file mode 100644
index 0e2cedaea..000000000
--- a/pcr/qgis/console_pyqt4.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/a/python/console/console.py b/b/python/console/console.py
-index c85c107..6406f12 100644
---- a/python/console/console.py
-+++ b/python/console/console.py
-@@ -25,7 +25,6 @@ from PyQt4.QtGui import QDockWidget, QToolBar, QToolButton, QWidget,\
-     QSplitter, QTreeWidget, QAction, QFileDialog, QCheckBox, QSizePolicy, QMenu, QGridLayout, QApplication, \
-     QDesktopServices
- from PyQt4.QtGui import QVBoxLayout
--from PyQt4 import pyqtconfig
- from qgis.utils import iface
- from console_sci import ShellScintilla
- from console_output import ShellOutputScintilla
-@@ -36,8 +35,13 @@ from qgis.gui import QgsFilterLineEdit
- 
- import sys
- 
--_console = None
-+try:
-+  from PyQt4.QtCore import QT_VERSION # works if PyQt4 was built with configure-ng.py
-+except ImportError:
-+  from PyQt4 import pyqtconfig # works if built with configure.py
-+  QT_VERSION = pyqtconfig.Configuration().qt_version
- 
-+_console = None
- 
- def show_console():
-     """ called from QGIS to open the console """