Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

8 files changed, 266 insertions, 31 deletions

diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index e6c684b1e..95a121a57 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-spacenav=false
+spacenav=true
 pkgbase=blender-libre
 pkgflag=-libre
 if [ $spacenav == true ]; then
@@ -16,9 +16,9 @@ else
   spndesc=''
 fi
 pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
-pkgver=2.65
+pkgver=2.65a
 pkgrel=1
-pkgaev=5
+pkgaev=6
 arch=(
   i686
   x86_64
@@ -137,7 +137,7 @@ source=(
   "http://download.${pkgbase%$pkgflag}.org/source/${pkgbase%$pkgflag}-$pkgver.tar.gz"
 )
 sha512sums=(
-  92488691c25d390eabf35569cb37ec62437dd42f57e096334a6ed804b3265efe6f81871eba15dad67399ff4e6bf4262d4043298a3ceb90e5dc57586eb9f2870f
+  02d493a7395160047b39dcfb48dbd45c285fbeaec741d4248bef62a8da8743e6bf59bba4ecc401e35c0f21a8db4e883c9b29d620be6c4dd6d4852ae53e7c978f
 )
 
 build() {
@@ -148,27 +148,28 @@ build() {
 
   [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
 
-  setarch $CARCH cmake .. \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m \
-    -DPYTHON_LIBPATH=/usr/lib \
-    -DPYTHON_LIBRARY=python3.3m \
-    -DPYTHON_VERSION=3.3 \
-    $DSUPPORT_SSE2_BUILD \
-    -DWITH_CODEC_FFMPEG=ON \
-    -DWITH_CODEC_SNDFILE=ON \
-    -DWITH_CYCLES=ON \
-    -DWITH_CYCLES_CUDA_BINARIES=OFF \
-    -DWITH_FFTW3=ON \
-    -DWITH_GAMEENGINE=ON \
-    -DWITH_IMAGE_REDCODE=OFF \
-    -DWITH_INSTALL_PORTABLE=OFF \
-    -DWITH_JACK=ON \
-    -DWITH_MOD_OCEANSIM=ON \
-    -DWITH_OPENCOLLADA=ON \
-    -DWITH_PLAYER=ON \
-    -DWITH_PYTHON_INSTALL=OFF \
+  setarch $CARCH cmake ..\
+    -DCMAKE_BUILD_TYPE=Release\
+    -DCMAKE_INSTALL_PREFIX=/usr\
+    -DOPENIMAGEIO_ROOT_DIR=/usr\
+    -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m\
+    -DPYTHON_LIBPATH=/usr/lib\
+    -DPYTHON_LIBRARY=python3.3m\
+    -DPYTHON_VERSION=3.3\
+    $DSUPPORT_SSE2_BUILD\
+    -DWITH_CODEC_FFMPEG=ON\
+    -DWITH_CODEC_SNDFILE=ON\
+    -DWITH_CYCLES=ON\
+    -DWITH_CYCLES_CUDA_BINARIES=OFF\
+    -DWITH_FFTW3=ON\
+    -DWITH_GAMEENGINE=ON\
+    -DWITH_IMAGE_REDCODE=OFF\
+    -DWITH_INSTALL_PORTABLE=OFF\
+    -DWITH_JACK=ON\
+    -DWITH_MOD_OCEANSIM=ON\
+    -DWITH_OPENCOLLADA=ON\
+    -DWITH_PLAYER=ON\
+    -DWITH_PYTHON_INSTALL=OFF\
     -DWITH_SYSTEM_GLEW=ON
 
   setarch $CARCH make $MAKEFLAGS
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
new file mode 100644
index 000000000..dd5233b0e
--- /dev/null
+++ b/libre/calibre-libre/PKGBUILD
@@ -0,0 +1,85 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Petrov Roman <nwhisper@gmail.com>
+# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=calibre
+pkgname=calibre-libre
+pkgver=0.9.11
+pkgrel=1
+pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)"
+arch=('i686' 'x86_64') 
+url="http://calibre-ebook.com/"
+license=('GPL3')
+depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 
+         'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' 
+         'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' 
+         'python2-imaging' 'shared-mime-info' 'python2-dnspython' 
+         'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' 
+         'python2-netifaces' 'python2-cssselect')
+makedepends=('python2-pycountry')
+optdepends=('ipython2: to use calibre-debug')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+install=calibre.install
+source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
+        'desktop_integration.patch'
+        'calibre-mount-helper')
+md5sums=('07e620aed65d7bae2a27ccea123da4c9'
+         '42c07b43d575b5e7e7524bd7b9528f0e'
+         '675cd87d41342119827ef706055491e7')
+
+build() {
+  cd "${srcdir}/${_pkgname}"
+
+  #rm -rf src/{cherrypy,pyPdf}
+  rm -rf src/cherrypy
+  sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
+
+  # Fix for calibre-0.8.58
+  sed -i -e "s:#!usr:#!/usr:g" src/calibre/ebooks/markdown/extensions/meta.py
+
+  sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
+    $(find . -regex ".*.py\|.*.recipe")
+
+  # Remove nonfree fonts
+  cd resources/fonts; \
+    rm prs500/tt0003m_.ttf; ln -s ../liberation/LiberationSans-Regular.ttf prs500/tt0003m_.ttf; \
+    rm prs500/tt0011m_.ttf; ln -s ../liberation/LiberationSerif-Regular.ttf prs500/tt0011m_.ttf; \
+    rm prs500/tt0419m_.ttf; ln -s ../liberation/LiberationMono-Regular.ttf prs500/tt0419m_.ttf; \
+  cd ../..
+
+  LANG='en_US.UTF-8' python2 setup.py build
+  # LANG='en_US.UTF-8' python2 setup.py resources
+  LANG='en_US.UTF-8' python2 setup.py translations
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}"
+  
+  patch -Np1 -i "${srcdir}/desktop_integration.patch"
+
+  # More on desktop integration (e.g. enforce arch defaults)
+  sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
+      -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \
+      -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \
+      -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \
+      -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py
+
+  # Fix the environment module location
+  sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py
+
+  install -d "${pkgdir}/usr/lib/python2.7/site-packages"
+  LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \
+    --staging-bindir="${pkgdir}/usr/bin" \
+    --staging-libdir="${pkgdir}/usr/lib" \
+    --staging-sharedir="${pkgdir}/usr/share"
+
+  find "${pkgdir}" -type d -empty -delete
+
+  # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/
+  rm -rf "${pkgdir}/usr/bin/calibre-mount-helper"
+  install -m 755 "${srcdir}/calibre-mount-helper" "${pkgdir}/usr/bin"
+}
diff --git a/libre/calibre-libre/calibre-mount-helper b/libre/calibre-libre/calibre-mount-helper
new file mode 100644
index 000000000..00cac4270
--- /dev/null
+++ b/libre/calibre-libre/calibre-mount-helper
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+# Replacement for upstream mount helper using udisks/eject
+# (C) 2010 Martin Pitt <mpitt@debian.org>
+
+ACTION="$1"
+DEV="$2"
+
+case "$ACTION" in
+    mount)
+	udisks --mount "$DEV"
+    
+	# check if mount worked. If not, fail
+	# udisks does return 0 even if mount failed
+	mount | grep -q "$DEV" || exit 0
+	;;
+
+    eject)
+	eject "$DEV"
+	;;
+
+    cleanup)
+	;;
+
+    *)
+	echo "unknown action" >&2
+	exit 1
+esac
+
diff --git a/libre/calibre-libre/calibre.install b/libre/calibre-libre/calibre.install
new file mode 100644
index 000000000..6210bd0ab
--- /dev/null
+++ b/libre/calibre-libre/calibre.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch
new file mode 100644
index 000000000..4c756f5d4
--- /dev/null
+++ b/libre/calibre-libre/desktop_integration.patch
@@ -0,0 +1,109 @@
+--- a/src/calibre/linux.py	2012-09-21 06:56:20.000000000 +0200
++++ b/src/calibre/linux.py	2012-09-22 18:51:12.000000000 +0200
+@@ -179,19 +179,6 @@
+             self.setup_completion()
+         if islinux or isbsd:
+             self.setup_desktop_integration()
+-        self.create_uninstaller()
+-
+-        from calibre.utils.config import config_dir
+-        if os.path.exists(config_dir):
+-            os.chdir(config_dir)
+-            if islinux or isbsd:
+-                for f in os.listdir('.'):
+-                    if os.stat(f).st_uid == 0:
+-                        import shutil
+-                        shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
+-                if os.stat(config_dir).st_uid == 0:
+-                    os.rmdir(config_dir)
+-
+         if warn is None and self.warnings:
+             self.info('There were %d warnings'%len(self.warnings))
+             for args, kwargs in self.warnings:
+@@ -237,7 +224,7 @@
+                 if isnetbsd:
+                     f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
+                 else:
+-                    f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
++                    f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre')
+             if not os.path.exists(os.path.dirname(f)):
+                 os.makedirs(os.path.dirname(f))
+             self.manifest.append(f)
+@@ -357,63 +344,39 @@
+ 
+             with TemporaryDirectory() as tdir, CurrentDir(tdir), \
+                                 PreserveMIMEDefaults():
+-                render_img('mimetypes/lrf.png', 'calibre-lrf.png')
+-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
+-                self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
+-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
+-                self.icon_resources.append(('mimetypes', 'application-lrs',
+-                '128'))
+-                render_img('mimetypes/mobi.png', 'calibre-mobi.png')
+-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True)
+-                self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128'))
+-                render_img('mimetypes/tpz.png', 'calibre-tpz.png')
+-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True)
+-                self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128'))
+-                render_img('mimetypes/azw2.png', 'calibre-azw2.png')
+-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True)
+-                self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128'))
+-                render_img('mimetypes/azw3.png', 'calibre-azw3.png')
+-                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True)
+-                self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128'))
+-                render_img('lt.png', 'calibre-gui.png', width=256, height=256)
+-                cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
+-                self.icon_resources.append(('apps', 'calibre-gui', '128'))
+-                render_img('viewer.png', 'calibre-viewer.png')
+-                cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
+-                self.icon_resources.append(('apps', 'calibre-viewer', '128'))
++                dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
++                os.mkdir(dir)
++                render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
++                render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
++                render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
+ 
+                 mimetypes = set([])
+                 for x in all_input_formats():
+                     mt = guess_type('dummy.'+x)[0]
+-                    if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
++                    if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
+                         mimetypes.add(mt)
+ 
+                 def write_mimetypes(f):
+                     f.write('MimeType=%s;\n'%';'.join(mimetypes))
+ 
+-                f = open('calibre-lrfviewer.desktop', 'wb')
++                dir = os.path.join(self.opts.staging_sharedir,'../applications')
++                os.mkdir(dir)
++                f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
+                 f.write(VIEWER)
+                 f.close()
+-                f = open('calibre-ebook-viewer.desktop', 'wb')
++                f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
+                 f.write(EVIEWER)
+                 write_mimetypes(f)
+                 f.close()
+-                f = open('calibre-gui.desktop', 'wb')
++                f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
+                 f.write(GUI)
+                 write_mimetypes(f)
+                 f.close()
+-                des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
+-                        'calibre-ebook-viewer.desktop')
+-                for x in des:
+-                    cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
+-                    cc(' '.join(cmd), shell=True)
+-                    self.menu_resources.append(x)
+-                cc(['xdg-desktop-menu', 'forceupdate'])
+-                f = open('calibre-mimetypes.xml', 'wb')
++                dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
++                os.makedirs(dir)
++                f = open(os.path.join(dir, 'calibre.xml'), 'wb')
+                 f.write(MIME)
+                 f.close()
+-                self.mime_resources.append('calibre-mimetypes.xml')
+-                cc('xdg-mime install ./calibre-mimetypes.xml', shell=True)
+         except Exception:
+             if self.opts.fatal_errors:
+                 raise
diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD
index 38533f59b..7a093b29a 100644
--- a/libre/claws-mail-libre/PKGBUILD
+++ b/libre/claws-mail-libre/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=claws-mail
 pkgname=claws-mail-libre
 pkgflag=-libre
 pkgver=3.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support'
 arch=(
   i686
@@ -42,7 +42,7 @@ optdepends=(
 )
 provides=(
   claws
-  $pkgbase
+  $pkgbase=$pkgver
 )
 conflicts=(
   $pkgbase
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 083330019..47666d7b4 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -10,7 +10,7 @@ _basekernel=3.0
 _sublevel=57
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.56 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.57 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         'fbaf6e706052fdd45ab889505758c3fc')
+         '21f93138b6d4410b095cc9998f89e47d')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index a45561c3e..711d8efb5 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -13,7 +13,7 @@ _basekernel=3.7
 _sublevel=1
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=2
-_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -43,7 +43,7 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '88d501404f172dac6fcb248978251560'
          '3485d6c7ae3af35d16e09d6d9a7ed32a'
-         '0a74f8d9c640daabb774c25cb74db512')
+         'b56c33eaee920970151fffdfc7df0766')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]