Sun Mar 16 03:32:40 UTC 2014

10 files changed, 376 insertions, 797 deletions

diff --git a/extra/gst-plugins-good/0001-docs-fix-mismatched-para-tags.patch b/extra/gst-plugins-good/0001-docs-fix-mismatched-para-tags.patch
new file mode 100644
index 000000000..2747c6975
--- /dev/null
+++ b/extra/gst-plugins-good/0001-docs-fix-mismatched-para-tags.patch
@@ -0,0 +1,43 @@
+From 908d728c8a8b12acd9f9659ebd8970882b7daa33 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <william.jon.mccann@gmail.com>
+Date: Fri, 14 Feb 2014 20:27:20 +0000
+Subject: docs: fix mismatched para tags
+
+newer gtkdoc is more sensitive to mismatched docbook tags.
+This fixes the build in master.
+---
+diff --git a/gst/audiofx/audiocheblimit.c b/gst/audiofx/audiocheblimit.c
+index 549a9d2..e278886 100644
+--- a/gst/audiofx/audiocheblimit.c
++++ b/gst/audiofx/audiocheblimit.c
+@@ -46,12 +46,12 @@
+  * be at most this value. A lower ripple value will allow a faster rolloff.
+  *
+  * As a special case, a Chebyshev type 1 filter with no ripple is a Butterworth filter.
+- * </para>
++ *
+  * <note><para>
+  * Be warned that a too large number of poles can produce noise. The most poles are possible with
+  * a cutoff frequency at a quarter of the sampling rate.
+  * </para></note>
+- * <para>
++ *
+  * <refsect2>
+  * <title>Example launch line</title>
+  * |[
+diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
+index 922e381..ea49af9 100644
+--- a/gst/udp/gstudpsrc.c
++++ b/gst/udp/gstudpsrc.c
+@@ -78,8 +78,7 @@
+  * </itemizedlist>
+  * The message is typically used to detect that no UDP arrives in the receiver
+  * because it is blocked by a firewall.
+- * </para>
+- * <para>
++ *
+  * A custom file descriptor can be configured with the
+  * #GstUDPSrc:sockfd property. The socket will be closed when setting the
+  * element to READY by default. This behaviour can be
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gst-plugins-good/0002-docs-use-docbook-markup-for-xi-include.patch b/extra/gst-plugins-good/0002-docs-use-docbook-markup-for-xi-include.patch
new file mode 100644
index 000000000..e4d2fef81
--- /dev/null
+++ b/extra/gst-plugins-good/0002-docs-use-docbook-markup-for-xi-include.patch
@@ -0,0 +1,75 @@
+From 79fc4ec80b68eac193095ee40d5da584eb270f1c Mon Sep 17 00:00:00 2001
+From: Stefan Sauer <ensonic@users.sf.net>
+Date: Tue, 18 Feb 2014 21:54:45 +0000
+Subject: docs: use docbook markup for xi:include
+
+It turns out that the change in gtk-doc-1.20 which wraps the |[]| content in
+CDATA break xi:inlcude examples. As in a whole jhbuild checkout these where
+the only 4, we're fixing them instead.
+---
+diff --git a/gst/audiofx/audiofirfilter.c b/gst/audiofx/audiofirfilter.c
+index e0887ad..0ab32f3 100644
+--- a/gst/audiofx/audiofirfilter.c
++++ b/gst/audiofx/audiofirfilter.c
+@@ -39,9 +39,9 @@
+  *
+  * <refsect2>
+  * <title>Example application</title>
+- * |[
++ * <informalexample><programlisting language="C">
+  * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/audiofx/firfilter-example.c" />
+- * ]|
++ * </programlisting></informalexample>
+  * </refsect2>
+  */
+ 
+diff --git a/gst/audiofx/audioiirfilter.c b/gst/audiofx/audioiirfilter.c
+index c107594..eb4f20c 100644
+--- a/gst/audiofx/audioiirfilter.c
++++ b/gst/audiofx/audioiirfilter.c
+@@ -35,9 +35,9 @@
+  *
+  * <refsect2>
+  * <title>Example application</title>
+- * |[
++ * <informalexample><programlisting language="C">
+  * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/audiofx/iirfilter-example.c" />
+- * ]|
++ * </programlisting></informalexample>
+  * </refsect2>
+  */
+ 
+diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
+index 59943d4..5cd83c8 100644
+--- a/gst/level/gstlevel.c
++++ b/gst/level/gstlevel.c
+@@ -95,9 +95,9 @@
+  *
+  * <refsect2>
+  * <title>Example application</title>
+- * |[
++ * <informalexample><programlisting language="C">
+  * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/level/level-example.c" />
+- * ]|
++ * </programlisting></informalexample>
+  * </refsect2>
+  */
+ 
+diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c
+index 75a9152..5e192c1 100644
+--- a/gst/spectrum/gstspectrum.c
++++ b/gst/spectrum/gstspectrum.c
+@@ -90,9 +90,9 @@
+  *
+  * <refsect2>
+  * <title>Example application</title>
+- * |[
++ * <informalexample><programlisting language="C">
+  * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/spectrum/spectrum-example.c" />
+- * ]|
++ * </programlisting></informalexample>
+  * </refsect2>
+  *
+  * Last reviewed on 2011-03-10 (0.10.29)
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD
index 494ea252b..a6350f1a7 100644
--- a/extra/gst-plugins-good/PKGBUILD
+++ b/extra/gst-plugins-good/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 205816 2014-02-10 13:12:32Z heftig $
+# $Id: PKGBUILD 207962 2014-03-15 19:47:26Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-good
 pkgver=1.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="GStreamer Multimedia Framework Good Plugins"
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -11,8 +11,20 @@ url="http://gstreamer.freedesktop.org/"
 depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils' 'cairo')
 makedepends=('gstreamer' 'speex' 'flac' 'libraw1394' 'python' 'gtk-doc')
 options=(!emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('bfb33536a515bdcc34482f64b8d9cc3e47c753878b254923b419bc2f7485e470')
+source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz
+        0001-docs-fix-mismatched-para-tags.patch
+        0002-docs-use-docbook-markup-for-xi-include.patch)
+sha256sums=('bfb33536a515bdcc34482f64b8d9cc3e47c753878b254923b419bc2f7485e470'
+            'ff9411fc67f825144fff8496f6ae303ff14bb3d14f629e76c2b26616255bba64'
+            '9e71a6bbd83be88ff6793b503af7ccde295cc90b3e3692ae46b874abe9ee32f7')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix build with gtk-doc 1.20 FS#39454
+  patch -p1 -i ../0001-docs-fix-mismatched-para-tags.patch
+  patch -p1 -i ../0002-docs-use-docbook-markup-for-xi-include.patch
+}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gstreamer0.10-good/0001-docs-fix-mismatched-para-tags.patch b/extra/gstreamer0.10-good/0001-docs-fix-mismatched-para-tags.patch
new file mode 100644
index 000000000..2747c6975
--- /dev/null
+++ b/extra/gstreamer0.10-good/0001-docs-fix-mismatched-para-tags.patch
@@ -0,0 +1,43 @@
+From 908d728c8a8b12acd9f9659ebd8970882b7daa33 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <william.jon.mccann@gmail.com>
+Date: Fri, 14 Feb 2014 20:27:20 +0000
+Subject: docs: fix mismatched para tags
+
+newer gtkdoc is more sensitive to mismatched docbook tags.
+This fixes the build in master.
+---
+diff --git a/gst/audiofx/audiocheblimit.c b/gst/audiofx/audiocheblimit.c
+index 549a9d2..e278886 100644
+--- a/gst/audiofx/audiocheblimit.c
++++ b/gst/audiofx/audiocheblimit.c
+@@ -46,12 +46,12 @@
+  * be at most this value. A lower ripple value will allow a faster rolloff.
+  *
+  * As a special case, a Chebyshev type 1 filter with no ripple is a Butterworth filter.
+- * </para>
++ *
+  * <note><para>
+  * Be warned that a too large number of poles can produce noise. The most poles are possible with
+  * a cutoff frequency at a quarter of the sampling rate.
+  * </para></note>
+- * <para>
++ *
+  * <refsect2>
+  * <title>Example launch line</title>
+  * |[
+diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
+index 922e381..ea49af9 100644
+--- a/gst/udp/gstudpsrc.c
++++ b/gst/udp/gstudpsrc.c
+@@ -78,8 +78,7 @@
+  * </itemizedlist>
+  * The message is typically used to detect that no UDP arrives in the receiver
+  * because it is blocked by a firewall.
+- * </para>
+- * <para>
++ *
+  * A custom file descriptor can be configured with the
+  * #GstUDPSrc:sockfd property. The socket will be closed when setting the
+  * element to READY by default. This behaviour can be
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gstreamer0.10-good/0002-docs-use-docbook-markup-for-xi-include.patch b/extra/gstreamer0.10-good/0002-docs-use-docbook-markup-for-xi-include.patch
new file mode 100644
index 000000000..e4d2fef81
--- /dev/null
+++ b/extra/gstreamer0.10-good/0002-docs-use-docbook-markup-for-xi-include.patch
@@ -0,0 +1,75 @@
+From 79fc4ec80b68eac193095ee40d5da584eb270f1c Mon Sep 17 00:00:00 2001
+From: Stefan Sauer <ensonic@users.sf.net>
+Date: Tue, 18 Feb 2014 21:54:45 +0000
+Subject: docs: use docbook markup for xi:include
+
+It turns out that the change in gtk-doc-1.20 which wraps the |[]| content in
+CDATA break xi:inlcude examples. As in a whole jhbuild checkout these where
+the only 4, we're fixing them instead.
+---
+diff --git a/gst/audiofx/audiofirfilter.c b/gst/audiofx/audiofirfilter.c
+index e0887ad..0ab32f3 100644
+--- a/gst/audiofx/audiofirfilter.c
++++ b/gst/audiofx/audiofirfilter.c
+@@ -39,9 +39,9 @@
+  *
+  * <refsect2>
+  * <title>Example application</title>
+- * |[
++ * <informalexample><programlisting language="C">
+  * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/audiofx/firfilter-example.c" />
+- * ]|
++ * </programlisting></informalexample>
+  * </refsect2>
+  */
+ 
+diff --git a/gst/audiofx/audioiirfilter.c b/gst/audiofx/audioiirfilter.c
+index c107594..eb4f20c 100644
+--- a/gst/audiofx/audioiirfilter.c
++++ b/gst/audiofx/audioiirfilter.c
+@@ -35,9 +35,9 @@
+  *
+  * <refsect2>
+  * <title>Example application</title>
+- * |[
++ * <informalexample><programlisting language="C">
+  * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/audiofx/iirfilter-example.c" />
+- * ]|
++ * </programlisting></informalexample>
+  * </refsect2>
+  */
+ 
+diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
+index 59943d4..5cd83c8 100644
+--- a/gst/level/gstlevel.c
++++ b/gst/level/gstlevel.c
+@@ -95,9 +95,9 @@
+  *
+  * <refsect2>
+  * <title>Example application</title>
+- * |[
++ * <informalexample><programlisting language="C">
+  * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/level/level-example.c" />
+- * ]|
++ * </programlisting></informalexample>
+  * </refsect2>
+  */
+ 
+diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c
+index 75a9152..5e192c1 100644
+--- a/gst/spectrum/gstspectrum.c
++++ b/gst/spectrum/gstspectrum.c
+@@ -90,9 +90,9 @@
+  *
+  * <refsect2>
+  * <title>Example application</title>
+- * |[
++ * <informalexample><programlisting language="C">
+  * <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" parse="text" href="../../../../tests/examples/spectrum/spectrum-example.c" />
+- * ]|
++ * </programlisting></informalexample>
+  * </refsect2>
+  *
+  * Last reviewed on 2011-03-10 (0.10.29)
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD
index d016c212e..08490a1a0 100644
--- a/extra/gstreamer0.10-good/PKGBUILD
+++ b/extra/gstreamer0.10-good/PKGBUILD
@@ -1,25 +1,35 @@
-# $Id: PKGBUILD 201392 2013-12-10 15:08:37Z jgc $
+# $Id: PKGBUILD 207963 2014-03-15 19:48:48Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gstreamer0.10-good
 pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
 pkgver=0.10.31
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'gtk-doc' 'git' 'cairo')
 url="http://gstreamer.freedesktop.org/"
 options=(!emptydirs)
 source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-good#commit=e28fd8886f05bb51c147f871f3a1db2fc2b735a9"
-        test-rtp-payloading.patch)
+        test-rtp-payloading.patch
+        0001-docs-fix-mismatched-para-tags.patch
+        0002-docs-use-docbook-markup-for-xi-include.patch)
 sha256sums=('SKIP'
-            'c2f7f07f9bf5ca3afddc81d0a44665d2d54b1e9aea0ef1b25d219cf34bf7bb29')
+            'c2f7f07f9bf5ca3afddc81d0a44665d2d54b1e9aea0ef1b25d219cf34bf7bb29'
+            'ff9411fc67f825144fff8496f6ae303ff14bb3d14f629e76c2b26616255bba64'
+            '9e71a6bbd83be88ff6793b503af7ccde295cc90b3e3692ae46b874abe9ee32f7')
 
 prepare() {
   cd gst-plugins-good
+
   sed -i '/AC_PATH_XTRA/d' configure.ac
   sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
-  patch -Np1 -i ../test-rtp-payloading.patch
+
+  patch -p1 -i ../test-rtp-payloading.patch
+
+  # Fix build with gtk-doc 1.20 FS#39454
+  patch -p1 -i ../0001-docs-fix-mismatched-para-tags.patch
+  patch -p1 -i ../0002-docs-use-docbook-markup-for-xi-include.patch
 }
 
 build() {
diff --git a/extra/libmbim/PKGBUILD b/extra/libmbim/PKGBUILD
index 11c05cbf0..5f1ddad9d 100644
--- a/extra/libmbim/PKGBUILD
+++ b/extra/libmbim/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 205456 2014-02-05 15:22:56Z heftig $
+# $Id: PKGBUILD 207965 2014-03-15 21:06:07Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libmbim
-pkgver=1.6.0
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="MBIM modem protocol helper library"
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@ license=(GPL2)
 depends=(glib2 bash systemd)
 makedepends=(gtk-doc python)
 source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('e0efbdaf2aeddec033b4c7c5d0f7934c91ce535c5c9f0cadf1e67527d10ab082')
+sha256sums=('084b527ea88f7e1e31a6208840036aecede21fcd0668332523c81a2ebe2d9ea6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index cb8b33ef7..5cc8a33ee 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 205850 2014-02-11 18:23:07Z andyrtr $
+# $Id: PKGBUILD 207945 2014-03-15 10:03:58Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
-pkgbase=libreoffice
+pkgbase="libreoffice"
 pkgname=('libreoffice-common'
 	'libreoffice-base'
 	'libreoffice-calc'
@@ -16,11 +16,10 @@ pkgname=('libreoffice-common'
 	'libreoffice-writer'
 	'libreoffice-en-US'
 	'libreoffice-postgresql-connector'
-	'libreoffice-extension-presentation-minimizer'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.1.5.3
-pkgver=4.1.5
+_LOver=4.2.2.1
+pkgver=4.2.2
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
@@ -28,15 +27,17 @@ url="http://www.libreoffice.org/"
 makedepends=( # makedepends
              'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost'
              'apache-ant' 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit'
-             'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
+             'beanshell2' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen'
-             'clucene' 'bluez-libs' 'harfbuzz-icu'
+             'clucene' 'bluez-libs' 'harfbuzz-icu' 'gdb'
              # the runtime dependencies
              "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
              'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=52.1"
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.4'
+             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0'
+             'libvisio' 'libetonyek' 'libodfgen'  'telepathy-glib'
              'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
-	         'ttf-dejavu') # to satisfy regression tests
+	         'ttf-liberation' # to satisfy regression tests
+	         'git')
 # there's only one single static library in libreoffice-sdk,
 # the next build that removes it may lead to trouble if people may use it
 # -rw-r--r-- 1 root root 5,1K 12. Okt 23:34 /usr/lib/libreoffice/sdk/lib/libsalcpprt.a
@@ -50,11 +51,10 @@ _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
 _additional_source_url="http://dev-www.libreoffice.org/src"
 _additional_source_url2="http://dev-www.libreoffice.org/extern"
 source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+	${_additional_source_url}/15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
 	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
 	${_additional_source_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
@@ -71,30 +71,32 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2
-	${_additional_source_url}/dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2
-	${_additional_source_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
+	${_additional_source_url}/47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2
+	${_additional_source_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
+	${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
 	${_additional_source_url}/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
 	${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	${_additional_source_url}/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2
 	${_additional_source_url}/libcdr-0.0.14.tar.bz2
 	${_additional_source_url}/libmspub-0.0.6.tar.bz2
-	${_additional_source_url}/libmwaw-0.1.11.tar.bz2
-	${_additional_source_url}/libvisio-0.0.31.tar.bz2
+	${_additional_source_url}/libmwaw-0.2.0.tar.bz2
+	${_additional_source_url}/libfreehand-0.0.0.tar.bz2
+	${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
+	${_additional_source_url}/libatomic_ops-7_2d.zip
+	${_additional_source_url}/libe-book-0.0.3.tar.bz2
+	${_additional_source_url}/libabw-0.0.2.tar.bz2
 	make-pyuno-work-with-system-wide-module-install.diff
 	libreoffice-common.sh libreoffice-common.csh)
-noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2
+	47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2
 	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2
-	b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
+	ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
+	22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
 	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
 	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
 	625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
@@ -115,22 +117,24 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-	8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2
 	libcdr-0.0.14.tar.bz2
 	libmspub-0.0.6.tar.bz2
-	libmwaw-0.1.11.tar.bz2
-	libvisio-0.0.31.tar.bz2	)
-md5sums=('12679026121300396c85b4ca11b176c7'
+	libmwaw-0.2.0.tar.bz2
+	libfreehand-0.0.0.tar.bz2
+	Firebird-2.5.2.26540-0.tar.bz2
+	libatomic_ops-7_2d.zip
+	libe-book-0.0.3.tar.bz2
+	libabw-0.0.2.tar.bz2)
+md5sums=('b8b00aac99c056e8908c1a89ad999f4b'
          'SKIP'
-         'e0ea06a105071c278e52866f476c0ee6'
+         '3c11900dce8a5e520abc8350045b2407'
          'SKIP'
-         'c3b03c33ee14628f1c151288f2eb4962'
+         '5ac66bd46617d00f759602c00e755ea0'
          'SKIP'
-         'f02578f5218f217a9f20e9c30e119c6a'
+         '15cb8c0803064faef0c4ddf5bc5ca279'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
-         '2a177023f9ea8ec8bd00837605c5df1b'
          'a7983f859eafb2677d7ff386a023bc40'
          '3c219630e4302863a9a83d0efde889db'
          '625ff5f2f968dd908bca43c9469d6e6b'
@@ -147,19 +151,22 @@ md5sums=('12679026121300396c85b4ca11b176c7'
          'ace6ab49184e329db254e454a010f56d'
          'db60e4fde8dd6d6807523deb71ee34dc'
          'ba2930200c9f019c2d93a8c88c651a0f'
-         '08c85a6d6d793daee14e10e22eefdc4b'
-         'dc3d21a3921931096d6e80f6701f6763'
-         'b2371dc7cf4811c9d32146eec913d296'
+         '47203e7cade74e5c385aa812f21e7932'
+         'ae330b9493bd4503ac390106ff6060d7'
+         '22f8a85daf4a012180322e1f52a7563b'
          'ea2acaf140ae40a87a952caa75184f4d'
          '36271d3fa0d9dec1632029b6d7aac925'
          '0168229624cfac409e766913506961a8'
          '17410483b5b5f267aa18b7e00b65e6e0'
          '185d60944ea767075d27247c3162b3bc'
-         '8473296c671b6e3dd8197f4145e0854b'
          'd88f9b94df880d2c05be943b000ca112'
          '1120705cd0f0d9bd5506360bf57b6c2e'
-         '828dd03510791fbe037081a2b4a1a8ff'
-         '82628333418f101a20cd21f980cf9f40'
+         'd794625f156a9fb1c53b3f8a8aa13b5e'
+         '496dd00028afcc19f896b01394769043'
+         '21154d2004e025c8a3666625b0357bb5'
+         'c0b86562d5aa40761a87134f83e6adcf'
+         '2f1ceaf2ac8752ed278e175447d9b978'
+         '40fa48e03b1e28ae0325cc34b35bc46d'
          '07d2bf5ad839a394cca008b3ec6e7bb1'
          '4195735a80876ae812fca5736b50192a'
          'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
@@ -167,7 +174,7 @@ md5sums=('12679026121300396c85b4ca11b176c7'
 prepare() {
 
     cd libreoffice-$_LOver
-
+#return 1
     # fix exttextcat build error
     # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
     unset CPPFLAGS
@@ -179,6 +186,11 @@ prepare() {
 	done
 	popd
 
+    # unowinreg.dll must be a file not a symlink or the result will become a broken symlink
+    # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+    rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+    cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
+
     # fix not upstreamable pyuno paths - patch taken from Debian
     patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
 
@@ -215,6 +227,7 @@ build() {
 		--libdir=/usr/lib --mandir=/usr/share/man \
 		--with-lang="" \
 		--enable-crashdump \
+		--enable-avahi \
 		--enable-dbus \
 		--enable-evolution2\
 		--enable-gio\
@@ -224,11 +237,15 @@ build() {
 		--enable-gtk3 \
 		--enable-gstreamer \
 		--enable-lockdown\
+		--enable-opencl \
 		--enable-opengl \
+		--enable-openssl \
 		--enable-odk\
+		--enable-orcus \
 		--enable-python=system \
 		--enable-scripting-beanshell \
 		--enable-scripting-javascript \
+		--enable-telepathy \
 		--enable-ext-wiki-publisher \
 		--enable-ext-nlpsolver \
 		--without-fonts\
@@ -237,7 +254,7 @@ build() {
 		--without-system-libcdr \
 		--without-system-mdds\
 		--without-myspell-dicts \
-		--without-system-libvisio \
+		--with-system-libvisio \
 		--without-system-libcmis \
 		--without-system-libmspub \
 		--without-system-libexttextcat \
@@ -245,8 +262,14 @@ build() {
 		--without-system-liblangtag \
 		--without-system-jfreereport \
 		--without-system-apache-commons \
-		--without-system-libodfgen \
+		--with-system-libodfgen \
 		--without-system-libmwaw \
+		--with-system-libetonyek \
+		--without-system-libfreehand \
+		--without-system-firebird \
+		--without-system-libatomic-ops \
+		--without-system-libebook \
+		--without-system-libabw \
 		--with-system-dicts \
 		--with-external-dict-dir=/usr/share/hunspell \
 		--with-external-hyph-dir=/usr/share/hyphen \
@@ -266,13 +289,11 @@ build() {
 		--with-system-headers\
 		--without-system-hsqldb \
 		--with-alloc=system\
-		--with-system-clucene\
-		--without-system-servlet-api \
-		--enable-hardlink-deliver \
-		--disable-dependency-tracking
-
-#		--enable-mergelibs \ # https://bugs.archlinux.org/task/34414
+		--with-system-clucene \
+		--disable-dependency-tracking \
+		--enable-hardlink-deliver #--help
 
+#		--enable-mergelibs=<all/yes> \ # https://bugs.archlinux.org/task/34414
 #		--without-ppds\ # breaks spadmin permission
 
 #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
@@ -295,20 +316,21 @@ package_libreoffice-common() {
  pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
  install=libreoffice-common.install
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' 'libcups'
-          'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.4"
-          'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
+          'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0" 'telepathy-glib' # (calc telepathy-glib libtubeslo.so)
+          'libodfgen'  'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
              'pstoedit:         translates PostScript and PDF graphics into other vector formats'
              'libmythes:        for use in thesaurus'
-             'beanshell:        interactive java -- good for prototyping /macros'
+             'beanshell2:       interactive java -- good for prototyping/macros'
              'vigra:            C++ computer vision library, usable in Basebmp'
              'libmspack:        library for Microsoft compression formats for use in FontOOo'
              'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import'
              'sane:             for scanner access'
              'unixodbc:         adds ODBC database support'
              'gst-plugins-base-libs:        + some gstr-plugins to support multimedia content, e.g. in impress'
-             'gtk2:             for browser plugin')
+             'gtk2:             for browser plugin'
+             'libpaper:         takes care of papersize')
  backup=(etc/libreoffice/sofficerc
          etc/libreoffice/bootstraprc
          etc/libreoffice/psprint.conf
@@ -321,7 +343,7 @@ package_libreoffice-common() {
  conflicts=('go-openoffice')
  replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
            'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python'
-           'libreoffice-extension-report-builder')
+           'libreoffice-extension-report-builder' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-presentation-minimizer')
 
  # create directories from *list.txt file
  for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do
@@ -362,6 +384,9 @@ package_libreoffice-common() {
 
  # workaround all packages now depend on that file
  cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
+ # workaround lowriter depending on a lib that's part of calc
+ # https://bugs.archlinux.org/task/39038 - https://bugs.freedesktop.org/show_bug.cgi?id=75506
+ cp ${srcdir}/fakeinstall/usr/lib/libreoffice/program/libtubeslo.so ${pkgdir}/usr/lib/libreoffice/program/libtubeslo.so
 
  # add missing files from Beanshell provider
  # create directories from *list.txt file
@@ -427,7 +452,7 @@ package_libreoffice-postgresql-connector() {
 package_libreoffice-calc() {
  pkgdesc="Spreadsheet application for LibreOffice."
  install=libreoffice-calc.install
- depends=('libreoffice-common' 'lpsolve' )
+ depends=('libreoffice-common' 'lpsolve')
  #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332
  groups=('libreoffice')
  replaces=('libreoffice')
@@ -444,6 +469,9 @@ package_libreoffice-calc() {
    # mv file from fakeinstall to pkgdir
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
+ # workaround lowriter depending on a lib that's part of calc
+ # https://bugs.archlinux.org/task/39038 - https://bugs.freedesktop.org/show_bug.cgi?id=75506
+ rm -vf ${pkgdir}/usr/lib/libreoffice/program/libtubeslo.so
 }
 
 package_libreoffice-draw() {
@@ -491,7 +519,7 @@ package_libreoffice-gnome() {
 package_libreoffice-impress() {
  pkgdesc="Presentation Application for LibreOffice."
  install=libreoffice-impress.install
- depends=('libreoffice-common')
+ depends=('libreoffice-common' 'libetonyek')
  optdepends=('glu:             for the OGLTrans extension')
  groups=('libreoffice')
  replaces=('libreoffice')
@@ -632,7 +660,7 @@ package_libreoffice-writer() {
  done
 
  # for workaround this file belongs now to common
- rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
+ rm -vf ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
 }
 
 package_libreoffice-en-US() {
@@ -656,16 +684,6 @@ package_libreoffice-en-US() {
  done
 }
 
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
 package_libreoffice-extension-wiki-publisher() {
 
  pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
@@ -674,7 +692,7 @@ package_libreoffice-extension-wiki-publisher() {
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
+	unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
 }
 
 package_libreoffice-extension-nlpsolver() {
@@ -685,5 +703,5 @@ package_libreoffice-extension-nlpsolver() {
  groups=('libreoffice-extensions')
 
 	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
+	unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
 }
diff --git a/extra/libreoffice/PKGBUILD.42 b/extra/libreoffice/PKGBUILD.42
deleted file mode 100644
index b36102903..000000000
--- a/extra/libreoffice/PKGBUILD.42
+++ /dev/null
@@ -1,698 +0,0 @@
-# $Id: PKGBUILD 202438 2013-12-21 21:14:43Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	'libreoffice-postgresql-connector'
-	'libreoffice-extension-wiki-publisher'
-	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.2.0.4
-pkgver=4.2.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost'
-             'apache-ant' 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit'
-             'beanshell2' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
-             'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen'
-             'clucene' 'bluez-libs' 'harfbuzz-icu' 'gdb'
-             # the runtime dependencies
-             "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=52.1" 
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0'
-             'libvisio' 'libetonyek' 'libodfgen'  'telepathy-glib'
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
-	         'ttf-liberation' # to satisfy regression tests 
-	         'git')
-# there's only one single static library in libreoffice-sdk,
-# the next build that removes it may lead to trouble if people may use it
-# -rw-r--r-- 1 root root 5,1K 12. Okt 23:34 /usr/lib/libreoffice/sdk/lib/libsalcpprt.a
-# options=('staticlibs') 
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
-_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
-_additional_source_url="http://dev-www.libreoffice.org/src"
-_additional_source_url2="http://dev-www.libreoffice.org/extern"
-source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
-	${_additional_source_url}/15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
-	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	${_additional_source_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
-	${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	${_additional_source_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
-	${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/01a380acfec23bf617117ce98e318f3d-mdds_0.10.1.tar.bz2
-	${_additional_source_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
-	${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
-	${_additional_source_url}/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
-	${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
-	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	${_additional_source_url}/libcdr-0.0.14.tar.bz2
-	${_additional_source_url}/libmspub-0.0.6.tar.bz2
-	${_additional_source_url}/libmwaw-0.2.0.tar.bz2
-	${_additional_source_url}/libfreehand-0.0.0.tar.bz2
-	${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
-	${_additional_source_url}/libatomic_ops-7_2d.zip
-	${_additional_source_url}/libe-book-0.0.2.tar.bz2
-	${_additional_source_url}/libabw-0.0.1.tar.bz2
-	make-pyuno-work-with-system-wide-module-install.diff
-	libreoffice-common.sh libreoffice-common.csh)
-noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
-	185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	01a380acfec23bf617117ce98e318f3d-mdds_0.10.1.tar.bz2
-	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
-	22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
-	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
-	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
-	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
-	36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
-	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-	libcdr-0.0.14.tar.bz2
-	libmspub-0.0.6.tar.bz2
-	libmwaw-0.2.0.tar.bz2
-	libfreehand-0.0.0.tar.bz2
-	Firebird-2.5.2.26540-0.tar.bz2
-	libatomic_ops-7_2d.zip
-	libe-book-0.0.2.tar.bz2
-	libabw-0.0.1.tar.bz2)
-md5sums=('98674d57d6dd24baef38f007b5020e8e'
-         '8554bbbdfc72db998a191c71eeafdb55'
-         '4873b18cd8a535814777c8630fe2db9f'
-         '15cb8c0803064faef0c4ddf5bc5ca279'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '625ff5f2f968dd908bca43c9469d6e6b'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         '2e482c7567908d334785ce7d69ddfff7'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '01a380acfec23bf617117ce98e318f3d'
-         'ae330b9493bd4503ac390106ff6060d7'
-         '22f8a85daf4a012180322e1f52a7563b'
-         'ea2acaf140ae40a87a952caa75184f4d'
-         '36271d3fa0d9dec1632029b6d7aac925'
-         '0168229624cfac409e766913506961a8'
-         '17410483b5b5f267aa18b7e00b65e6e0'
-         '185d60944ea767075d27247c3162b3bc'
-         'd88f9b94df880d2c05be943b000ca112'
-         '1120705cd0f0d9bd5506360bf57b6c2e'
-         'd794625f156a9fb1c53b3f8a8aa13b5e'
-         '496dd00028afcc19f896b01394769043'
-         '21154d2004e025c8a3666625b0357bb5'
-         'c0b86562d5aa40761a87134f83e6adcf'
-         '3a62e10c57270718cabfdfc4b7b4e095'
-         'af3ccc1f1884e68389088d490d596409'
-         '07d2bf5ad839a394cca008b3ec6e7bb1'
-         '4195735a80876ae812fca5736b50192a'
-         'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
-
-prepare() {
-
-    cd libreoffice-$_LOver
-#return 1
-    # fix exttextcat build error
-    # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
-    unset CPPFLAGS
-
-	# move external sources into place
-	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
-	for source in "${noextract[@]}"; do
-	  ln -s ${srcdir}/$source .
-	done
-	popd
-	
-    # unowinreg.dll must be a file not a symlink or the result will become a broken symlink
-    # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-    rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-    cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
-   
-    # fix not upstreamable pyuno paths - patch taken from Debian
-    patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
-    
-	#use the CFLAGS but remove the LibO overridden ones
-	for i in $CFLAGS; do
-		case "$i" in
-			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
-		esac
-        ARCH_FLAGS="$ARCH_FLAGS $i"
-	done
-
-
-    # qt4 fix
-    sed -i "s:qmake:qmake-qt4:g" configure.ac
-}
-
-build() {
-    cd libreoffice-$_LOver
-
-	#autoconf -f
-
-	# non-SMP test build
-	#export MAKEFLAGS="-j1"
-	#./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
-
-	./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
-		--enable-split-app-modules \
-		--with-parallelism=${MAKEFLAGS/-j/} \
-		--with-external-tar="${srcdir}/ext_sources" \
-		--disable-fetch-external \
-		--disable-verbose \
-		--enable-release-build \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--libdir=/usr/lib --mandir=/usr/share/man \
-		--with-lang="" \
-		--enable-crashdump \
-		--enable-avahi \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--disable-gnome-vfs\
-		--disable-kde\
-		--enable-kde4\
-		--enable-gtk3 \
-		--enable-gstreamer \
-		--enable-lockdown\
-		--enable-opencl \
-		--enable-opengl \
-		--enable-openssl \
-		--enable-odk\
-		--enable-orcus \
-		--enable-python=system \
-		--enable-scripting-beanshell \
-		--enable-scripting-javascript \
-		--enable-telepathy \
-		--enable-ext-wiki-publisher \
-		--enable-ext-nlpsolver \
-		--without-fonts\
-		--without-afms\
-		--without-system-libwps\
-		--without-system-libcdr \
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--with-system-libvisio \
-		--without-system-libcmis \
-		--without-system-libmspub \
-		--without-system-libexttextcat \
-		--without-system-orcus \
-		--without-system-liblangtag \
-		--without-system-jfreereport \
-		--without-system-apache-commons \
-		--with-system-libodfgen \
-		--without-system-libmwaw \
-		--with-system-libetonyek \
-		--without-system-libfreehand \
-		--without-system-firebird \
-		--without-system-libatomic-ops \
-		--without-system-libebook \
-		--without-system-libabw \
-		--with-system-dicts \
-		--with-external-dict-dir=/usr/share/hunspell \
-		--with-external-hyph-dir=/usr/share/hyphen \
-		--with-external-thes-dir=/usr/share/mythes \
-		--with-system-beanshell \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--without-system-npapi-headers \
-		--with-ant-home="/usr/share/apache-ant"\
-		--without-system-boost\
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mythes\
-		--with-system-headers\
-		--without-system-hsqldb \
-		--with-alloc=system\
-		--with-system-clucene \
-		--disable-dependency-tracking \
-		--enable-hardlink-deliver #--help
-		
-#		--enable-mergelibs=<all/yes> \ # https://bugs.archlinux.org/task/34414
-#		--without-ppds\ # breaks spadmin permission
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-	touch src.downloaded
-	#./download
-	make
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check
-}
-
-#check() {
-#	cd ${srcdir}/build
-#	make check
-#}
-
-package_libreoffice-common() {
-
- pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=libreoffice-common.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' 'libcups'
-          'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0"
-          'libodfgen'  'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'libmythes:        for use in thesaurus'
-             'beanshell2:       interactive java -- good for prototyping/macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gst-plugins-base-libs:        + some gstr-plugins to support multimedia content, e.g. in impress'
-             'gtk2:             for browser plugin'
-             'libpaper:         takes care of papersize')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf
-         etc/profile.d/libreoffice-common.sh
-         etc/profile.d/libreoffice-common.csh)
- groups=('libreoffice')
- provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
-           'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript'	'libreoffice-extension-scripting-python'
-           'libreoffice-extension-report-builder')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
-           'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python'
-           'libreoffice-extension-report-builder' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-presentation-minimizer')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/common_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
- 
- # allow to preset desired VLC
- install -dm755 ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
- 
- # move bash-completion files to its new place
- install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
- rm -rf ${pkgdir}/etc/bash_completion.d
- 
- # make pyuno find its modules
- install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages
- ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py
- ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py
-  
- # workaround all packages now depend on that file
- cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
- 
- # add missing files from Beanshell provider
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file || /bin/true # some double file entries make it fail
- done
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
- install=libreoffice-base.install
- depends=('libreoffice-common')
- optdepends=('libreoffice-postgresql-connector')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-postgresql-connector() {
- pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
- depends=('libreoffice-base' 'postgresql-libs')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # workaround double entries in the file list
- mv ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig
- sort ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- install=libreoffice-calc.install
- depends=('libreoffice-common' 'lpsolve' 'telepathy-glib')
- #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/calc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/calc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- install=libreoffice-draw.install
- depends=('libreoffice-common')
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/draw_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/draw_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gconf')
- optdepends=('gtk3: for gtk3 Gnome integration'
-             'gtk2: for older gtk2 desktop integration')
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/gnome_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/gnome_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- install=libreoffice-impress.install
- depends=('libreoffice-common' 'libetonyek')
- optdepends=('glu:             for the OGLTrans extension')
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/impress_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/impress_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde4_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # one file (libkde4be1lo.so) is part of kde_list.txt
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Application for LibreOffice."
- depends=('libreoffice-common')
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/math_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/math_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
-  # fix environment path to keep compatibility with other java-environments
-#  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Application for LibreOffice."
- install=libreoffice-writer.install
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/writer_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/writer_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # for workaround this file belongs now to common
- rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
-}
-
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-wiki-publisher() {
-
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-nlpsolver() {
-
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 5d48b4865..2bab10435 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 207418 2014-03-08 18:51:10Z lcarlier $
+# $Id: PKGBUILD 207954 2014-03-15 14:36:28Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
 pkgver=10.1.0
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
@@ -121,13 +121,11 @@ package_mesa() {
   replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
 
   mv -v ${srcdir}/fakeinstall/* ${pkgdir}
-  # rename libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
-  mv ${pkgdir}/usr/lib/libGL.so.1.2.0 		${pkgdir}/usr/lib/mesa-libGL.so.1.2.0
-  mv ${pkgdir}/usr/lib/libEGL.so.1.0.0 		${pkgdir}/usr/lib/mesa-libEGL.so.1.0.0
-  mv ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0 	${pkgdir}/usr/lib/mesa-libGLESv1_CM.so.1.1.0
-  mv ${pkgdir}/usr/lib/libGLESv2.so.2.0.0 	${pkgdir}/usr/lib/mesa-libGLESv2.so.2.0.0
-
-  rm ${pkgdir}/usr/lib/lib{GL,EGL,GLESv1_CM,GLESv2}.so*
+  install -m755 -d ${pkgdir}/usr/lib/mesa
+  # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
+  mv -v ${pkgdir}/usr/lib/libGL.so* 	${pkgdir}/usr/lib/mesa/
+  mv -v ${pkgdir}/usr/lib/libEGL.so* 	${pkgdir}/usr/lib/mesa/
+  mv -v ${pkgdir}/usr/lib/libGLES*.so*	${pkgdir}/usr/lib/mesa/
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
@@ -143,18 +141,21 @@ package_mesa-libgl() {
   install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
   ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
 
-  ln -s mesa-libGL.so.1.2.0 	    ${pkgdir}/usr/lib/libGL.so
-  ln -s mesa-libGL.so.1.2.0         ${pkgdir}/usr/lib/libGL.so.1
-  ln -s mesa-libGL.so.1.2.0         ${pkgdir}/usr/lib/libGL.so.1.2.0
-  ln -s mesa-libEGL.so.1.0.0        ${pkgdir}/usr/lib/libEGL.so
-  ln -s mesa-libEGL.so.1.0.0        ${pkgdir}/usr/lib/libEGL.so.1
-  ln -s mesa-libEGL.so.1.0.0        ${pkgdir}/usr/lib/libEGL.so.1.0.0
-  ln -s mesa-libGLESv1_CM.so.1.1.0  ${pkgdir}/usr/lib/libGLESv1_CM.so
-  ln -s mesa-libGLESv1_CM.so.1.1.0  ${pkgdir}/usr/lib/libGLESv1_CM.so.1
-  ln -s mesa-libGLESv1_CM.so.1.1.0  ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0
-  ln -s mesa-libGLESv2.so.2.0.0     ${pkgdir}/usr/lib/libGLESv2.so
-  ln -s mesa-libGLESv2.so.2.0.0     ${pkgdir}/usr/lib/libGLESv2.so.2
-  ln -s mesa-libGLESv2.so.2.0.0     ${pkgdir}/usr/lib/libGLESv2.so.2.0.0
+  ln -s /usr/lib/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0
+  ln -s libGL.so.1.2.0	             ${pkgdir}/usr/lib/libGL.so.1
+  ln -s libGL.so.1.2.0               ${pkgdir}/usr/lib/libGL.so
+
+  ln -s /usr/lib/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.0.0
+  ln -s libEGL.so.1.0.0	              ${pkgdir}/usr/lib/libEGL.so.1
+  ln -s libEGL.so.1.0.0               ${pkgdir}/usr/lib/libEGL.so
+
+  ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0
+  ln -s libGLESv1_CM.so.1.1.0	            ${pkgdir}/usr/lib/libGLESv1_CM.so.1
+  ln -s libGLESv1_CM.so.1.1.0               ${pkgdir}/usr/lib/libGLESv1_CM.so
+
+  ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0
+  ln -s libGLESv2.so.2.0.0               ${pkgdir}/usr/lib/libGLESv2.so.2
+  ln -s libGLESv2.so.2.0.0               ${pkgdir}/usr/lib/libGLESv2.so
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"