From d14a25fc4f65ae3d6e62f4668e9cb88d74834255 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 18 Mar 2012 00:02:54 +0000 Subject: Sun Mar 18 00:02:53 UTC 2012 --- extra/bftpd/PKGBUILD | 22 +- extra/clamav/PKGBUILD | 12 +- extra/dovecot/PKGBUILD | 8 +- extra/fwbuilder/PKGBUILD | 10 +- extra/iptraf-ng/PKGBUILD | 5 +- extra/jhead/PKGBUILD | 6 +- extra/kdeadmin/PKGBUILD | 19 +- extra/kdebindings-python/PKGBUILD | 50 +- extra/kdegames/PKGBUILD | 8 +- extra/kdesdk/PKGBUILD | 6 +- extra/kshutdown/PKGBUILD | 13 +- extra/libmtp/PKGBUILD | 10 +- extra/libreoffice/PKGBUILD | 545 ++++++--------------- extra/libreoffice/libreoffice.install | 9 +- extra/libx11/PKGBUILD | 6 +- extra/libxt/PKGBUILD | 14 +- extra/samba/PKGBUILD | 4 +- ...l-never-follow-symlinks-in-rm_rf_children.patch | 32 ++ extra/systemd/PKGBUILD | 20 +- extra/xf86-input-mouse/PKGBUILD | 8 +- extra/xf86-input-synaptics/PKGBUILD | 11 +- ...Fix-inverted-circular-scrolling-direction.patch | 40 ++ extra/zziplib/PKGBUILD | 11 +- 23 files changed, 358 insertions(+), 511 deletions(-) create mode 100644 extra/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch create mode 100644 extra/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch (limited to 'extra') diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD index 4ceec50e9..da44fbf68 100644 --- a/extra/bftpd/PKGBUILD +++ b/extra/bftpd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 135462 2011-08-13 23:06:44Z thomas $ -# Maintainer: Thomas Baechler +# $Id: PKGBUILD 153626 2012-03-16 18:21:58Z thomas $ +# Maintainer: Thomas Bächler pkgname=bftpd -pkgver=3.6 +pkgver=3.7 pkgrel=1 pkgdesc="Small, easy-to-configure FTP server" arch=(i686 x86_64) @@ -19,7 +19,7 @@ source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz bftpd.logrotate bftpd.pam bftpd.xinetd) -md5sums=('7c45b158646e3b266530bf46778fc2d0' +md5sums=('6614e25ef1864ad80d92724d03832407' '56a1bf7738a6db2b2cff89e611f4f11a' '853680dad0df39d0b4d2fb43d4be430a' '96f82c38f3f540b53f3e5144900acf17' @@ -29,25 +29,31 @@ build() { cd "${srcdir}"/$pkgname # The bftpd author keeps screwing up the release tarballs rm -f config.{cache,status} - ./configure --prefix=/usr --enable-pam --mandir=/usr/share/man + ./configure --prefix=/usr \ + --enable-pam \ + --mandir=/usr/share/man \ + --sysconfdir=/etc make } package() { cd "${srcdir}"/$pkgname install -d -m755 "${pkgdir}"/usr/{sbin,share/man/man8} - install -d -m755 "${pkgdir}"/var/log install -D -m644 "${srcdir}"/bftpd.logrotate "${pkgdir}"/etc/logrotate.d/bftpd install -D -m755 "${srcdir}"/bftpd.rc "${pkgdir}"/etc/rc.d/bftpd make DESTDIR="${pkgdir}" install # Remove log file and /var/run from the package - rm -f "${pkgdir}"/var/log/bftpd.log - rmdir "${pkgdir}"/var/{run/bftpd,run,log,} + # This guy keeps messing up his Makefile, /usr/var, wtf? + rm -f "${pkgdir}"/usr/var/log/bftpd.log + rmdir "${pkgdir}"/usr/var/{run/bftpd,run,log,} # Install PAM file mkdir -p "${pkgdir}"/etc/pam.d cp "${srcdir}"/bftpd.pam "${pkgdir}"/etc/pam.d/bftpd # Install xinetd file install -D -m644 "${srcdir}"/bftpd.xinetd "${pkgdir}"/etc/xinetd.d/bftpd + # Did I mention this guy keeps messing up his Makefiles? + mv "${pkgdir}"/usr/etc/bftpd.conf "${pkgdir}"/etc/ + rmdir "${pkgdir}"/usr/etc # Fix default in config file sed 's|#ROOTDIR="/path/for/anonymous/user"|# bftpd interprets ROOTDIR="%h" (the default), as ROOTDIR="/" for the anonymous user, override it\n ROOTDIR="/srv/ftp"|' -i "${pkgdir}"/etc/bftpd.conf } diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index c6f92be84..e5dbf286e 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 145066 2011-12-16 09:17:40Z bisson $ +# $Id: PKGBUILD 153568 2012-03-16 04:06:01Z bisson $ # Contributor: Dale Blount # Contributor: Gregor Ibic # Maintainer: Gaetan Bisson pkgname=clamav -pkgver=0.97.3 -pkgrel=2 +pkgver=0.97.4 +pkgrel=1 pkgdesc='Anti-virus toolkit for Unix' url='http://www.clamav.net/' license=('GPL') @@ -13,12 +13,12 @@ options=('!libtool') arch=('i686' 'x86_64') depends=('bzip2' 'libltdl') backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" 'rc.d' 'conf.d' 'logrotate' 'config.patch') -sha1sums=('263c7b8b7dc1536652ab64e32263d1c60e138655' +sha1sums=('56f90cf8a73acba8f97beca86b42c65c3923935d' '50cfe02c97e4297a0efd25b23142408380305d30' 'cb116cdab49a810381a515cbcfb6a6c148547f07' 'be3310d2b41a68ce06e33c84ab68ffe59fdce104' @@ -28,7 +28,9 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../config.patch + ./configure \ --prefix=/usr \ --sysconfdir=/etc/clamav \ diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index ae1d51f17..f8a3f715c 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 153549 2012-03-15 21:48:10Z andyrtr $ +# $Id: PKGBUILD 153623 2012-03-16 18:05:31Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Paul Mattal # Contributor: Federico Quagliata (quaqo) # Contributor: GARETTE Emmanuel pkgname=dovecot -pkgver=2.1.2 +pkgver=2.1.3 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') @@ -20,8 +20,8 @@ provides=('imap-server' 'pop3-server') options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh) -md5sums=('6ab61b962ff7e732ea9faa0fa41a28cb' - 'fb097826d991cd70894a914d01b0e2a1' +md5sums=('a0e25243862c61de6274cf7d682a76ec' + '85c2737b822e095b1120e322f13ce3ad' '587159e84e2da6f83d70b3c706ba87cc') build() { diff --git a/extra/fwbuilder/PKGBUILD b/extra/fwbuilder/PKGBUILD index 63370145d..725cc0c95 100644 --- a/extra/fwbuilder/PKGBUILD +++ b/extra/fwbuilder/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139474 2011-10-02 02:49:30Z eric $ +# $Id: PKGBUILD 153570 2012-03-16 04:12:42Z eric $ # Maintainer: Kevin Piche # Contributor: Tom Newsom pkgname=fwbuilder -pkgver=5.0.0.3568 -pkgrel=2 +pkgver=5.0.1.3592 +pkgrel=1 pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms" url="http://www.fwbuilder.org/" arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ license=('GPL') depends=('libxslt' 'net-snmp' 'qt') conflicts=('libfwbuilder') install=fwbuilder.install -source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/5.0.0/fwbuilder-${pkgver}.tar.gz") -md5sums=('0324edab10329dde029953d646aa8dad') +source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/${pkgver%.*}/fwbuilder-${pkgver}.tar.gz") +md5sums=('50b567a9752e9dd4f4cd0d988d74d879') build() { cd "${srcdir}/fwbuilder-${pkgver}" diff --git a/extra/iptraf-ng/PKGBUILD b/extra/iptraf-ng/PKGBUILD index 1b3e5a30a..3d0dfddf0 100644 --- a/extra/iptraf-ng/PKGBUILD +++ b/extra/iptraf-ng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 152688 2012-03-08 20:30:23Z foutrelis $ +# $Id: PKGBUILD 153597 2012-03-16 13:00:51Z ibiru $ # Maintainer: Ionut Biru # Maintainer: sh0 pkgname=iptraf-ng pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A console-based network monitoring utility (a fork of original iptraf)" url="https://fedorahosted.org/iptraf-ng/" arch=('i686' 'x86_64') @@ -27,5 +27,4 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR=$pkgdir install - install -dm755 "$pkgdir/var/lib/iptraf" } diff --git a/extra/jhead/PKGBUILD b/extra/jhead/PKGBUILD index 16d1650c4..66f7f2f95 100644 --- a/extra/jhead/PKGBUILD +++ b/extra/jhead/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144342 2011-12-04 21:25:01Z eric $ +# $Id: PKGBUILD 153645 2012-03-17 03:19:37Z eric $ # Maintainer: François Charette # Contributor: Giovanni Scafora pkgname=jhead -pkgver=2.93 +pkgver=2.95 pkgrel=1 pkgdesc="EXIF JPEG info parser and thumbnail remover" url="http://www.sentex.net/~mwandel/jhead/" @@ -13,7 +13,7 @@ depends=('glibc') optdepends=('libjpeg: to up-right images according to rotation tag') source=(http://www.sentex.net/~mwandel/${pkgname}/${pkgname}-${pkgver}.tar.gz LICENSE) -md5sums=('23ac51b4aea2df663d684744e282eb7d' +md5sums=('49599697ffc1830648b057916165a192' '1f0db611d2642a981719f45252762a45') build() { diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index a8cdfe6c8..84a60878e 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153114 2012-03-12 09:14:51Z andrea $ +# $Id: PKGBUILD 153588 2012-03-16 10:27:43Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -8,12 +8,12 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') pkgver=4.8.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeadmin') -makedepends=('cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common') +makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') sha1sums=('0ee44575bfb45159ced6d4d046b07323ebab00e7' @@ -67,15 +67,14 @@ package_kdeadmin-kuser() { package_kdeadmin-system-config-printer-kde() { pkgdesc='Configure local and remote Printers' - depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt' - 'cups' 'python2-gobject2') + depends=('kdebindings-python2' 'system-config-printer-common' 'cups' 'python2-gobject2') url="http://kde.org/applications/system/printerapplet/" cd $srcdir/build/system-config-printer-kde make DESTDIR=$pkgdir install - # Use the python2 executable - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py - sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \ - "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py + # Use the python2 executable + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + "${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py + sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \ + "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py } diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 5389b88a7..9e352d5fe 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,23 +1,34 @@ -# $Id: PKGBUILD 153078 2012-03-12 09:04:41Z andrea $ +# $Id: PKGBUILD 153599 2012-03-16 14:50:09Z andrea $ # Maintainer: Andrea Scarpino -pkgname=kdebindings-python +pkgbase=kdebindings-python +pkgname=('kdebindings-python' + 'kdebindings-python2') pkgver=4.8.1 -pkgrel=1 -pkgdesc="KDE bindings for Python" -url="http://kde.org/" +pkgrel=3 +url='http://kde.org/' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla') -makedepends=('cmake' 'automoc4' 'boost') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'qscintilla') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") sha1sums=('b9ef35269d2e08578ba20d01822dbdbed72bffb8') build() { + export PYTHONDONTWRITEBYTECODE="TRUE" + cd "${srcdir}" mkdir build cd build + cmake ../pykde4-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0 + make + cd .. + + mkdir build-python2 + cd build-python2 cmake ../pykde4-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -25,9 +36,32 @@ build() { make } -package() { +package_kdebindings-python() { + pkgdesc="A set of Python 3.x bindings for KDE" + depends=('kdepim-runtime' 'pyqt' 'qscintilla') + cd "${srcdir}"/build make DESTDIR="${pkgdir}" install +} + +package_kdebindings-python2() { + pkgdesc="A set of Python 2.x bindings for KDE" + depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla') + conflicts=('kdebindings-python<4.8.1-2') + + cd "${srcdir}"/build-python2 + make DESTDIR="${pkgdir}" install + + # Fix conflicts + rm "${pkgdir}"/usr/bin/pykdeuic4 + ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \ + "${pkgdir}"/usr/bin/python2-pykdeuic4 + + mv "${pkgdir}"/usr/share/apps/pykde4/examples \ + "${pkgdir}"/usr/share/apps/pykde4/python2-examples + + mv "${pkgdir}"/usr/share/sip/PyKDE4 \ + "${pkgdir}"/usr/share/sip/python2-PyKDE4 # Use the python2 executable find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD index d28f5d297..efc11f64a 100644 --- a/extra/kdegames/PKGBUILD +++ b/extra/kdegames/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153166 2012-03-12 09:29:12Z andrea $ +# $Id: PKGBUILD 153590 2012-03-16 10:44:31Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -44,12 +44,12 @@ pkgname=('kdegames-bomber' 'kdegames-lskat' 'kdegames-palapeli') pkgver=4.8.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdegames') -makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python' +makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python2' 'openal') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") sha1sums=('bcf764fd1f2f8083c388c17f26b83eeac568b1d5') @@ -101,7 +101,7 @@ package_kdegames-granatier() { package_kdegames-kajongg() { pkgdesc='The ancient Chinese board game for 4 players' - depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted') + depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python2' 'twisted') url="http://www.kde.org/applications/games/kajongg/" install='kdegames.install' cd $srcdir/build/kajongg diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index f207de92e..e83f481c2 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153200 2012-03-12 09:39:38Z andrea $ +# $Id: PKGBUILD 153595 2012-03-16 11:45:06Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -23,7 +23,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') pkgver=4.8.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -183,7 +183,7 @@ package_kdesdk-kuiviewer() { package_kdesdk-lokalize() { pkgdesc='Computer-Aided Translation System' - depends=('kdebase-runtime' 'kdebindings-python') + depends=('kdebase-runtime' 'kdebindings-python2') url="http://kde.org/applications/development/lokalize/" optdepends=('translate-toolkit: enable extra python script') install='kdesdk-lokalize.install' diff --git a/extra/kshutdown/PKGBUILD b/extra/kshutdown/PKGBUILD index 9f17d4da3..9f4da82e0 100644 --- a/extra/kshutdown/PKGBUILD +++ b/extra/kshutdown/PKGBUILD @@ -1,24 +1,21 @@ -# $Id: PKGBUILD 151542 2012-02-27 16:09:41Z giovanni $ +# $Id: PKGBUILD 153572 2012-03-16 04:44:09Z eric $ # Maintainer: Tobias Powalowski pkgname=kshutdown -pkgver=3.0beta2 +pkgver=3.0beta3 pkgrel=1 pkgdesc="Shutdown Utility for KDE" arch=(i686 x86_64) url="http://kshutdown.sourceforge.net/" license=('GPL') depends=('kdebase-workspace') -makedepends=('pkgconfig' 'cmake' 'automoc4') +makedepends=('pkg-config' 'cmake' 'automoc4') install='kshutdown.install' -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip" - 'kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch') -md5sums=('1621e19cc74c9578b6cfc3e32166f853' - 'c03185629d063c8ebbf59a423cf78980') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip") +md5sums=('2b1ee9aa2300989650cd808c3860cd0a') build() { cd "${srcdir}" - patch -Np0 -i "${srcdir}/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch" mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index 811b29c8f..5631f21e2 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 145614 2011-12-24 03:54:58Z dreisner $ +# $Id: PKGBUILD 153576 2012-03-16 05:45:45Z eric $ # Contributor: damir # Contributor: Kevin Edmonds pkgname=libmtp -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 -pkgdesc="library implementation of the Media Transfer Protocol" +pkgdesc="Library implementation of the Media Transfer Protocol" arch=("i686" "x86_64") url="http://libmtp.sourceforge.net" license=('LGPL') -depends=('libusb-compat') +depends=('libusb') options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('073e1c2a00ba377f68dce47727e185ae') +md5sums=('6dc708757e3fd3ccce7445b4f2171263') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index bf7c8472b..c9f0c41f5 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 148834 2012-02-05 11:52:15Z ibiru $ +# $Id: PKGBUILD 153604 2012-03-16 15:27:04Z andyrtr $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -14,58 +14,39 @@ pkgname=('libreoffice-common' 'libreoffice-sdk-doc' 'libreoffice-writer' 'libreoffice-en-US' - #'libreoffice-extension-barcode' # - 'libreoffice-extension-diagram' - 'libreoffice-extension-google-docs' - 'libreoffice-extension-hunart' - #'libreoffice-extension-lightproof' # no source integration - #'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity - 'libreoffice-extension-nlpsolver' - 'libreoffice-extension-ct2n' - 'libreoffice-extension-numbertext' - 'libreoffice-extension-oooblogger' + 'libreoffice-postgresql-connector' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' 'libreoffice-extension-presentation-minimizer' - 'libreoffice-extension-report-builder' - 'libreoffice-extension-scripting-beanshell' - 'libreoffice-extension-scripting-javascript' - 'libreoffice-extension-scripting-python' - 'libreoffice-extension-typo' - 'libreoffice-extension-validator' - 'libreoffice-extension-watch-window' - 'libreoffice-extension-wiki-publisher') -_LOver=3.4.5.2 -pkgver=3.4.5 -pkgrel=2 + 'libreoffice-extension-report-builder') +_LOver=3.5.1.2 +pkgver=3.5.1 +pkgrel=1 arch=('i686' 'x86_64') -#_LO_tree="3.4" -_OFFICEUPD="340" license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc>=2.3.1' 'hsqldb-java' 'boost' - 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' - 'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost' + 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' + 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' + 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' #'saxon' - currently broken - # the depends from libreoffice main pkg + # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' 'librsvg' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script - 'ttf-dejavu') # to satisfy regression tests + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' + 'ttf-dejavu') # to satisfy regression tests # 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" -#_mirror="http://dev-builds.libreoffice.org/pre-releases-3-4/src" -_additional_source_url="http://hg.services.openoffice.org/binaries" _additional_source_url="http://dev-www.libreoffice.org/src" -source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations - ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 +source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz + ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz + ${_additional_source_url}/d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.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 @@ -88,31 +69,23 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions ${_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}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 + ${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 + ${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 + ${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt - buildfix_boost.diff - buildfix_ct2n.diff - vbahelper.visibility.patch - scp2-more-reasonable-file-access-rights.diff) -noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll - f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e + smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 + buildfix_kde4fpicker.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=ee67c55260ec7723c39606955ccdbd3e2934935a) +noextract=(d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 + 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz + 185d60944ea767075d27247c3162b3bc-unowinreg.dll 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz + e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 + 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip @@ -130,39 +103,12 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll 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 - 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - 7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt - 41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt - 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt - bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt - 23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt - b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt - b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt - 9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt - dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt - b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt - 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2) -md5sums=('a75d7d4ebefb4c9a4bb256acf866fa81' - 'c1e2dabdf4cfcd5957779014a7f9787e' - '79c9c7fc208e7f56af09f284f261a7da' - 'c83a8a374d3d5cc83c6ac3b5ff613e46' - 'fa64799ebad8cbd2c160ac2f87bd5599' - 'b24fba57aa4185934e86a0a8db4a3433' - '4f98020088ab9b597fc21b617121bd47' - '3c3be7c5f923339c90b0d1d6ecad0243' - '3a0bb4bb096b7488533ed2ee466a2bc9' - 'f2b180aa1eff3884b4ca81c048f1e327' - 'a9af488ef92ad4442eafba874249c529' - 'db6a67c96a9090bc5e21b64e202a984e' - 'e00187ae0840e1f6a00fa3290cacf0d1' - '20fbf6cffd2b06e90a52105b75a57828' - '4af055f590732ec19a2534b2278ac49c' - 'c84693796d2b1d9c8269425b1fa53aef' - 'd4926dc27b6884656feec6753f4fdf22' - '770678ca19cca0f7985c1c82b2dccf48' - '97a1e3de430b124faf35bf334248ad53' - 'f02578f5218f217a9f20e9c30e119c6a' + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) +md5sums=('1edf0d39a7a921f6415f6a6ec7b314b3' + '607b544cd7b38f9e6db6fe7da25007a7' + 'a3fa7818bfab14a6cccec645193e9982' + '18f577b374d60b3c760a3a3350407632' + 'd28864eb2b59bb57b034c0d4662a3cee' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -185,53 +131,37 @@ md5sums=('a75d7d4ebefb4c9a4bb256acf866fa81' 'ace6ab49184e329db254e454a010f56d' 'db60e4fde8dd6d6807523deb71ee34dc' 'ba2930200c9f019c2d93a8c88c651a0f' - '18f577b374d60b3c760a3a3350407632' '0ff7d225d087793c8c2c680d77aac3e7' + 'e1c178b18f130b40494561f02bc1a948' + '7c2549f6b0a8bb604e6c4c729ffdcfe6' '185d60944ea767075d27247c3162b3bc' - '90401bca927835b6fbae4a707ed187c8' - '451ccf439a36a568653b024534669971' - '7e7efc5d4a03126bb9ae3ae9aa2c4e87' - '41c9b65ad60af4b3255bbecdfef11736' - 'bbdd5639ada63e3130761daaecae1a10' - '23bd75552206dfcd8fd4e29137dcac84' - 'b8cbca7b3363e6ca2d02bc0ba2b63904' - 'b632bdd25649cc4067bcb410bae23d2b' - '9d60b6cfa3ef1926848710bbcd11115b' - 'dbaafd21de055e582d92d7d32fe9da13' - 'b7b2d0e04e142f26dd96119c80757d1f' - 'bc228237108cab7745897a9f466b6d39' - 'eee273f501ff45dc5f1365e78c6d57c0' - '43b145db28e6c0d73578ae6fd35e510d' - '37638431e7e40baf2e47966ebb9bc0e9') + '60ce5dc9bd098f95c2e621a930c98dd9' + '661a52a02a31b3afbe4b3b3146061afd' + '15fe8b5d79fbdc0b6bc2b454086671e7') build() { unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh - [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh - # move all LibO sources into one build directory - mkdir ${srcdir}/build && cd ${srcdir}/build - for i in libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}; do #,translations - mv ${srcdir}/$i/* . - done -# mv ${srcdir}/libreoffice-bootstrap-${_LOver}/* . -# ./bin/unpack-sources ${srcdir}/build + cd ${srcdir}/libreoffice-core-$_LOver # move external sources into place - mkdir ${srcdir}/ext_sources && cd ${srcdir}/ext_sources + mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources for source in "${noextract[@]}"; do ln -s ${srcdir}/$source . done - - cd ${srcdir}/build + popd + + ln -s ../libreoffice-help-$_LOver/helpcontent2 . + ln -s ../libreoffice-translations-$_LOver/translations . # buildfixes & bugfixes - #patch -Np1 -i ${srcdir}/buildfix_boost.diff - patch -Np1 -i ${srcdir}/buildfix_ct2n.diff - patch -Np0 -i ${srcdir}/vbahelper.visibility.patch - patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff + # one late fix to solve make distro-pack-install issue + patch -Np1 -i ${srcdir}/gmake_install.diff + patch -Np1 -i ${srcdir}/smp_buildfix.diff + patch -Np1 -i ${srcdir}/buildfix_kde4fpicker.diff # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 @@ -249,31 +179,22 @@ build() { # python2 fix export PYTHON=python2 - # http://wiki.documentfoundation.org/Development/How_to_build/Configure_options - -# if [ "$CARCH" = "x86_64" ]; then -# EXTRAOPTS="--without-stlport" -# else -# EXTRAOPTS="--with-stlport" # --without-system-boost" -# # # avoid problems with ixion for now -# sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1 -# fi - - # needed for 0003-distro-install-fix-en-US-only-installation.patch - autoconf -f +# autoconf -f # non-SMP test build # export MAKEFLAGS="-j1" - ./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ + #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ +# touch autogen.lastrun + ./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ --with-unix-wrapper="libreoffice" \ --enable-split-app-modules \ --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ --with-external-tar="${srcdir}/ext_sources" \ + --disable-fetch-external \ --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ - --with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \ + --libdir=/usr/lib --mandir=/usr/share/man \ --disable-verbose \ --with-lang="" \ - --enable-cairo\ --enable-crashdump \ --enable-dbus \ --enable-evolution2\ @@ -281,66 +202,59 @@ build() { --disable-gnome-vfs\ --disable-kde\ --enable-kde4\ - --enable-ldap \ + --enable-gtk3 \ --enable-lockdown\ + --enable-mergelibs \ --enable-opengl \ --enable-odk\ - --enable-ext-barcode \ - --enable-ext-diagram \ - --enable-ext-google-docs \ - --enable-ext-hunart \ - --disable-ext-lightproof \ --disable-ext-mysql-connector \ --with-system-mysql \ - --enable-ext-nlpsolver \ - --enable-ext-ct2n \ - --enable-ext-numbertext \ - --enable-ext-oooblogger \ - --enable-ext-pdfimport \ - --enable-ext-presenter-console \ - --enable-ext-presenter-minimizer \ - --enable-ext-report-builder \ - --enable-ext-scripting-beanshell \ - --enable-ext-scripting-javascript \ - --enable-ext-scripting-python \ - --enable-ext-typo \ - --enable-ext-validator \ - --enable-ext-watch-window \ - --enable-ext-wiki-publisher \ + --enable-librsvg=system \ --without-fonts\ --without-afms\ --without-ppds\ --without-system-libwps\ --without-system-mdds\ --without-myspell-dicts \ + --without-system-libvisio \ + --without-system-libcmis \ + --without-system-sampleicc \ + --without-system-libexttextcat \ --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-saxon\ - --with-system-libtextcat \ - --with-external-libtextcat-data \ - --with-openldap\ + --disable-mozilla \ + --without-system-mozilla \ + --without-system-mozilla-headers \ --with-ant-home="/usr/share/java/apache-ant"\ - --without-system-boost\ + --with-system-boost\ --with-system-cairo\ --with-system-libs\ - --with-system-mozilla\ --with-system-mythes\ - --with-system-xrender-headers\ --with-system-headers\ + --with-system-hsqldb \ --with-alloc=system\ --with-system-lucene\ --with-lucene-core-jar=/usr/share/java/lucene-core.jar\ --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ --with-java-target-version=1.5 \ - $EXTRAOPTS || return 1 + $EXTRAOPTS + +# --disable-ext-lightproof \ + +#--with-install-dirname="${pkgbase}" +# --enable-cairo\ +# --with-system-libtextcat \ +# --with-external-libtextcat-data \ #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool #--with-servlet-api-jar=JARFILE @@ -350,10 +264,7 @@ build() { touch src.downloaded #./download - unset MAKEFLAGS - ./bootstrap make - # fake installation to create split file lists mkdir $srcdir/fakeinstall make DESTDIR=${srcdir}/fakeinstall distro-pack-install @@ -368,11 +279,9 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=${pkgbase}.install - depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6" - 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script - #'java-runtime' + depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" + 'nspr' "icu>=4.6" 'libsm' 'redland' 'hyphen' 'graphite' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') #'saxon' optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' @@ -382,12 +291,10 @@ package_libreoffice-common() { 'pstoedit: translates PostScript and PDF graphics into other vector formats' 'poppler: for shipped pdfimport extension' 'libmythes: for use in thesaurus' - 'hsqldb-java: default database format for OpenOffice.org' 'beanshell: 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' - 'libldap: to get profiles via ldap' 'lucene: full-text search engine library for Java needed in the help section' 'sane: for scanner access' 'unixodbc: adds ODBC database support' @@ -401,11 +308,11 @@ package_libreoffice-common() { replaces=('go-openoffice' 'openoffice-base' 'libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/common_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_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/build/file-lists/common_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_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 @@ -413,18 +320,14 @@ package_libreoffice-common() { mv ${srcdir}/fakeinstall${file} ${pkgdir}$file done - # # remove version in menu entry and make it visible -# sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop -# echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop - # 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/basis3.4/share/psprint/psprint.conf ${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/basis3.4/share/psprint/ + cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ ln -vsf /etc/libreoffice/psprint.conf . #fix http://bugs.archlinux.org/task/17656 @@ -436,18 +339,18 @@ package_libreoffice-common() { package_libreoffice-base() { pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI." - depends=('libreoffice-common') - optdepends=() + depends=('libreoffice-common' 'hsqldb-java') + optdepends=('libreoffice-postgresql-connector') backup=() groups=('libreoffice') replaces=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/base_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_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/build/file-lists/base_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_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 @@ -456,6 +359,35 @@ package_libreoffice-base() { 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') + + # no file-list so far + install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services + install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program + install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program + install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program + install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry + install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry + +# # create directories from *list.txt file +# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_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-core-$_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." depends=('libreoffice-common' 'lpsolve' ) @@ -465,11 +397,11 @@ package_libreoffice-calc() { replaces=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/calc_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_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/build/file-lists/calc_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_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 @@ -487,11 +419,11 @@ package_libreoffice-draw() { replaces=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/draw_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_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/build/file-lists/draw_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_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 @@ -502,17 +434,17 @@ package_libreoffice-draw() { package_libreoffice-gnome() { pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." - depends=('libreoffice-common' 'dbus-glib') + depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib' optdepends=() backup=() groups=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/gnome_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_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/build/file-lists/gnome_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_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 @@ -530,11 +462,11 @@ package_libreoffice-impress() { replaces=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/impress_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_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/build/file-lists/impress_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_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 @@ -551,11 +483,11 @@ package_libreoffice-kde4() { groups=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/kde4_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_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/build/file-lists/kde4_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_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 @@ -573,11 +505,11 @@ package_libreoffice-math() { replaces=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/math_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_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/build/file-lists/math_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_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 @@ -594,11 +526,11 @@ package_libreoffice-sdk() { groups=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_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/build/file-lists/sdk_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_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 @@ -608,9 +540,9 @@ package_libreoffice-sdk() { # fix ArchLinux LibreOffice installation paths sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \ - -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \ + -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/sdk," \ -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ - -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \ + -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \ -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \ -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ @@ -618,7 +550,7 @@ package_libreoffice-sdk() { -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \ -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \ -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \ - -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in + -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{csh,sh}.in } package_libreoffice-sdk-doc() { @@ -629,11 +561,11 @@ package_libreoffice-sdk-doc() { groups=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_doc_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_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/build/file-lists/sdk_doc_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_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 @@ -642,7 +574,7 @@ package_libreoffice-sdk-doc() { done #fix permissions - find ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/examples -type f -exec chmod -x {} \; + find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \; } package_libreoffice-writer() { @@ -654,11 +586,11 @@ package_libreoffice-writer() { replaces=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/writer_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_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/build/file-lists/writer_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_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 @@ -675,11 +607,11 @@ package_libreoffice-en-US() { conflicts=(openoffice-en-US) # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/lang_en_US_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_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/build/file-lists/lang_en_US_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_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 @@ -688,117 +620,6 @@ package_libreoffice-en-US() { done } -package_libreoffice-extension-barcode() { - - pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw " - #arch=('any') - depends=('libreoffice-common') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode - chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode -} - -package_libreoffice-extension-diagram() { - - pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram -} - -package_libreoffice-extension-google-docs() { - - pkgdesc="Google Documents extension for LibreOffice" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs -} - -package_libreoffice-extension-hunart() { - - pkgdesc="Hungarian cross-reference toolbar extension" - #arch=('any') - depends=('libreoffice-common') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart -} - -#package_libreoffice-extension-lightproof() { - -# pkgdesc="Lightproof extension for LibreOffice" - #arch=('any') -# depends=('libreoffice-common') -# groups=('libreoffice-extensions') - -# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions -# unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof -#} - -#package_libreoffice-extension-mysql-connector() { - -# pkgdesc="MySQL Connector extension for LibreOffice" - #arch=('any') -# depends=('libreoffice-common') -# groups=('libreoffice-extensions') - -# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions -# unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector -#} - -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}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver -} - -package_libreoffice-extension-ct2n() { - - pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates." - #arch=('any') - depends=('libreoffice-common') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n -} - -package_libreoffice-extension-numbertext() { - - pkgdesc="NUMBERTEXT/MONEYTEXT extensions" - #arch=('any') - depends=('libreoffice-common') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext -} - -package_libreoffice-extension-oooblogger() { - - pkgdesc="An extensions for blogging" - #arch=('any') - depends=('libreoffice-common' 'coreutils' 'python') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger -} - package_libreoffice-extension-pdfimport() { pkgdesc="This extension allows you to import and modify PDF documents" @@ -806,7 +627,7 @@ package_libreoffice-extension-pdfimport() { groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport } package_libreoffice-extension-presenter-screen() { @@ -816,7 +637,7 @@ package_libreoffice-extension-presenter-screen() { groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen } package_libreoffice-extension-presentation-minimizer() { @@ -826,7 +647,7 @@ package_libreoffice-extension-presentation-minimizer() { groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer } package_libreoffice-extension-report-builder() { @@ -837,81 +658,5 @@ package_libreoffice-extension-report-builder() { groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder -} - -package_libreoffice-extension-scripting-beanshell() { - - pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell -} - -package_libreoffice-extension-scripting-javascript() { - - pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript -} - -package_libreoffice-extension-scripting-python() { - - pkgdesc="LibreOffice extension - Enables support for scripts in Python" - depends=('libreoffice-common' 'python') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python -} - -package_libreoffice-extension-typo() { - - pkgdesc="Typography toolbar extension" - #arch=('any') - depends=('libreoffice-common') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo - find ${pkgdir} -type d -exec chmod 755 {} \; - #chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo -} - -package_libreoffice-extension-validator() { - - pkgdesc="Validator extension for LibreOffice" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator -} - -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}/build/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher -} - -package_libreoffice-extension-watch-window() { - - pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen." - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder } diff --git a/extra/libreoffice/libreoffice.install b/extra/libreoffice/libreoffice.install index cb0d393dd..e66b66f3d 100644 --- a/extra/libreoffice/libreoffice.install +++ b/extra/libreoffice/libreoffice.install @@ -1,7 +1,6 @@ post_install() { -gtk-update-icon-cache -f -q /usr/share/icons/hicolor -#xdg-icon-resource forceupdate --theme hicolor +xdg-icon-resource forceupdate --theme hicolor update-desktop-database -q update-mime-database usr/share/mime > /dev/null 2>&1 @@ -25,8 +24,7 @@ echo " * make sure you have installed some ttf font (ttf-dejavu recommended)" post_upgrade() { # post_install $1 -gtk-update-icon-cache -f -q /usr/share/icons/hicolor -#xdg-icon-resource forceupdate --theme hicolor +xdg-icon-resource forceupdate --theme hicolor update-desktop-database -q update-mime-database usr/share/mime > /dev/null 2>&1 if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then @@ -44,7 +42,6 @@ update-mime-database usr/share/mime > /dev/null 2>&1 post_remove() { update-desktop-database -q -gtk-update-icon-cache -f -q /usr/share/icons/hicolor -#xdg-icon-resource forceupdate --theme hicolor +xdg-icon-resource forceupdate --theme hicolor update-mime-database usr/share/mime > /dev/null 2>&1 } diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD index fc3fd1d0b..67228de92 100644 --- a/extra/libx11/PKGBUILD +++ b/extra/libx11/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153292 2012-03-12 20:52:22Z andyrtr $ +# $Id: PKGBUILD 153607 2012-03-16 17:04:23Z andyrtr $ # Maintainer: Jan de Groot pkgname=libx11 -pkgver=1.4.99.1 +pkgver=1.4.99.901 pkgrel=1 pkgdesc="X11 client-side library" arch=(i686 x86_64) @@ -14,7 +14,7 @@ license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2 xorg.sh xorg.csh) -sha1sums=('317e0112926926a52c13f56f71c1ec9e4540cf4d ' +sha1sums=('af10b064c1c64ee9e7daae0a7f1f9719eb7e965a' '4b756387426afb2a5bb7a155631ec42348abf5c1' '45b0b310776cf5d9a94b4a18a5c63ddad9de6ba8') diff --git a/extra/libxt/PKGBUILD b/extra/libxt/PKGBUILD index 21c48820f..8fd5b915a 100644 --- a/extra/libxt/PKGBUILD +++ b/extra/libxt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153273 2012-03-12 20:17:00Z andyrtr $ +# $Id: PKGBUILD 153609 2012-03-16 17:09:01Z andyrtr $ #Maintainer: Jan de Groot pkgname=libxt -pkgver=1.1.2 -pkgrel=2 +pkgver=1.1.3 +pkgrel=1 pkgdesc="X11 toolkit intrinsics library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -11,15 +11,11 @@ license=('custom') depends=('libsm' 'libx11') makedepends=('xorg-util-macros') options=('!libtool') -source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2" - Revert_treat_unexpected_returned_events_from_poll_as_errors.diff) -sha1sums=('9e84b807419d78bda4acbd7aea05aed2ab0556cf' - 'bebadf4b90f6a49530b5600a12a9385253e0daa6') +source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2") +sha1sums=('2cef068bc4d7170e31b89b5c06aeaf4451a7699a') build() { cd "${srcdir}/libXt-${pkgver}" - # revert broken commit, see https://bugs.archlinux.org/task/28844 + https://bugs.archlinux.org/task/28875 + https://bugs.freedesktop.org/show_bug.cgi?id=47203 - patch -Np1 -R -i ${srcdir}/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index f6bf687d5..b3093389f 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 151755 2012-03-02 08:43:36Z tpowa $ +# $Id: PKGBUILD 153619 2012-03-16 17:50:36Z stephane $ # Maintainer: Tobias Powalowski # Contributor: judd pkgbase=samba @@ -8,7 +8,7 @@ pkgver=3.6.3 # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=3.6.3 -pkgrel=2 +pkgrel=4 arch=(i686 x86_64) url="http://www.samba.org" license=('GPL3') diff --git a/extra/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch b/extra/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch new file mode 100644 index 000000000..7ac9251b3 --- /dev/null +++ b/extra/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch @@ -0,0 +1,32 @@ +From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001 +From: Michal Schmidt +Date: Fri, 2 Mar 2012 10:39:10 +0100 +Subject: [PATCH] util: never follow symlinks in rm_rf_children() + +The function checks if the entry is a directory before recursing, but +there is a window between the check and the open, during which the +directory could be replaced with a symlink. + +CVE-2012-1174 +https://bugzilla.redhat.com/show_bug.cgi?id=803358 +--- + src/util.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/util.c b/src/util.c +index 20cbc2b..dfc1dc6 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) { + if (is_dir) { + int subdir_fd; + +- if ((subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) { ++ subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW); ++ if (subdir_fd < 0) { + if (ret == 0 && errno != ENOENT) + ret = -errno; + continue; +-- +1.7.9.4 + diff --git a/extra/systemd/PKGBUILD b/extra/systemd/PKGBUILD index 9e77b3e95..d1f60b49c 100644 --- a/extra/systemd/PKGBUILD +++ b/extra/systemd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153036 2012-03-11 15:14:05Z heftig $ +# $Id: PKGBUILD 153641 2012-03-17 02:44:42Z dreisner $ # Maintainer: Dave Reisner pkgbase=systemd pkgname=('systemd' 'libsystemd') -pkgver=43 -pkgrel=4 +pkgver=44 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2') @@ -12,17 +12,17 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool' 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" - "os-release" "cpp-compat.patch") -md5sums=('446cc6db7625617af67e2d8e5f503a49' + "os-release" + 0001-util-never-follow-symlinks-in-rm_rf_children.patch) +md5sums=('11f44ff74c87850064e4351518bcff17' '752636def0db3c03f121f8b4f44a63cd' - '414968aa314ced0b0ab4b2207e46aa69') + 'b5863d6d4b47e2b5bda8eb57bde0d327') build() { cd "$pkgname-$pkgver" - - # Fix C++ compile error when including sd-login.h - # http://comments.gmane.org/gmane.comp.sysutils.systemd.devel/4514 - patch -p1 -i ../cpp-compat.patch + + # https://bugzilla.redhat.com/show_bug.cgi?id=803358 + patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch" ./configure --sysconfdir=/etc \ --libexecdir=/usr/lib \ diff --git a/extra/xf86-input-mouse/PKGBUILD b/extra/xf86-input-mouse/PKGBUILD index f7f68e5f9..4fd8b64d8 100644 --- a/extra/xf86-input-mouse/PKGBUILD +++ b/extra/xf86-input-mouse/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153309 2012-03-12 20:52:47Z andyrtr $ +# $Id: PKGBUILD 153613 2012-03-16 17:12:24Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-input-mouse -pkgver=1.7.1 -pkgrel=3 +pkgver=1.7.2 +pkgrel=1 pkgdesc="X.org mouse input driver" arch=(i686 x86_64) license=('custom') @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.11.99.902') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('11a6402e82d65bda5fb559c5e9bc72f3fd7af2ed') +sha1sums=('0da6390c6f3d7d636110a52f08193739929ae4ae') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD index 28e169f2c..2e1710d8c 100644 --- a/extra/xf86-input-synaptics/PKGBUILD +++ b/extra/xf86-input-synaptics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153467 2012-03-14 18:01:52Z andyrtr $ +# $Id: PKGBUILD 153621 2012-03-16 17:56:02Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Tobias Powalowski # Contributor: Thomas Bächler @@ -6,7 +6,7 @@ pkgname=xf86-input-synaptics pkgver=1.5.99.901 -pkgrel=1 +pkgrel=2 pkgdesc="Synaptics driver for notebook touchpads" arch=('i686' 'x86_64') license=('custom') @@ -21,12 +21,15 @@ groups=('xorg-drivers' 'xorg') options=(!libtool) backup=('etc/X11/xorg.conf.d/10-synaptics.conf') source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - 10-synaptics.conf) + 10-synaptics.conf + synaptics-Fix-inverted-circular-scrolling-direction.patch) sha1sums=('8836b1c2bf443b2c11f38457e203c5309698d9d0' - '68e1f4ef5e1038231d210eb422fa4d18c5922f0f') + '68e1f4ef5e1038231d210eb422fa4d18c5922f0f' + '2e35cde5db6c435f612a5c6802f33aca8ba1b6bb') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/synaptics-Fix-inverted-circular-scrolling-direction.patch ./configure --prefix=/usr make } diff --git a/extra/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch b/extra/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch new file mode 100644 index 000000000..fee383855 --- /dev/null +++ b/extra/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch @@ -0,0 +1,40 @@ +From patchwork Wed Mar 14 03:27:29 2012 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: [synaptics] Fix inverted circular scrolling direction +Date: Wed, 14 Mar 2012 03:27:29 -0000 +From: Peter Hutterer +X-Patchwork-Id: 9512 +Message-Id: <20120314032729.GA16614@yabbi.bne.redhat.com> +To: "X.Org Devel List" +Cc: Thomas =?iso-8859-1?Q?B=E4chler?= + +Introduced in 26831a6eeac6762ad4d99532f62ebbab0827de10. +In said commit, the old-style button events were changed to delta +accumulation. Alas, for circular scrolling, a positive delta is up whereas +for everything else a positive delta is down. + +Reported-by: Thomas Bächler +Signed-off-by: Peter Hutterer + +--- +src/synaptics.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/synaptics.c b/src/synaptics.c +index fa46f0d..c9609cd 100644 +--- a/src/synaptics.c ++++ b/src/synaptics.c +@@ -2554,9 +2554,9 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw, + double diff = diffa(priv->scroll.last_a, angle(priv, hw->x, hw->y)); + if (delta >= 0.005 && diff != 0.0) { + if (priv->circ_scroll_vert) +- priv->scroll.delta_y += diff / delta * para->scroll_dist_vert; ++ priv->scroll.delta_y -= diff / delta * para->scroll_dist_vert; + else +- priv->scroll.delta_x += diff / delta * para->scroll_dist_horiz;; ++ priv->scroll.delta_x -= diff / delta * para->scroll_dist_horiz;; + priv->scroll.last_a = angle(priv, hw->x, hw->y); + DBG(priv, 10, "circ scoll delta: %.2f diff %.2f angle %.2f\n", delta, diff, priv->scroll.last_a); + } diff --git a/extra/zziplib/PKGBUILD b/extra/zziplib/PKGBUILD index 4783fc5ee..1dfd249fd 100644 --- a/extra/zziplib/PKGBUILD +++ b/extra/zziplib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126501 2011-06-05 18:50:29Z remy $ +# $Id: PKGBUILD 153578 2012-03-16 06:20:51Z eric $ # Maintainer: Rémy Oudompheng # Contributor: Daniel J Griffiths # Contributor: Roman Kyrylych pkgname=zziplib -pkgver=0.13.60 +pkgver=0.13.62 pkgrel=1 pkgdesc="A lightweight library that offers the ability to easily extract data from files archived in a single zip file" arch=('i686' 'x86_64') @@ -13,15 +13,12 @@ license=('LGPL' 'MPL') depends=('zlib') makedepends=('python2') options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - zziplib-0.13.60-ldflags.patch) -md5sums=('54a6aa53262483a4d54f7c59f0a7258b' - 'e585052f884525a338ca341b5d2957dc') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('5fe874946390f939ee8f4abe9624b96c') build() { cd "${srcdir}/${pkgname}-${pkgver}" export PYTHON=/usr/bin/python2 - patch -p1 -i ../zziplib-0.13.60-ldflags.patch ./configure --prefix=/usr make } -- cgit v1.2.3-54-g00ecf