diff options
85 files changed, 2895 insertions, 295 deletions
diff --git a/community-staging/libgda3/PKGBUILD b/community-staging/libgda3/PKGBUILD new file mode 100644 index 000000000..07313f713 --- /dev/null +++ b/community-staging/libgda3/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 49363 2011-06-15 09:20:21Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=libgda3 +pkgver=3.1.5 +pkgrel=9 +pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers" +arch=('i686' 'x86_64') +url="http://www.gnome-db.org/Download" +license=('GPL') +depends=('glib2' 'libxslt' 'popt' 'rarian' 'db' 'gnome-vfs' + 'libmysqlclient' 'postgresql-libs>=8.4.1' 'libldap' 'unixodbc' 'sqlite3') +makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'util-linux-ng') +options=('!libtool' '!distcc') +source=(http://ftp.acc.umu.se/pub/GNOME/sources/libgda/3.1/libgda-$pkgver.tar.bz2) +md5sums=('eb7da5286a112e7cff3111c89fba4456') + +build() { + cd "$srcdir/libgda-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc + make +} +package(){ + cd "$srcdir/libgda-$pkgver" + make DESTDIR=$pkgdir install + cd "$pkgdir" && find -name \*..so -exec rename '..so' '.a' {} \; +} diff --git a/community-staging/librcc/PKGBUILD b/community-staging/librcc/PKGBUILD new file mode 100644 index 000000000..ca2eb950c --- /dev/null +++ b/community-staging/librcc/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 49369 2011-06-15 09:26:07Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=librcc +pkgver=0.2.6 +pkgrel=4 +pkgdesc="Charset Conversion Library" +arch=(i686 x86_64) +url="http://rusxmms.sourceforge.net/" +license=('GPL') +depends=(aspell enca libxml2 db librcd) +makedepends=(patch gtk gtk2) +install=librcc.install +source=(http://downloads.sourceforge.net/rusxmms/${pkgname}-${pkgver}.tar.bz2 + librcc-strnlen.patch) +md5sums=('9bbf248c7312c73c0b6ca19b9c5a2af1' + '040313d1d8f166ccf2b128cea4c05f21') + +build() { + cd ${startdir}/src/$pkgname-${pkgver} + ./configure --prefix=/usr + patch -p1 <$srcdir/librcc-strnlen.patch + make +} + +package() { + cd ${startdir}/src/$pkgname-${pkgver} + mkdir -p $startdir/pkg/etc/rcc + mkdir -p $startdir/pkg/usr/lib/rcc/engines + mkdir -p $startdir/pkg/usr/bin + + make DESTDIR=$startdir/pkg install + + rm -f $startdir/pkg/usr/lib/*.la + rm -f $startdir/pkg/usr/lib/rcc/engines/*.a + rm -f $startdir/pkg/usr/lib/rcc/engines/*.la + + make -C examples + make -C examples install DESTDIR=$startdir/pkg + rm -f $startdir/pkg/usr/bin/example* + + install -m 644 examples/rcc.xml $startdir/pkg/etc + + if [ -f $startdir/pkg/usr/bin/rcc-gtk2-config ]; then + ln -s rcc-gtk2-config $startdir/pkg/usr/bin/rcc-config + elif [ -f $startdir/pkg/usr/bin/rcc-gtk-config ]; then + ln -s rcc-gtk-config $startdir/pkg/usr/bin/rcc-config + else + echo "#!/bin/bash" > $startdir/pkg/usr/bin/rcc-config + echo "echo \"Configuration UI is not available!\"" >> $startdir/pkg/usr/bin/rcc-config + fi +} diff --git a/community-staging/librcc/librcc-strnlen.patch b/community-staging/librcc/librcc-strnlen.patch new file mode 100644 index 000000000..9fc0e8b0b --- /dev/null +++ b/community-staging/librcc/librcc-strnlen.patch @@ -0,0 +1,17 @@ +diff -wbBur librcc-0.2.6/src/rccstring.h librcc-0.2.6.qwe/src/rccstring.h +--- librcc-0.2.6/src/rccstring.h 2006-01-08 15:42:59.000000000 +0000 ++++ librcc-0.2.6.qwe/src/rccstring.h 2009-09-28 08:45:37.000000000 +0000 +@@ -18,13 +18,6 @@ + int rccStringFixID(rcc_string string, rcc_context ctx); + int rccStringChangeID(rcc_string string, rcc_language_id language_id); + +-#ifdef HAVE_STRNLEN +-# ifndef strnlen +-int strnlen(const char *str, size_t size); +-# endif /* !strnlen */ +-#else +-int rccStrnlen(const char *str, size_t size); +-#endif /* HAVE_STRNLEN */ + int rccIsASCII(const char *str); + size_t rccStringSizedGetChars(const char *str, size_t size); + diff --git a/community-staging/librcc/librcc.install b/community-staging/librcc/librcc.install new file mode 100644 index 000000000..53b1d7ce7 --- /dev/null +++ b/community-staging/librcc/librcc.install @@ -0,0 +1,6 @@ +post_install() { + echo "-- Don't forget to install gtk or/and gtk2 packages to enable librcc" + echo " gui features" + echo "-- Also you may change /usr/bin/rcc-config symlink to switch between" + echo " gtk and gtk2 (rcc-gtk-config and rcc-gtk2-config)" +} diff --git a/community-staging/perl-berkeleydb/PKGBUILD b/community-staging/perl-berkeleydb/PKGBUILD new file mode 100644 index 000000000..f586d53b0 --- /dev/null +++ b/community-staging/perl-berkeleydb/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 49372 2011-06-15 09:28:37Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Charles Mauch <cmauch@gmail.com> +# Contributor: Francois Charette <firmicus@gmx.net> + +pkgname=perl-berkeleydb +pkgver=0.43 +pkgrel=6 +pkgdesc="Interface to Berkeley DB version 2, 3 or 4" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/BerkeleyDB/" +license=('GPL' 'PerlArtistic') +depends=('perl' 'db') +options=('!emptydirs') +source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz) +md5sums=('3d0cf0651ed8cd3fc36e328d5924a1e9') + +build() { + cd $srcdir/BerkeleyDB-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + _dbver=`pacman -Q db | cut -d\ -f2 | cut -d- -f1` + depends=('perl' "db=$_dbver") + + cd $srcdir/BerkeleyDB-$pkgver + make pure_install doc_install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete +} diff --git a/community-staging/perl-libapreq2/PKGBUILD b/community-staging/perl-libapreq2/PKGBUILD new file mode 100644 index 000000000..b9526091a --- /dev/null +++ b/community-staging/perl-libapreq2/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 49380 2011-06-15 09:32:23Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Tom K <tomk@runbox.com> + +pkgname=perl-libapreq2 +pkgver=2.12 +pkgrel=9 +pkgdesc="A safe, standards-compliant, high-performance library used for parsing HTTP cookies, query-strings and POST data." +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/libapreq2" +depends=('mod_perl' 'apr-util') +makedepends=('perl-extutils-xsbuilder' 'perl-version') +license=("GPL") +options=('!libtool' '!makeflags') +source=(http://www.cpan.org/authors/id/J/JO/JOESUF/libapreq2-$pkgver.tar.gz) +md5sums=('76e2acde0d82246dea6f2565f3746eec') + +build() { + cd $srcdir/libapreq2-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL --with-apache2-apxs=/usr/sbin/apxs + find . -type f -name Makefile -exec sed -i 's#-ldb-5.1#-ldb-5.2#' {} \; + sed -i 's#-ldb-5.1#-ldb-5.2#' apreq2-config + make +} +package(){ + cd $srcdir/libapreq2-$pkgver + make install DESTDIR=$pkgdir + sed -i "s#$srcdir#/usr/src#" $pkgdir/usr/bin/apreq2-config + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete +} diff --git a/community-staging/poedit/PKGBUILD b/community-staging/poedit/PKGBUILD new file mode 100644 index 000000000..8c606f322 --- /dev/null +++ b/community-staging/poedit/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 49387 2011-06-15 09:36:08Z spupykin $ +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Alexander Fehr <pizzapunk@gmail.com> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=poedit +pkgver=1.4.6.1 +pkgrel=5 +pkgdesc="Cross-platform gettext catalogs (.po files) editor" +arch=('i686' 'x86_64') +url="http://www.poedit.net/" +license=('custom') +depends=('wxgtk>=2.8.11' 'gtkspell' 'db>=5.1' 'hicolor-icon-theme' 'gettext') +makedepends=('pkgconfig') +install=poedit.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('c63ffd991b1a6085ef356a6922356e0a') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/community-staging/poedit/poedit.install b/community-staging/poedit/poedit.install new file mode 100644 index 000000000..21b79d2d4 --- /dev/null +++ b/community-staging/poedit/poedit.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/community/courier-imap/PKGBUILD b/community/courier-imap/PKGBUILD index e54fb7dd5..575b7d7b9 100644 --- a/community/courier-imap/PKGBUILD +++ b/community/courier-imap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 47569 2011-05-23 20:05:54Z svenstaro $ +# $Id: PKGBUILD 49375 2011-06-15 09:29:55Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: tobias <tobias@archlinux.org> # Committer: Manolis Tzanidakis <manolis@archlinux.org> pkgname=courier-imap pkgver=4.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="IMAP(s)/POP3(s) Server" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -20,10 +20,23 @@ provides=('imap-server' 'pop3-server') options=('!libtool') source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgname}-${pkgver}.tar.bz2 courier-imap.conf.d - courier-imap.rc.d) + courier-imap.rc.d + imapd.rc.d + imapd-ssl.rc.d + pop3d.rc.d + pop3d-ssl.rc.d) md5sums=('703ddbb090569436dbda61d0d62b1eb8' '3e08f017f6c5a52dea28f6f0dbd50b86' - '3e4910c5a34af68dfdeed932e573a9f9') + '3e4910c5a34af68dfdeed932e573a9f9' + 'ca799c7014d002fb9f8ff671610337bd' + '268693ccf3f081897b78490a70cf3211' + 'c2e65d9b136f59eb0cf5377e7c46de88' + 'e07c43fdf2e5ae6d73fc3281f6332b62') +install=$pkgname.install + +# MIGRATION NOTE: +# In 2012, support for courier-imap.conf.d and courier-imap.rc.d will be removed. +# Remove those files and this note and also courier-imap.install build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -73,5 +86,9 @@ package() { done # install thingies install -D -m 755 ${srcdir}/courier-imap.rc.d ${pkgdir}/etc/rc.d/courier-imap + install -D -m 755 ${srcdir}/imapd.rc.d ${pkgdir}/etc/rc.d/imapd + install -D -m 755 ${srcdir}/imapd-ssl.rc.d ${pkgdir}/etc/rc.d/imapd-ssl + install -D -m 755 ${srcdir}/pop3d.rc.d ${pkgdir}/etc/rc.d/pop3d + install -D -m 755 ${srcdir}/pop3d-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl install -D -m 644 ${srcdir}/courier-imap.conf.d ${pkgdir}/etc/conf.d/courier-imap } diff --git a/community/courier-imap/courier-imap.install b/community/courier-imap/courier-imap.install new file mode 100644 index 000000000..cf73119e2 --- /dev/null +++ b/community/courier-imap/courier-imap.install @@ -0,0 +1,16 @@ +post_upgrade() { + echo "Please migrate to the new daemon format:" + echo "/etc/rc.d/courier-imap has been split into separate daemons:" + echo " imapd, imads-ssl, pop3d, pop3d-ssl" + echo "This elimates the need for /etc/conf.d/courier-imap" + echo "Update your /etc/rc.conf and manually add the desired daemons. Make sure" + echo "you first start authdaemond before any other of these daemons." + echo "Example prior to this change:" + echo " DAEMONS=( ... courier-imap ...)" + echo "Example after this change:" + echo " DAEMONS=( ... authdaemond imapd imapd-ssl pop3d pop3d-ssl .. )" + echo "This allows better control over the daemons and will generate" + echo "correct entries in /run/daemons" + echo "An old configuration will keep working but please do migrate in time" + echo "as support for this will be removed some time in 2012." +} diff --git a/community/courier-imap/imapd-ssl.rc.d b/community/courier-imap/imapd-ssl.rc.d new file mode 100644 index 000000000..3430bd73e --- /dev/null +++ b/community/courier-imap/imapd-ssl.rc.d @@ -0,0 +1,47 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if [ ! -f /var/run/daemons/authdaemond ]; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier imapd-ssl" + /usr/lib/courier-imap/imapd-ssl.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon imapd-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier imapd-ssl" + /usr/lib/courier-imap/imapd-ssl.rc stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon imapd-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community/courier-imap/imapd.rc.d b/community/courier-imap/imapd.rc.d new file mode 100644 index 000000000..ec4df03f5 --- /dev/null +++ b/community/courier-imap/imapd.rc.d @@ -0,0 +1,47 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if [ ! -f /var/run/daemons/authdaemond ]; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier imapd" + /usr/lib/courier-imap/imapd.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon imapd + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier imapd" + /usr/lib/courier-imap/imapd.rc stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon imapd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community/courier-imap/pop3d-ssl.rc.d b/community/courier-imap/pop3d-ssl.rc.d new file mode 100644 index 000000000..8b147ff32 --- /dev/null +++ b/community/courier-imap/pop3d-ssl.rc.d @@ -0,0 +1,47 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if [ ! -f /var/run/daemons/authdaemond ]; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier pop3d-ssl" + /usr/lib/courier-imap/pop3d-ssl.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pop3d-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier pop3d-ssl" + /usr/lib/courier-imap/pop3d-ssl.rc stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon pop3d-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community/courier-imap/pop3d.rc.d b/community/courier-imap/pop3d.rc.d new file mode 100644 index 000000000..6a2c66ad0 --- /dev/null +++ b/community/courier-imap/pop3d.rc.d @@ -0,0 +1,47 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if [ ! -f /var/run/daemons/authdaemond ]; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier pop3d" + /usr/lib/courier-imap/pop3d.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pop3d + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier pop3d" + /usr/lib/courier-imap/pop3d.rc stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon pop3d + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD index 7bee3245f..c2c4b64dc 100644 --- a/community/courier-mta/PKGBUILD +++ b/community/courier-mta/PKGBUILD @@ -9,7 +9,7 @@ pkgname=courier-mta pkgver=0.66.1 -pkgrel=1 +pkgrel=3 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" arch=(i686 x86_64 'mips64el') license=('GPL2') @@ -25,16 +25,34 @@ url="http://courier-mta.org" depends=('courier-authlib>=0.63.0' 'fam' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates') optdepends=('libldap') makedepends=('apache>=2.2.9-3' 'pam>=1.0.1-2' 'expect' 'gnupg' 'libldap' 'fam') -provides=('smtp-server' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop') -conflicts=('courier-imap' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp') +provides=('smtp-server' 'smtp-forwarder' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop') +conflicts=('courier-imap' 'smtp-forwarder' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp') options=('!libtool') install=courier-mta.install source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2 courier-mta.rc.d - courier-mta.conf.d) + courier-mta.conf.d + esmtpd.rc.d + esmtpd-ssl.rc.d + imapd.rc.d + imapd-ssl.rc.d + pop3d.rc.d + pop3d-ssl.rc.d + webmaild.rc.d) md5sums=('79250d71d88ba2bcb630b7356f0250cd' 'e140f320968e57cfe459cd7a3b4017e0' - 'f3ff70b40c7a1f7a017e8c4cc4d92f4f') + 'f3ff70b40c7a1f7a017e8c4cc4d92f4f' + '799ddd56ff6c9cff132e8c771dde23d9' + 'c3b634ea6a671b660bf6a660cef57138' + 'd7c951a7e55674778077d5123ec41006' + 'dabac9fa0e46872049c02ef6bf83b1f0' + '6e9e176eb966759a1f2e3838fccf4e3c' + '5c0ddedca1cf2298182dbbb461c189bf' + 'ec5c0383d617c1f4877ebba9a9727ef4') + +# MIGRATION NOTE: +# In 2012, support for courier-mta.conf.d and courier-mta.rc.d will be removed. +# Remove those files and this note and also courier-mta.install build() { cd ${srcdir}/courier-${pkgver} @@ -97,6 +115,13 @@ package() { # arch specific scripts install -Dm 644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/courier-mta install -Dm 755 ${srcdir}/${pkgname}.rc.d ${pkgdir}/etc/rc.d/courier-mta + install -D -m 755 ${srcdir}/imapd.rc.d ${pkgdir}/etc/rc.d/imapd + install -D -m 755 ${srcdir}/imapd-ssl.rc.d ${pkgdir}/etc/rc.d/imapd-ssl + install -D -m 755 ${srcdir}/pop3d.rc.d ${pkgdir}/etc/rc.d/pop3d + install -D -m 755 ${srcdir}/pop3d-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl + install -D -m 755 ${srcdir}/esmtpd.rc.d ${pkgdir}/etc/rc.d/imapd-ssl + install -D -m 755 ${srcdir}/esmtpd-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d + install -D -m 755 ${srcdir}/webmaild.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl #install -Dm 655 ${srcdir}/courier-webmail-cleancache.cron.hourly \ # ${pkgdir}/etc/cron.hourly/courier-webmail-cleancache # bug http://bugs.archlinux.org/task/5154 diff --git a/community/courier-mta/courier-mta.install b/community/courier-mta/courier-mta.install index eac627867..64de4da6b 100644 --- a/community/courier-mta/courier-mta.install +++ b/community/courier-mta/courier-mta.install @@ -18,6 +18,21 @@ pre_upgrade() { # arg 2: the old package version post_upgrade() { post_install $1 + echo "Please migrate to the new daemon format:" + echo "/etc/rc.d/courier-imap has been split into separate daemons:" + echo " imapd, imads-ssl, pop3d, pop3d-ssl" + echo "This elimates the need for /etc/conf.d/courier-imap" + echo "Update your /etc/rc.conf and manually add the desired daemons. Make sure" + echo "you first start authdaemond before any other of these daemons." + echo "Example prior to this change:" + echo " DAEMONS=( ... courier-mta ...)" + echo "Example after this change:" + echo " DAEMONS=( ... authdaemond esmtpd esmtpd-ssl imapd imapd-ssl" + echo " pop3d pop3d-ssl webmaild ... )" + echo "This allows better control over the daemons and will generate" + echo "correct entries in /run/daemons" + echo "An old configuration will keep working but please do migrate in time" + echo "as support for this will be removed some time in 2012." } @@ -28,7 +43,7 @@ pre_remove() { cp /etc/courier/aliases/system /etc/courier/_backup/aliases.system cp /etc/courier/smtpaccess/default /etc/courier/_backup/smtpaccess.default cat << EOM - --> the /etc/courier/aliase/system and the /etc/courier/smtpaccess/default + --> the /etc/courier/aliases/system and the /etc/courier/smtpaccess/default --> files have been backed up to /etc/courier/_backup since the *.pacsave --> files cannot stay in place. Read about couriers alias handling from the --> documentation! diff --git a/community/courier-mta/esmtpd-ssl.rc.d b/community/courier-mta/esmtpd-ssl.rc.d new file mode 100644 index 000000000..78001332f --- /dev/null +++ b/community/courier-mta/esmtpd-ssl.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if [ ! -f /var/run/daemons/authdaemond ]; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier esmtpd-ssl" + /usr/sbin/esmtpd-ssl start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon esmtpd-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier esmtpd-ssl" + /usr/sbin/esmtpd-ssl stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon esmtpd-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/courier-mta/esmtpd.rc.d b/community/courier-mta/esmtpd.rc.d new file mode 100644 index 000000000..951aa3e6e --- /dev/null +++ b/community/courier-mta/esmtpd.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if [ ! -f /var/run/daemons/authdaemond ]; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier esmtpd" + /usr/sbin/esmtpd start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon esmtpd + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier esmtpd" + /usr/sbin/esmtpd stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon esmtpd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/courier-mta/imapd-ssl.rc.d b/community/courier-mta/imapd-ssl.rc.d new file mode 100644 index 000000000..7b21fda76 --- /dev/null +++ b/community/courier-mta/imapd-ssl.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if [ ! -f /var/run/daemons/authdaemond ]; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier imapd-ssl" + /usr/sbin/imapd-ssl start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon imapd-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier imapd-ssl" + /usr/sbin/imapd-ssl stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon imapd-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/courier-mta/imapd.rc.d b/community/courier-mta/imapd.rc.d new file mode 100644 index 000000000..7a8bff410 --- /dev/null +++ b/community/courier-mta/imapd.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if [ ! -f /var/run/daemons/authdaemond ]; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier imapd" + /usr/sbin/imapd start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon imapd + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier imapd" + /usr/sbin/imapd stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon imapd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/courier-mta/pop3d-ssl.rc.d b/community/courier-mta/pop3d-ssl.rc.d new file mode 100644 index 000000000..730c6edbf --- /dev/null +++ b/community/courier-mta/pop3d-ssl.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if [ ! -f /var/run/daemons/authdaemond ]; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier pop3d-ssl" + /usr/sbin/pop3d-ssl start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pop3d-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier pop3d-ssl" + /usr/sbin/pop3d-ssl stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon pop3d-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/courier-mta/pop3d.rc.d b/community/courier-mta/pop3d.rc.d new file mode 100644 index 000000000..6ec1d82b6 --- /dev/null +++ b/community/courier-mta/pop3d.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if [ ! -f /var/run/daemons/authdaemond ]; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier pop3d" + /usr/sbin/pop3d start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pop3d + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier pop3d" + /usr/sbin/pop3d stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon pop3d + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/courier-mta/webmaild.rc.d b/community/courier-mta/webmaild.rc.d new file mode 100644 index 000000000..2337e3ce8 --- /dev/null +++ b/community/courier-mta/webmaild.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if [ ! -f /var/run/daemons/authdaemond ]; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier webmaild" + /usr/sbin/webmaild start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon webmaild + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier webmaild" + /usr/sbin/webmaild stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon webmaild + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index a5e7f7318..b91ae57da 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -12,7 +12,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=2.99.1 -pkgrel=3 +pkgrel=4 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" @@ -689,6 +689,8 @@ package_gambas3-gb-opengl() { ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall ## diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD index 6c9f0e18a..3c10f96ea 100644 --- a/community/luxrays/PKGBUILD +++ b/community/luxrays/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 49009 2011-06-09 16:49:54Z stativ $ +# $Id: PKGBUILD 49421 2011-06-15 20:18:28Z ebelanger $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=luxrays pkgver=0.8 @@ -12,7 +12,7 @@ license=('GPL') depends=('freeimage' 'freeglut' 'glew') makedepends=('cmake' 'boost') source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2) -md5sums=('386a3549376ac8240065232ae3294da4') +md5sums=('15a10c7ff9d4047982b140efee792967') build() { cd "$srcdir/luxrender-$pkgname-$_pkgver" diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD index 806e373d4..b9b2fe785 100644 --- a/community/sfml/PKGBUILD +++ b/community/sfml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 47923 2011-05-26 03:12:35Z svenstaro $ +# $Id: PKGBUILD 49427 2011-06-16 03:45:54Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ondrej Martinak <omartinak@gmail.com> @@ -7,7 +7,7 @@ pkgname=sfml _git=true if [[ "${_git}" = "true" ]]; then - pkgver=1.99.git20110526 + pkgver=1.99.git20110616 fi pkgrel=1 @@ -17,6 +17,7 @@ url='http://www.sfml-dev.org/' license=('zlib') depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') makedepends=('git' 'mesa' 'cmake' 'doxygen') +install=sfml.install _gitroot='https://github.com/LaurentGomila/SFML.git' _gitname='SFML' diff --git a/community/sfml/sfml.install b/community/sfml/sfml.install index 9d18b5251..75f760be6 100644 --- a/community/sfml/sfml.install +++ b/community/sfml/sfml.install @@ -1,3 +1,3 @@ post_install() { - echo "To view the SFML samples, go to /opt/SFML/samples/bin and run them individually" + echo "To view the SFML samples, go to /usr/share/SFML/examples/ and run them individually" } diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD index ed4723eeb..d3cff2a50 100644 --- a/community/synfigstudio/PKGBUILD +++ b/community/synfigstudio/PKGBUILD @@ -1,15 +1,17 @@ -# $Id: PKGBUILD 49314 2011-06-14 10:52:04Z spupykin $ +# $Id: PKGBUILD 49390 2011-06-15 10:42:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfigstudio pkgver=0.63.00 -pkgrel=1 +pkgrel=2 pkgdesc="Professional vector animation program (GUI)" arch=(i686 x86_64 'mips64el') url="http://synfig.org" license=('GPL2') depends=('gtkmm' 'synfig') +makedepends=('openexr' 'imagemagick' 'xorg-fonts-100dpi' 'xorg-fonts-75dpi' + 'xorg-fonts-misc' 'xorg-fonts-type1') install=synfigstudio.install source=(http://arch.p5n.pp.ru/~sergej/dl/synfig-$pkgver.tar.gz) md5sums=('ea3633e9522ae89489519af351ba2443') @@ -27,4 +29,15 @@ package() { make DESTDIR=$pkgdir install rm -f $pkgdir/usr/share/pixmaps/$pkgname/*.mng install -m644 images/*.png -t $pkgdir/usr/share/pixmaps/$pkgname/ + rm -f $pkgdir/usr/share/mime/XMLnamespaces + rm -f $pkgdir/usr/share/mime/aliases + rm -f $pkgdir/usr/share/mime/generic-icons + rm -f $pkgdir/usr/share/mime/globs + rm -f $pkgdir/usr/share/mime/globs2 + rm -f $pkgdir/usr/share/mime/icons + rm -f $pkgdir/usr/share/mime/magic + rm -f $pkgdir/usr/share/mime/mime.cache + rm -f $pkgdir/usr/share/mime/subclasses + rm -f $pkgdir/usr/share/mime/treemagic + rm -f $pkgdir/usr/share/mime/types } diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 54a6420d2..6c6ef616d 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127348 2011-06-13 11:08:41Z bisson $ +# $Id: PKGBUILD 127399 2011-06-14 16:51:03Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=5.8p2 -pkgrel=7 +pkgrel=8 pkgdesc='Free version of the SSH connectivity tools' arch=('i686' 'x86_64' 'mips64el') license=('custom:BSD') @@ -20,7 +20,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver} sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5' '3669cb5ca6149f69015df5ce8e60b82c540eb0a4' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - '660092c57bde28bed82078f74011f95fc51c2293' + '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1' '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5') build() { diff --git a/core/openssh/sshd.pam b/core/openssh/sshd.pam index ae028ceb5..ff8829fe9 100644 --- a/core/openssh/sshd.pam +++ b/core/openssh/sshd.pam @@ -8,3 +8,4 @@ account required pam_time.so password required pam_unix.so session required pam_unix_session.so session required pam_limits.so +-session optional pam_ck_connector.so nox11 diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 1e5037778..aff2a41ba 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -19,6 +19,7 @@ build() { cd "${srcdir}" mkdir build cd build + CXX="g++" \ cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index e161588d0..1512f33b7 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 124683 2011-05-23 21:00:48Z ibiru $ +# $Id: PKGBUILD 127476 2011-06-15 14:46:47Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgname=anjuta -pkgver=3.0.2.0 +pkgver=3.0.3.0 pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64' 'mips64el') @@ -14,9 +14,9 @@ depends=('vte3' 'gdl' 'autogen' 'devhelp' 'gtksourceview3' 'glade' 'libgda' makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') url="http://anjuta.sourceforge.net/" install=anjuta.install -source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) +source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('5dce2cf455f9feeea31aea6bce5bae1dbd35793ba8c8009675608dae4d67bac0') +sha256sums=('1615e7a86602fd4d775e8a7d4701260a80caeb8758559197574ccb27a3339368') build() { cd "${srcdir}/anjuta-${pkgver}" diff --git a/extra/atk/PKGBUILD b/extra/atk/PKGBUILD index 91d1f1e3a..723158973 100644 --- a/extra/atk/PKGBUILD +++ b/extra/atk/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 118010 2011-04-05 06:45:40Z heftig $ +# $Id: PKGBUILD 127481 2011-06-15 14:51:32Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=atk -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="A library providing a set of interfaces for accessibility" arch=(i686 x86_64 'mips64el') @@ -9,9 +9,9 @@ license=('LGPL') depends=('glib2') makedepends=('pkgconfig' 'gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) url='http://www.gtk.org/' -sha256sums=('5dbdc35f7f5b3f0748039bb3faa7cd5e45ec3d337a539772bc73acd0dfb55afd') +sha256sums=('4588867bb9eb788b2cf3399d3a2d5e4898193a9027436f6cffc9c18a627452a1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 0c9438d9c..385a72331 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -53,6 +53,9 @@ build() { sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf patch -p1 -i "../avahi-daemon-dbus.patch" + [ "$CARCH" = "mips64el" ] && \ + extra="--disable-qt3 --disable-qt4 --disable-mono" + # pygtk requires python2; make it explicit in case other python are installed: FS#21865 PYTHON=python2 \ PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ @@ -70,6 +73,7 @@ build() { --with-avahi-priv-access-group=network \ --with-autoipd-user=avahi \ --with-autoipd-group=avahi \ + $extra \ --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999 make diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index 1509bdc33..37a46a5b5 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('boost-libs' 'boost') pkgver=1.46.1 _boostver=${pkgver//./_} pkgrel=3 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.boost.org/" makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 70b6986e3..67df353ff 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 118176 2011-04-05 18:06:09Z ibiru $ +# $Id: PKGBUILD 127516 2011-06-15 15:42:10Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clutter -pkgver=1.6.14 +pkgver=1.6.16 pkgrel=1 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ options=('!libtool') license=('LGPL') depends=('gdk-pixbuf2' 'json-glib' 'atk' 'pango' 'mesa' 'libxcomposite' 'libxi') makedepends=('gobject-introspection' 'gtk-doc') -source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('0564e57ca8eb24e76014627c0bb28a80a6c01b620ba14bc4198365562549576d') +source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('206517f8f74252105c46762d11a973b2bae3f2702d2d2ed0cac1206ff5605d9b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 8184369b9..0312bf46a 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -6,7 +6,7 @@ pkgname=cmake pkgver=2.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64' 'mips64el') license=('custom') diff --git a/extra/ebook-tools/PKGBUILD b/extra/ebook-tools/PKGBUILD index d896ab734..10f851255 100644 --- a/extra/ebook-tools/PKGBUILD +++ b/extra/ebook-tools/PKGBUILD @@ -17,6 +17,7 @@ build() { cd "${srcdir}" mkdir build cd build + CXX="g++" \ cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr diff --git a/extra/fftw/PKGBUILD b/extra/fftw/PKGBUILD index 52bbe911e..d2a0d5832 100644 --- a/extra/fftw/PKGBUILD +++ b/extra/fftw/PKGBUILD @@ -26,7 +26,8 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} # use upstream default CFLAGS while keeping our -march/-mtune - CFLAGS+=" -O3 -fomit-frame-pointer -malign-double -fstrict-aliasing -ffast-math" + [ "$CARCH" = "mips64el" ] || CFLAGS+=" -O3 -fomit-frame-pointer -malign-double -fstrict-aliasing -ffast-math" + [ "$CARCH" = "mips64el" ] && CFLAGS+=" -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math" CONFIGURE="./configure F77=gfortran --prefix=/usr \ --enable-shared --enable-threads" diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD index 11ab4b9d2..bc6814ba9 100644 --- a/extra/gdk-pixbuf2/PKGBUILD +++ b/extra/gdk-pixbuf2/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 117317 2011-03-31 00:18:19Z ibiru $ +# $Id: PKGBUILD 127501 2011-06-15 15:14:38Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gdk-pixbuf2 -pkgver=2.23.3 +pkgver=2.23.4 pkgrel=1 pkgdesc="An image loading library for gtk2" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" license=('GPL2') -depends=('glib2>=2.28.1' 'libpng' 'libtiff' 'libjpeg' 'libx11') +depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11') makedepends=('gtk-doc' 'gobject-introspection') options=('!libtool') install=gdk-pixbuf2.install -source=(http://download.gnome.org/sources/gdk-pixbuf/2.23/gdk-pixbuf-${pkgver}.tar.bz2) -sha256sums=('9faba780151c02e13cb2029d512c975e9c41b98cd72de6d2cc50e4af10a5e76a') +source=(http://download.gnome.org/sources/gdk-pixbuf/2.23/gdk-pixbuf-${pkgver}.tar.xz) +sha256sums=('66140dda9fb51b3f3d3612db837e82dcdd830cd83809f1feb92154a146b486d7') build() { cd "${srcdir}/gdk-pixbuf-${pkgver}" diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index dbcf18034..d36f55b99 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 123377 2011-05-10 16:36:13Z ibiru $ +# $Id: PKGBUILD 127486 2011-06-15 14:58:06Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.28.1 +pkgver=2.28.2 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('glib2' 'libsigc++2.0' 'pkgconfig' 'mm-common') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +makedepends=('glib2' 'libsigc++2.0' 'pkgconfig') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) options=('!libtool') url="http://gtkmm.sourceforge.net/" -sha256sums=('ca74638b91296df127caab30f2d0664746bfefa942ce5a5ecc982e0f16edc145') +sha256sums=('f84e99858d9674705316ec40cb3f03c34129293ebd370a7d63df6d959644cbe3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD index 2bddf7e62..31e6c58c5 100644 --- a/extra/gmime/PKGBUILD +++ b/extra/gmime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113007 2011-03-08 07:02:20Z heftig $ +# $Id: PKGBUILD 127466 2011-06-15 14:36:25Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gmime -pkgver=2.4.23 +pkgver=2.4.25 pkgrel=1 pkgdesc="Core mime parsing library" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ url="http://spruce.sourceforge.net/gmime/" depends=('glib2' 'zlib') makedepends=('gtk-sharp-2' 'pkgconfig') options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('0cfd38cd8960979fd6e36a36afa9aec89f33dfe787f2bb11b8e8cdb0809e8377') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('c1044330652e7098b58e4b9c32202c5c99534da34aa260fc3b7cf8506cd56413') build() { # get rid of that .wapi errors in fakeroot diff --git a/extra/gnome-applets/PKGBUILD b/extra/gnome-applets/PKGBUILD index d7f6db5a1..3f7395696 100644 --- a/extra/gnome-applets/PKGBUILD +++ b/extra/gnome-applets/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 123041 2011-05-07 17:45:38Z ibiru $ +# $Id: PKGBUILD 127511 2011-06-15 15:25:32Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-applets -pkgver=3.1.1 +pkgver=3.1.2 pkgrel=1 pkgdesc="GNOME Applets" arch=(i686 x86_64 'mips64el') @@ -13,12 +13,11 @@ options=(!emptydirs) url="http://www.gnome.org" groups=(gnome) install=gnome-applets.install -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-20110506.tar.xz) -sha256sums=('eb19a412e804975d614255520f4c7c6477d927e8d5cb6abe217008ab62ab857b') +source=(http://download.gnome.org/sources/${pkgname}/3.1/${pkgname}-${pkgver}.tar.xz) +sha256sums=('ff1d33c5ca304824ddba75333fddae2d28739b417c8f83598805f34b6140938c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./autogen.sh PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc --libexecdir=/usr/lib/gnome-applets \ --localstatedir=/var --disable-static \ diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index 90fb015d6..cc5b618f2 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -5,7 +5,7 @@ pkgname=hwloc pkgver=1.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64' 'mips64el') url="http://www.open-mpi.org/projects/hwloc/" diff --git a/extra/imap/PKGBUILD b/extra/imap/PKGBUILD index c53316299..0d6ad8a67 100644 --- a/extra/imap/PKGBUILD +++ b/extra/imap/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: judd <jvinet@zeroflux.org> pkgname=imap pkgver=2007e -pkgrel=2 +pkgrel=3 pkgdesc="An IMAP/POP server" arch=('i686' 'x86_64' 'mips64el') license=('APACHE') @@ -32,7 +32,7 @@ build() { cd $srcdir/$pkgname-$pkgver # NOTE: if you wish to enforce SSL, use SSLTYPE=unix.nopwd - if [ "$CARCH" == "x86_64" ]; then + if [ "$CARCH" == "x86_64" -o "$CARCH" == "mips64el" ]; then yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC" || return 1 else yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix || return 1 fi diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD index ec7f56238..5cf085ce0 100644 --- a/extra/json-glib/PKGBUILD +++ b/extra/json-glib/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 119567 2011-04-12 13:36:07Z heftig $ +# $Id: PKGBUILD 127506 2011-06-15 15:19:08Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=json-glib -pkgver=0.12.4 +pkgver=0.12.6 pkgrel=1 pkgdesc="JSON library built on GLib" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/JsonGlib" license=('GPL') -depends=('glib2>=2.26.0') +depends=('glib2') makedepends=('gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.12/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('462cd611016ae189d5e3f258dc7741e6a2e8267404b4e3806aaf346d50f1df7e') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.12/${pkgname}-${pkgver}.tar.xz) +sha256sums=('4f670fc356e7a30121ade956e93236986952bb2601d6678e94eab7d87c8866ce') build(){ cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD index 453768f5c..949de45e5 100644 --- a/extra/kdebase-runtime/PKGBUILD +++ b/extra/kdebase-runtime/PKGBUILD @@ -23,6 +23,7 @@ build() { cd "${srcdir}" mkdir build cd build + CXX="g++" \ cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ diff --git a/extra/kdegraphics/PKGBUILD b/extra/kdegraphics/PKGBUILD index 92daea8ae..127598cd8 100644 --- a/extra/kdegraphics/PKGBUILD +++ b/extra/kdegraphics/PKGBUILD @@ -28,6 +28,7 @@ build() { cd ${srcdir} mkdir build cd build + CXX="g++" \ cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index 428e753e8..1344a9af6 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -19,11 +19,10 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' replaces=('arts' 'kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde-applications-menu.patch' 'archlinux-menu.patch' + 'kde-applications-menu.patch' 'abs-syntax-highlight.patch' 'fix-double-POST-action.patch') sha1sums=('c7fb089c9d52a6b1d9188b9e788753373a3288e4' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67' 'd994f262356af5b9e4e9619646e471bd98c91efb' 'c8ef05943e71a28c4604217d31fc6ca83e48476c') @@ -32,8 +31,6 @@ build() { # avoid file conflict with gnome-menu patch -p1 -i $srcdir/kde-applications-menu.patch - # add Archlinux menu entry - patch -p1 -i $srcdir/archlinux-menu.patch # add syntax highlightning for PKGBUILD and .install files patch -p1 -i $srcdir/abs-syntax-highlight.patch @@ -43,10 +40,12 @@ build() { cd ${srcdir} mkdir build cd build +# Fix for distcc + CXX="g++" \ cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DKDE_DISTRIBUTION_TEXT='Arch Linux' \ + -DKDE_DISTRIBUTION_TEXT='Parabola GNU/LinuxLibre' \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONF_INSTALL_DIR=/etc \ -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \ diff --git a/extra/kdelibs/archlinux-menu.patch b/extra/kdelibs/archlinux-menu.patch deleted file mode 100644 index 546784fa2..000000000 --- a/extra/kdelibs/archlinux-menu.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000 -+++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000 -@@ -16,11 +16,19 @@ - </DefaultLayout> - <Layout> - <Merge type="menus"/> -+ <Menuname>Arch Linux</Menuname> - <Menuname>Applications</Menuname> - <Merge type="files"/> - </Layout> - - <Menu> -+ <Name>Arch Linux</Name> -+ <Directory>Archlinux.directory</Directory> -+ <Include> -+ <Category>Archlinux</Category> -+ </Include> -+ </Menu> -+ <Menu> - <Name>Applications</Name> - <Directory>kde-unknown.directory</Directory> - <OnlyUnallocated/> diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 04520de5d..e285528bc 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -19,6 +19,7 @@ build() { cd ${srcdir} mkdir build cd build + CXX="g++" \ cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ diff --git a/extra/libieee1284/PKGBUILD b/extra/libieee1284/PKGBUILD index bfd5e8d94..58c0d95a0 100644 --- a/extra/libieee1284/PKGBUILD +++ b/extra/libieee1284/PKGBUILD @@ -16,7 +16,7 @@ md5sums=('b8fff9f3d121531bc17430e3f4ea6ed0') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr --mandir=/usr/share/man PYTHON=/usr/bin/python2 make } diff --git a/extra/libsocialweb/PKGBUILD b/extra/libsocialweb/PKGBUILD index b0a66654b..7052dc7e9 100644 --- a/extra/libsocialweb/PKGBUILD +++ b/extra/libsocialweb/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 120409 2011-04-23 20:56:42Z ibiru $ +# $Id: PKGBUILD 127471 2011-06-15 14:38:56Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=libsocialweb -pkgver=0.25.16 +pkgver=0.25.18 pkgrel=1 pkgdesc="A personal social data server" arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring' 'json-glib') makedepends=('intltool' 'gtk-doc') options=('!libtool') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2) -sha256sums=('2726c29c5e334294df81d2d57c750ed86866c64a6b0e14eae7f8c7cc7b033064') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) +sha256sums=('67f4c8b0a49258f65defea1383893ba00aa7280508c980d8eaa1292fa2feb34c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libunique3/PKGBUILD b/extra/libunique3/PKGBUILD index 87f7a09b9..cb9155eeb 100644 --- a/extra/libunique3/PKGBUILD +++ b/extra/libunique3/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 117940 2011-04-04 22:13:19Z ibiru $ +# $Id: PKGBUILD 127496 2011-06-15 15:11:19Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=libunique3 -pkgver=3.0.0 +pkgver=3.0.2 pkgrel=1 pkgdesc="Library for writing single instance applications for GTK3" arch=('i686' 'x86_64') @@ -10,8 +10,8 @@ depends=('gtk3') makedepends=('gtk-doc' 'gobject-introspection') options=('!libtool') url="http://live.gnome.org/LibUnique" -source=(http://ftp.gnome.org/pub/gnome/sources/libunique/${pkgver%.*}/libunique-${pkgver}.tar.bz2) -sha256sums=('e945ff3d3bb7d4085ed73b5418f2935097bb0afc07287739c8f0d6fc049202e1') +source=(http://ftp.gnome.org/pub/gnome/sources/libunique/${pkgver%.*}/libunique-${pkgver}.tar.xz) +sha256sums=('a8f02ce073e2b920cca8ac45d418e7cb64438ad0814780c5912c6d63f8a4e038') build() { cd "${srcdir}/libunique-${pkgver}" diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 91ba866f1..7a271e80b 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -2,12 +2,12 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler -pkgname=('poppler' 'poppler-glib') +pkgname=('poppler' 'poppler-glib' 'poppler-qt') pkgver=0.16.5 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64 'mips64el') license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'pkgconfig' 'lcms' 'gobject-introspection') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') options=('!libtool') url="http://poppler.freedesktop.org/" source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz) @@ -22,7 +22,7 @@ build() { --enable-cairo-output \ --enable-xpdf-headers \ --enable-libjpeg --enable-zlib \ - --disable-poppler-qt4 \ + --enable-poppler-qt4 \ --enable-poppler-glib make } diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index 753c9b2e8..8ccafa245 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 119810 2011-04-15 12:17:53Z stephane $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributer: Stéphane Gaudreault <stephane@archlinux.org> +# $Id: PKGBUILD 127261 2011-06-12 03:23:25Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributer: Allan McRae <allan@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python2 -pkgver=2.7.1 -pkgrel=9 +pkgver=2.7.2 +pkgrel=1 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64' 'mips64el') @@ -16,13 +16,9 @@ makedepends=('tk') optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2 - CVE-2011-1521.patch - python-2.7.1-fix-decimal-in-turkish-locale.patch +source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz python-2.7-db51.patch) -sha1sums=('fbe1894322ff91b80726e269c97454f4129fc2a3' - '31cdc76092d0f598289aaeb18e492874c981904d' - 'baf470682ae7d2b55caaa173696d08d3f468a569' +sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53' '9667a2a2f8594902b352793e649f78696a77bd13') build() { @@ -30,14 +26,6 @@ build() { patch -Np1 -i ../python-2.7-db51.patch - # Fix urllib Security Vulnerability - # http://blog.python.org/2011/04/urllib-security-vulnerability-fixed.html - patch -Np1 -i ../CVE-2011-1521.patch - - # Fix "import decimal" in the Turkish locale - # cf : https://bugzilla.redhat.com/show_bug.cgi?id=694928 - patch -Np1 -i ../python-2.7.1-fix-decimal-in-turkish-locale.patch - # Temporary workaround for FS#22322 # See http://bugs.python.org/issue10835 for upstream report sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c @@ -45,6 +33,9 @@ build() { # Enable built-in SQLite3 module to load extensions (fix FS#22122) sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py + # FS#2399 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), # rather than copies shipped in the tarball rm -r Modules/expat diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 1c77f0076..413b9c324 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -32,10 +32,11 @@ build() { export PATH=${QT4DIR}/bin:${PATH} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - if [ "$CARCH" = "mips64el" ] ; then - export CFLAGS="$CFLAGS -fpermissive" +# Disable precompiled headers for mips64el + [ "$CARCH" = "mips64el" ] && { export CXXFLAGS="$CXXFLAGS -fpermissive" - fi + extra="-no-pch" + } # FS#24601 export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" @@ -87,7 +88,7 @@ build() { -gtkstyle \ -opengl \ -no-openvg \ - -glib + -glib $extra make } diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index c7d5e19a1..2433b9e9c 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -11,6 +11,7 @@ url='http://soprano.sourceforge.net/' license=('GPL' 'LGPL') depends=('qt' 'clucene' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso') makedepends=('cmake' 'openjdk6' 'doxygen') +[ "$CARCH" = "mips64el" ] && makedepends=('cmake' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('03ae49e87c6ec99e57d0433c2650846f') @@ -18,6 +19,8 @@ build() { cd ${srcdir} mkdir build cd build + + [ "$CARCH" = "mips64el" ] || \ . /etc/profile.d/openjdk6.sh # we need the rpath cmake ../${pkgname}-${pkgver} \ diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD index 3b4cf529e..6ca3a0d59 100644 --- a/extra/vte/PKGBUILD +++ b/extra/vte/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 126563 2011-06-06 09:54:32Z jgc $ +# $Id: PKGBUILD 127491 2011-06-15 15:04:50Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=vte pkgname=(vte vte3 vte-common) -pkgver=0.28.0 -pkgrel=2 +pkgver=0.28.1 +pkgrel=1 pkgdesc="Virtual Terminal Emulator widget for use with" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') options=('!libtool' '!emptydirs') makedepends=('pygtk' 'intltool' 'gobject-introspection' 'gtk2' 'gtk3' 'pygobject-devel' 'gtk-doc') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-${pkgver}.tar.bz2) -sha256sums=('1467c566aa9e55c1e33aa1dfea3f14dd4c8a4a63ff0005b254bd8c2c375d952e') +source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-${pkgver}.tar.xz) +sha256sums=('ad1b868356e0231c42ac2493d3e2a7726014c9dc4110ec89fbb01aee8c2ed7ad') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/wipe/PKGBUILD b/extra/wipe/PKGBUILD index 505bef1b1..c51bcfa2e 100644 --- a/extra/wipe/PKGBUILD +++ b/extra/wipe/PKGBUILD @@ -17,8 +17,9 @@ md5sums=('3aed00711e0490edbec115bc283b8544') build() { cd $srcdir/$pkgname-$pkgver + [ "$CARCH" = "mips64el" ] && extra="--build=$CHOST --host=$CHOST --target=$CHOST" ./configure --prefix=/usr \ - --mandir=/usr/share/man + --mandir=/usr/share/man $extra make } diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 123c0f19a..6401d86ed 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -20,7 +20,7 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf.x86_64 pacman.conf.mips64el makepkg.conf - mips64el.patch) + mips64el.patch makepkg.conf) # keep an upgrade path for older installations diff --git a/multilib/lib32-libao/PKGBUILD b/multilib/lib32-libao/PKGBUILD new file mode 100644 index 000000000..cbd158971 --- /dev/null +++ b/multilib/lib32-libao/PKGBUILD @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Florian Pritz <bluewind@xinu.at> +# Contributor: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> +# Contributor: dorphell <dorphell@archlinux.org> +_pkgbasename=libao +pkgname=lib32-$_pkgbasename +pkgver=1.1.0 +pkgrel=1 +pkgdesc="A cross-platform audio output library and plugins (32-bit)" +url="http://www.xiph.org/ao/" +arch=('x86_64') +license=('GPL') +depends=($_pkgbasename 'lib32-glibc' 'lib32-alsa-lib' 'lib32-libpulse') +makedepends=('gcc-multilib') +groups=('lib32') +options=('!libtool') +source=("http://downloads.xiph.org/releases/ao/$_pkgbasename-$pkgver.tar.gz") +md5sums=('2b2508c29bc97e4dc218fa162cf883c8') + +build() { + cd "$srcdir/$_pkgbasename-$pkgver" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + ./configure --prefix=/usr --libdir=/usr/lib32 + make +} + +package() { + cd "$srcdir/$_pkgbasename-$pkgver" + + make DESTDIR=$pkgdir/ install + rm -rf "${pkgdir}"/usr/{include,share,bin,sbin} +} +# vim:set ts=2 sw=2 et: diff --git a/multilib/q4wine/PKGBUILD b/multilib/q4wine/PKGBUILD deleted file mode 100644 index 150554ce3..000000000 --- a/multilib/q4wine/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 49318 2011-06-14 11:07:14Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Chris Giles <Chris.G.27 (at) Gmail.com> - -pkgname=q4wine -pkgver=0.121 -pkgrel=2 -pkgdesc="A Qt4 GUI for Wine" -arch=("i686" "x86_64") -url="http://sourceforge.net/projects/${pkgname}/" -license=("GPL3") -depends=("qt" "wine" "sqlite3" "which" "icoutils") -makedepends=("cmake") -optdepends=("winetricks") -options=('!emptydirs') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/_/-}.tar.bz2) -md5sums=('2de5de62f57ba6b26247198df339d81a') - -build() { - cd ${srcdir}/${pkgname}-${pkgver/_/-} - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_WINETRIKS=ON \ - -DLIBS_ENTRY_PATH=/usr/lib/$pkgname . - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver/_/-} - make DESTDIR=${pkgdir} install -# install -D ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop -} diff --git a/staging/php/PKGBUILD b/staging/php/PKGBUILD new file mode 100644 index 000000000..4e7f515cd --- /dev/null +++ b/staging/php/PKGBUILD @@ -0,0 +1,379 @@ +# $Id: PKGBUILD 127446 2011-06-15 08:33:01Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=php +pkgname=('php' + 'php-cgi' + 'php-apache' + 'php-fpm' + 'php-embed' + 'php-pear' + 'php-curl' + 'php-enchant' + 'php-gd' + 'php-gmp' + 'php-intl' + 'php-ldap' + 'php-mcrypt' + 'php-mssql' + 'php-odbc' + 'php-pgsql' + 'php-pspell' + 'php-snmp' + 'php-sqlite' + 'php-tidy' + 'php-xsl') +pkgver=5.3.6 +pkgrel=5 +_suhosinver=${pkgver}-0.9.10 +arch=('i686' 'x86_64') +license=('PHP') +url='http://www.php.net' +makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'postfix' + 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' + 'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'libpng' 'libjpeg' 'icu' + 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') +source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" + "suhosin-patch-${_suhosinver}.patch.gz" + 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' + 'logrotate.d.php-fpm') +md5sums=('2286f5a82a6e8397955a0025c1c2ad98' + 'fff1a38877142f3ae6036dbe5a85d0a6' + '39eaa70d276fc3d45d6bcf6cd5ae1106' + 'dec2cbaad64e3abf4f0ec70e1de4e8e9' + 'b01be5f816988fcee7e78225836e5e27' + 'd50ff349da08110a7cc8c691ce2d0423' + '07c4e412909ac65a44ec90e7a2c4bade') + +build() { + # ldap-sasl does not compile with --as-needed + export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" + export LDFLAGS="${LDFLAGS//,--as-needed}" + + phpconfig="--srcdir=../${pkgbase}-${pkgver} \ + --prefix=/usr \ + --sysconfdir=/etc/php \ + --localstatedir=/var \ + --with-layout=GNU \ + --with-config-file-path=/etc/php \ + --with-config-file-scan-dir=/etc/php/conf.d \ + --enable-inline-optimization \ + --disable-debug \ + --disable-rpath \ + --disable-static \ + --enable-shared \ + --mandir=/usr/share/man \ + --without-pear \ + " + + phpextensions="--enable-bcmath=shared \ + --enable-calendar=shared \ + --enable-dba=shared \ + --enable-exif=shared \ + --enable-ftp=shared \ + --enable-gd-native-ttf \ + --enable-intl=shared \ + --enable-json=shared \ + --enable-mbregex \ + --enable-mbstring \ + --enable-pdo \ + --enable-phar=shared \ + --enable-posix=shared \ + --enable-session \ + --enable-shmop=shared \ + --enable-soap=shared \ + --enable-sockets=shared \ + --enable-sqlite-utf8 \ + --enable-sysvmsg=shared \ + --enable-sysvsem=shared \ + --enable-sysvshm=shared \ + --enable-xml \ + --enable-zip=shared \ + --with-bz2=shared \ + --with-curl=shared \ + --with-db4=/usr \ + --with-enchant=shared,/usr \ + --with-freetype-dir=shared,/usr \ + --with-gd=shared \ + --with-gdbm=shared \ + --with-gettext=shared \ + --with-gmp=shared \ + --with-iconv=shared \ + --with-icu-dir=/usr \ + --with-imap-ssl=shared \ + --with-imap=shared \ + --with-jpeg-dir=shared,/usr \ + --with-ldap=shared \ + --with-ldap-sasl \ + --with-mcrypt=shared \ + --with-mhash \ + --with-mssql=shared \ + --with-mysql-sock=/var/run/mysqld/mysqld.sock \ + --with-mysql=shared,mysqlnd \ + --with-mysqli=shared,mysqlnd \ + --with-openssl=shared \ + --with-pcre-regex=/usr \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-odbc=shared,unixODBC,/usr \ + --with-pdo-pgsql=shared \ + --with-pdo-sqlite=shared,/usr \ + --with-pgsql=shared \ + --with-png-dir=shared,/usr \ + --with-pspell=shared \ + --with-regex=php \ + --with-snmp=shared \ + --with-sqlite3=shared,/usr \ + --with-sqlite=shared \ + --with-tidy=shared \ + --with-unixODBC=shared,/usr \ + --with-xmlrpc=shared \ + --with-xsl=shared \ + --with-zlib \ + --without-db2 \ + --without-db3 \ + " + + EXTENSION_DIR=/usr/lib/php/modules + export EXTENSION_DIR + PEAR_INSTALLDIR=/usr/share/pear + export PEAR_INSTALLDIR + + cd ${srcdir}/${pkgbase}-${pkgver} + + # apply suhosin patch + patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch + + # adjust paths + patch -p0 -i ${srcdir}/php.ini.patch + patch -p0 -i ${srcdir}/php-fpm.conf.in.patch + + # php + mkdir ${srcdir}/build-php + cd ${srcdir}/build-php + ln -s ../${pkgbase}-${pkgver}/configure + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + ${phpextensions} + make + + # cgi and fcgi + # reuse the previous run; this will save us a lot of time + cp -a ${srcdir}/build-php ${srcdir}/build-cgi + cd ${srcdir}/build-cgi + ./configure ${phpconfig} \ + --disable-cli \ + --enable-cgi \ + ${phpextensions} + make + + # apache + cp -a ${srcdir}/build-php ${srcdir}/build-apache + cd ${srcdir}/build-apache + ./configure ${phpconfig} \ + --disable-cli \ + --with-apxs2 \ + ${phpextensions} + make + + # fpm + cp -a ${srcdir}/build-php ${srcdir}/build-fpm + cd ${srcdir}/build-fpm + ./configure ${phpconfig} \ + --disable-cli \ + --enable-fpm \ + --with-fpm-user=http \ + --with-fpm-group=http \ + ${phpextensions} + make + + # embed + cp -a ${srcdir}/build-php ${srcdir}/build-embed + cd ${srcdir}/build-embed + ./configure ${phpconfig} \ + --disable-cli \ + --enable-embed=shared \ + ${phpextensions} + make + + # pear + cp -a ${srcdir}/build-php ${srcdir}/build-pear + cd ${srcdir}/build-pear + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + --with-pear \ + ${phpextensions} + make +} + +# check() { +# cd ${srcdir}/build-php +# make test +# } + +package_php() { + pkgdesc='An HTML-embedded scripting language' + depends=('pcre' 'libxml2' 'bzip2' 'openssl') + replaces=('php-fileinfo') + provides=('php-fileinfo') + conflicts=('php-fileinfo') + backup=('etc/php/php.ini') + + cd ${srcdir}/build-php + make -j1 INSTALL_ROOT=${pkgdir} install + install -d -m755 ${pkgdir}/usr/share/pear + # install php.ini + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini + install -d -m755 ${pkgdir}/etc/php/conf.d/ + + # remove static modules + rm -f ${pkgdir}/usr/lib/php/modules/*.a + # remove modules provided by sub packages + rm -f ${pkgdir}/usr/lib/php/modules/{curl,enchant,gd,gmp,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so +} + +package_php-cgi() { + pkgdesc='CGI and FCGI SAPI for PHP' + depends=('php' 'pcre' 'libxml2') + + install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi +} + +package_php-apache() { + pkgdesc='Apache SAPI for PHP' + depends=('php' 'apache' 'pcre' 'libxml2') + backup=('etc/httpd/conf/extra/php5_module.conf') + + install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so + install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf +} + +package_php-fpm() { + pkgdesc='FastCGI Process Manager for PHP' + depends=('php') + backup=('etc/php/php-fpm.conf') + + install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf + install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm + install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm + install -d -m755 ${pkgdir}/etc/php/fpm.d +} + +package_php-embed() { + pkgdesc='Embed SAPI for PHP' + depends=('php' 'pcre' 'libxml2') + + install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h +} + +package_php-pear() { + pkgdesc='PHP Extension and Application Repository' + depends=('php' 'bash') + backup=('etc/php/pear.conf') + + cd ${srcdir}/build-pear + make -j1 install-pear INSTALL_ROOT=${pkgdir} + local i + while read i; do + [ ! -e "$i" ] || rm -rf "$i" + done < <(find ${pkgdir} -name '.*') +} + +package_php-curl() { + depends=('php' 'curl') + pkgdesc='curl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/curl.so ${pkgdir}/usr/lib/php/modules/curl.so +} + +package_php-enchant() { + depends=('php' 'enchant') + pkgdesc='enchant module for PHP' + install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so +} + +package_php-gd() { + depends=('php' 'libpng' 'libjpeg' 'freetype2') + pkgdesc='gd module for PHP' + install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so +} + +package_php-gmp() { + depends=('php' 'gmp') + pkgdesc='gmp module for PHP' + install -D -m755 ${srcdir}/build-php/modules/gmp.so ${pkgdir}/usr/lib/php/modules/gmp.so +} + +package_php-intl() { + depends=('php' 'icu') + pkgdesc='intl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so +} + +package_php-ldap() { + depends=('php' 'libldap') + pkgdesc='ldap module for PHP' + install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so +} + +package_php-mcrypt() { + depends=('php' 'libmcrypt' 'libtool') + pkgdesc='mcrypt module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so +} + +package_php-mssql() { + depends=('php' 'freetds') + pkgdesc='mssql module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so +} + +package_php-odbc() { + depends=('php' 'unixodbc') + pkgdesc='ODBC modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so + install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so +} + +package_php-pgsql() { + depends=('php' 'postgresql-libs') + pkgdesc='PostgreSQL modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so + install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so +} + +package_php-pspell() { + depends=('php' 'aspell') + pkgdesc='pspell module for PHP' + install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so +} + +package_php-snmp() { + depends=('php' 'net-snmp') + pkgdesc='snmp module for PHP' + install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so +} + +package_php-sqlite() { + depends=('php' 'sqlite3') + pkgdesc='sqlite3 module for PHP' + install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so + install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so +} + +package_php-tidy() { + depends=('php' 'tidyhtml') + pkgdesc='tidy module for PHP' + install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so +} + +package_php-xsl() { + depends=('php' 'libxslt') + pkgdesc='xsl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so +} diff --git a/staging/php/apache.conf b/staging/php/apache.conf new file mode 100644 index 000000000..c3ca0aad5 --- /dev/null +++ b/staging/php/apache.conf @@ -0,0 +1,13 @@ +# Required modules: dir_module, php5_module + +<IfModule dir_module> + <IfModule php5_module> + DirectoryIndex index.php index.html + <FilesMatch "\.php$"> + SetHandler application/x-httpd-php + </FilesMatch> + <FilesMatch "\.phps$"> + SetHandler application/x-httpd-php-source + </FilesMatch> + </IfModule> +</IfModule> diff --git a/staging/php/logrotate.d.php-fpm b/staging/php/logrotate.d.php-fpm new file mode 100644 index 000000000..7a1ba2597 --- /dev/null +++ b/staging/php/logrotate.d.php-fpm @@ -0,0 +1,6 @@ +/var/log/php-fpm.log { + missingok + postrotate + /etc/rc.d/php-fpm logrotate >/dev/null || true + endscript +} diff --git a/staging/php/php-fpm.conf.in.patch b/staging/php/php-fpm.conf.in.patch new file mode 100644 index 000000000..93c62430a --- /dev/null +++ b/staging/php/php-fpm.conf.in.patch @@ -0,0 +1,80 @@ +--- sapi/fpm/php-fpm.conf.in 2010-12-11 08:31:47.695294987 +0100 ++++ sapi/fpm/php-fpm.conf.in 2010-12-11 08:31:55.907812237 +0100 +@@ -12,7 +12,7 @@ + ; Relative path can also be used. They will be prefixed by: + ; - the global prefix if it's been set (-p arguement) + ; - @prefix@ otherwise +-;include=etc/fpm.d/*.conf ++;include=/etc/php/fpm.d/*.conf + + ;;;;;;;;;;;;;;;;;; + ; Global Options ; +@@ -22,7 +22,7 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++pid = run/php-fpm/php-fpm.pid + + ; Error log file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ +@@ -93,7 +93,8 @@ + ; specific port; + ; '/path/to/unix/socket' - to listen on a unix socket. + ; Note: This value is mandatory. +-listen = 127.0.0.1:9000 ++;listen = 127.0.0.1:9000 ++listen = /var/run/php-fpm/php-fpm.sock + + ; Set listen(2) backlog. A value of '-1' means unlimited. + ; Default Value: 128 (-1 on FreeBSD and OpenBSD) +@@ -112,9 +113,9 @@ + ; BSD-derived systems allow connections regardless of permissions. + ; Default Values: user and group are set as the running user + ; mode is set to 0666 +-;listen.owner = @php_fpm_user@ +-;listen.group = @php_fpm_group@ +-;listen.mode = 0666 ++listen.owner = @php_fpm_user@ ++listen.group = @php_fpm_group@ ++listen.mode = 0660 + + ; Unix user/group of processes + ; Note: The user is mandatory. If the group is not set, the default user's group +@@ -154,23 +155,23 @@ + ; The number of child processes created on startup. + ; Note: Used only when pm is set to 'dynamic' + ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +-;pm.start_servers = 20 ++pm.start_servers = 20 + + ; The desired minimum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.min_spare_servers = 5 ++pm.min_spare_servers = 5 + + ; The desired maximum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.max_spare_servers = 35 ++pm.max_spare_servers = 35 + + ; The number of requests each child process should execute before respawning. + ; This can be useful to work around memory leaks in 3rd party libraries. For + ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. + ; Default Value: 0 +-;pm.max_requests = 500 ++pm.max_requests = 500 + + ; The URI to view the FPM status page. If this value is not set, no URI will be + ; recognized as a status page. By default, the status page shows the following +@@ -264,7 +265,7 @@ + ; Chdir to this directory at the start. + ; Note: relative path can be used. + ; Default Value: current directory or / when chroot +-;chdir = /var/www ++;chdir = /srv/http + + ; Redirect worker stdout and stderr into main error log. If not set, stdout and + ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/staging/php/php.ini.patch b/staging/php/php.ini.patch new file mode 100644 index 000000000..356e190b4 --- /dev/null +++ b/staging/php/php.ini.patch @@ -0,0 +1,126 @@ +--- php.ini-production 2011-02-09 01:25:44.000000000 +0100 ++++ php.ini-production 2011-03-19 11:11:44.496987763 +0100 +@@ -376,7 +376,7 @@ + ; or per-virtualhost web server configuration file. This directive is + ; *NOT* affected by whether Safe Mode is turned On or Off. + ; http://php.net/open-basedir +-;open_basedir = ++open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/ + + ; This directive allows you to disable certain functions for security reasons. + ; It receives a comma-delimited list of function names. This directive is +@@ -781,7 +781,7 @@ + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" ++include_path = ".:/usr/share/pear" + ; + ; Windows: "\path1;\path2" + ;include_path = ".;c:\php\includes" +@@ -804,7 +804,7 @@ + + ; Directory in which the loadable extensions (modules) reside. + ; http://php.net/extension-dir +-; extension_dir = "./" ++extension_dir = "/usr/lib/php/modules/" + ; On windows: + ; extension_dir = "ext" + +@@ -938,53 +938,49 @@ + ; If you only provide the name of the extension, PHP will look for it in its + ; default extension directory. + ; +-; Windows Extensions +-; Note that ODBC support is built in, so no dll is needed for it. +-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +-; extension folders as well as the separate PECL DLL download (PHP 5). +-; Be sure to appropriately set the extension_dir directive. +-; +-;extension=php_bz2.dll +-;extension=php_curl.dll +-;extension=php_fileinfo.dll +-;extension=php_gd2.dll +-;extension=php_gettext.dll +-;extension=php_gmp.dll +-;extension=php_intl.dll +-;extension=php_imap.dll +-;extension=php_interbase.dll +-;extension=php_ldap.dll +-;extension=php_mbstring.dll +-;extension=php_exif.dll ; Must be after mbstring as it depends on it +-;extension=php_mysql.dll +-;extension=php_mysqli.dll +-;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client +-;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client +-;extension=php_openssl.dll +-;extension=php_pdo_firebird.dll +-;extension=php_pdo_mssql.dll +-;extension=php_pdo_mysql.dll +-;extension=php_pdo_oci.dll +-;extension=php_pdo_odbc.dll +-;extension=php_pdo_pgsql.dll +-;extension=php_pdo_sqlite.dll +-;extension=php_pgsql.dll +-;extension=php_pspell.dll +-;extension=php_shmop.dll +- +-; The MIBS data available in the PHP distribution must be installed. +-; See http://www.php.net/manual/en/snmp.installation.php +-;extension=php_snmp.dll +- +-;extension=php_soap.dll +-;extension=php_sockets.dll +-;extension=php_sqlite.dll +-;extension=php_sqlite3.dll +-;extension=php_sybase_ct.dll +-;extension=php_tidy.dll +-;extension=php_xmlrpc.dll +-;extension=php_xsl.dll +-;extension=php_zip.dll ++;extension=bcmath.so ++;extension=bz2.so ++;extension=calendar.so ++;extension=curl.so ++;extension=dba.so ++;extension=enchant.so ++;extension=exif.so ++;extension=ftp.so ++;extension=gd.so ++extension=gettext.so ++;extension=gmp.so ++;extension=iconv.so ++;extension=imap.so ++;extension=intl.so ++;extension=json.so ++;extension=ldap.so ++;extension=mcrypt.so ++;extension=mssql.so ++;extension=mysqli.so ++;extension=mysql.so ++;extension=odbc.so ++;extension=openssl.so ++;extension=pdo_mysql.so ++;extension=pdo_odbc.so ++;extension=pdo_pgsql.so ++;extension=pdo_sqlite.so ++;extension=pgsql.so ++;extension=phar.so ++;extension=posix.so ++;extension=pspell.so ++;extension=shmop.so ++;extension=snmp.so ++;extension=soap.so ++;extension=sockets.so ++;extension=sqlite3.so ++;extension=sqlite.so ++;extension=sysvmsg.so ++;extension=sysvsem.so ++;extension=sysvshm.so ++;extension=tidy.so ++;extension=xmlrpc.so ++;extension=xsl.so ++;extension=zip.so + + ;;;;;;;;;;;;;;;;;;; + ; Module Settings ; diff --git a/staging/php/rc.d.php-fpm b/staging/php/rc.d.php-fpm new file mode 100644 index 000000000..54bcf4d5b --- /dev/null +++ b/staging/php/rc.d.php-fpm @@ -0,0 +1,158 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + + +wait_for_pid () { + try=0 + while test $try -lt 35 ; do + case "$1" in + 'created') + if [ -f "$2" ] ; then + try='' + break + fi + ;; + 'removed') + if [ ! -f "$2" ] ; then + try='' + break + fi + ;; + esac + + stat_append '.' + try=`expr $try + 1` + sleep 1 + done +} + +test_config() { + stat_busy 'Checking configuration' + if [ $(id -u) -ne 0 ]; then + stat_append '(This script must be run as root)' + stat_die + fi + + if [ ! -r /etc/php/php-fpm.conf ]; then + stat_append '(/etc/php/php-fpm.conf not found)' + stat_die + fi + + local test=$(/usr/sbin/php-fpm -t 2>&1) + if [ $? -gt 0 ]; then + stat_append '(error in /etc/php/php-fpm.conf)' + stat_die + elif echo $test | grep -qi 'error'; then + stat_append '(error in /etc/php/php.ini)' + stat_die + fi + + [ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm + + stat_done +} + +case "$1" in + start) + test_config + stat_busy 'Starting php-fpm' + + /usr/sbin/php-fpm + + if [ "$?" != 0 ] ; then + stat_fail + exit 1 + fi + + wait_for_pid created /var/run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + add_daemon php-fpm + stat_done + fi + ;; + + stop) + test_config + stat_busy 'Gracefully shutting down php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -QUIT `cat /var/run/php-fpm/php-fpm.pid` + + wait_for_pid removed /var/run/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + force-quit) + stat_busy 'Terminating php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -TERM `cat /var/run/php-fpm/php-fpm.pid` + + wait_for_pid removed /var/run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + restart) + $0 stop + $0 start + ;; + + reload) + test_config + stat_busy 'Reload service php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR2 `cat /var/run/php-fpm/php-fpm.pid` + stat_done + ;; + + logrotate) + stat_busy 'Reopen php-fpm log' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR1 `cat /var/run/php-fpm/php-fpm.pid` + stat_done + ;; + + *) + echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}" + exit 1 + ;; + +esac diff --git a/staging/php/suhosin-patch-5.3.6-0.9.10.patch.gz b/staging/php/suhosin-patch-5.3.6-0.9.10.patch.gz Binary files differnew file mode 100644 index 000000000..7167ce2d0 --- /dev/null +++ b/staging/php/suhosin-patch-5.3.6-0.9.10.patch.gz diff --git a/staging/ruby/PKGBUILD b/staging/ruby/PKGBUILD new file mode 100644 index 000000000..a829449da --- /dev/null +++ b/staging/ruby/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 127449 2011-06-15 09:33:37Z eric $ +# Maintainer: +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: John Proctor <jproctor@prium.net> +# Contributor: Jeramy Rutley <jrutley@gmail.com> + +pkgbase=ruby +pkgname=('ruby' 'ruby-docs') +pkgver=1.9.2_p180 +pkgrel=3 +pkgdesc="An object-oriented language for quick and easy programming" +arch=('i686' 'x86_64') +url="http://www.ruby-lang.org/en/" +license=('custom') +makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz') +options=('!emptydirs' '!makeflags') +source=("ftp://ftp.ruby-lang.org/pub/${pkgbase}/1.9/${pkgbase}-${pkgver//_/-}.tar.bz2") +md5sums=('68510eeb7511c403b91fe5476f250538') +sha1sums=('10824b44c8060c7b9b5afc0b3519a1e9f02f7fe5') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver//_/-}" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --enable-shared \ + --enable-pthread \ + --disable-rpath + make +} + +package_ruby() { + depends=('openssl' 'libffi') + provides=('rubygems' 'rake') + conflicts=('rake') + optdepends=('tk: for Ruby/TK') + + cd "${srcdir}/${pkgbase}-${pkgver//_/-}" + make DESTDIR="${pkgdir}" install-nodoc + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_ruby-docs() { + pkgdesc="Documentation files for ruby" + depends=('ruby') + + cd "${srcdir}/${pkgbase}-${pkgver//_/-}" + make DESTDIR="${pkgdir}" install-doc install-capi + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/cronie/PKGBUILD b/testing/cronie/PKGBUILD new file mode 100644 index 000000000..a455e705b --- /dev/null +++ b/testing/cronie/PKGBUILD @@ -0,0 +1,68 @@ +# Contributor: Kaiting Chen <kaiting.chen@kiwilight.com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname='cronie' +pkgver=1.4.7 +pkgrel=9 +pkgdesc='Daemon that runs specified programs at scheduled times and related tools' +url='https://fedorahosted.org/cronie/' +license=('custom:BSD') +arch=('i686' 'x86_64') +depends=('pam' 'bash' 'run-parts') +optdepends=('smtp-server: sending cron job output via email') + +source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'cron.deny' + 'crontab' + 'pam.d' + 'rc.d') +sha1sums=('c6644ba0e58bcb14e0bb3f925e3e8cc3f0d47a7f' + '0f279b8fb820340267d578dc85511c980715f91e' + '4059bc4ccb75f08b0d4970940799e5d9722b339f' + '5eff7fb31f6bc0a924243ff046704726cf20c221' + 'c08c040ed5cb12bc4fd15639a5242d31ec247ef5') + +backup=('etc/crontab' + 'etc/anacrontab' + 'etc/conf.d/crond' + 'etc/pam.d/crond' + 'etc/cron.deny') + +conflicts=('cron') +provides=('cron') +groups=('base') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-anacron \ + --with-inotify \ + --with-pam \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly} + install -d "${pkgdir}"/var/spool/{ana,}cron + chmod u+s "${pkgdir}"/usr/bin/crontab + + install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond + install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond + install -Dm644 ../crontab "${pkgdir}"/etc/crontab + install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny + install -Dm644 crond.sysconfig "${pkgdir}"/etc/conf.d/crond + install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly + install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron + install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab + + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/cronie/COPYING +} diff --git a/testing/cronie/cron.deny b/testing/cronie/cron.deny new file mode 100644 index 000000000..06e685cc8 --- /dev/null +++ b/testing/cronie/cron.deny @@ -0,0 +1 @@ +# without this file, only users listed in /etc/cron.allow can use crontab diff --git a/testing/cronie/crontab b/testing/cronie/crontab new file mode 100644 index 000000000..f2ce71030 --- /dev/null +++ b/testing/cronie/crontab @@ -0,0 +1 @@ +# without this file, crond disables inotify support at startup diff --git a/testing/cronie/pam.d b/testing/cronie/pam.d new file mode 100644 index 000000000..9a254ebc0 --- /dev/null +++ b/testing/cronie/pam.d @@ -0,0 +1,10 @@ +auth required pam_unix.so +auth required pam_env.so + +account required pam_access.so +account required pam_unix.so +account required pam_time.so + +session required pam_loginuid.so +session required pam_limits.so +session required pam_unix.so diff --git a/testing/cronie/rc.d b/testing/cronie/rc.d new file mode 100755 index 000000000..d0659685c --- /dev/null +++ b/testing/cronie/rc.d @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +name=crond +. /etc/conf.d/crond +PID=$(pidof -o %PPID /usr/sbin/crond) + +case "$1" in +start) + stat_busy "Starting $name daemon" + [[ -z "$PID" ]] && /usr/sbin/crond $CRONDARGS &>/dev/null \ + && { add_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +stop) + stat_busy "Stopping $name daemon" + [[ -n "$PID" ]] && kill $PID &>/dev/null \ + && { rm_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +reload) + stat_busy "Reloading $name daemon" + [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ + && { stat_done; } \ + || { stat_fail; exit 1; } + ;; +restart) + $0 stop + sleep 1 + $0 start + ;; +*) + echo "usage: $0 {start|stop|restart|reload}" + ;; +esac +exit 0 diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD index 4bd099ac9..764713443 100644 --- a/testing/libreoffice/PKGBUILD +++ b/testing/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 126270 2011-06-03 14:47:40Z stephane $ +# $Id: PKGBUILD 127521 2011-06-15 18:45:39Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -24,30 +24,27 @@ pkgname=('libreoffice' 'libreoffice-sdk' 'libreoffice-extension-validator' 'libreoffice-extension-watch-window' 'libreoffice-extension-wiki-publisher') -_LOver=3.4.0.2 -pkgver=3.4.0 -pkgrel=2 +_LOver=3.4.1.1 +pkgver=3.4.1rc1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') #_LO_tree="3.4" _OFFICEUPD="340" license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends - 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes. -# 'sane' 'kdelibs' not built -# 'apache-ant' not used - 'gperf' 'poppler' 'gconf' 'cppunit' 'libmysqlclient' + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes. + 'apache-ant' 'gperf' 'poppler' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' 'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' -# 'java-runtime' - not built -# 'saxon' - currently broken -# the depends from libreoffice main pkg + 'mesa' 'gstreamer0.10-base' 'java-runtime' + #'saxon' - currently broken + # the depends from libreoffice main pkg "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' 'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' # keep gtk2 for install script 'ttf-dejavu') # to satisfy regression tests -# translate-toolkit - todo move them to extra to allow --with-system-foo builds + # translate-toolkit - todo move them to extra to allow --with-system-foo builds # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors _mirror="http://download.documentfoundation.org/libreoffice/src" @@ -93,11 +90,9 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions 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_i116795.diff buildfix_boost.diff buildfix_ct2n.diff - vbahelper.visibility.patch - buildfix_bison25.diff) + vbahelper.visibility.patch) noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2 @@ -136,25 +131,25 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2) -md5sums=('7427ddd5ae63b6ee7aa868201dfbccaa' - 'a78a8e08731213da02c65060cedc5589' - '596da255e2728faccc8f2361171270ec' - '8ed9803a34d13da1764e7523d550d6b0' - '9be46d7c4bf3a60ee8dd0a5ef3638f82' - 'b60db802866ab71c485de42e6382d1bb' - '09e374cf3bd8f07a043883393012d69b' - 'af9f25aa04dc4ef7b797f7bcc743877c' - 'ad29de786d76d67759f9d2dd574b29be' - 'ff13a8ac0ea324122b75773fd80a9245' - '6eb8f53e01da7a945ee4cd42b7297732' - '90df27d4cbf490668ce4f03ff7dba521' - 'c0ea197183564c49306a1c79ca571e51' - '91e69ed3c0be542fa7f69ca3da2d7808' - 'a81c787b2e5469c2acc9f335b2c9e52f' - 'ee1c78af6553657614b1a43adf4750ac' - 'c970d6212618fc9b34526907eb030ce6' - '6d25488c81af09d87015bf487243042f' - '9a39234a49516b7035309e28dd4f0784' +md5sums=('a21bbbc0cf9b482a78357b7b6132e799' + 'd9ccdb2b53de8e16d7bb3215b9e97d7a' + 'd3aa4a8e05f8b5c3ccf4f945b82b32a2' + 'eb03b6627f2a2240eca089c925692259' + '190c9b25a7193b7ca98d6f6d09cd20d2' + '45b632fb71b123b699c9e89f9db6632a' + '19b3e65676e8e8839a4dd884a74e83e4' + '79a955fd38d0eedca7db146c5a985041' + '9b9b80ff14a3c6f430cc1fee4551c53e' + 'c592798d08cccfb14f6cda95eb542d7b' + '1f98cbec964a9563b72962c943af3545' + '01aa850fa07e4440706dcea0def5c27a' + '9765abf75b58c5dbdf82a953af8c6de4' + '1f07e271d64606116c84c7adbc90a324' + '877cf0733c202936f8b918b9ad423f0d' + '231f5a392ab78167a5a7ab7bc922a421' + '9452301d1eee5fc3bb4758e003829075' + '1bc390b972bbe27f513956af37e60538' + '974b73ed0add1d6e325b9da4e3ca5c5d' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -194,18 +189,16 @@ md5sums=('7427ddd5ae63b6ee7aa868201dfbccaa' '9d60b6cfa3ef1926848710bbcd11115b' 'dbaafd21de055e582d92d7d32fe9da13' 'b7b2d0e04e142f26dd96119c80757d1f' - '0520d63c946e272ed3bdfc863fbdc42e' 'bc228237108cab7745897a9f466b6d39' 'eee273f501ff45dc5f1365e78c6d57c0' - '43b145db28e6c0d73578ae6fd35e510d' - '4fa96e04b41a6e86774e74a972024b3e') + '43b145db28e6c0d73578ae6fd35e510d') build() { - # unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS - # [ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh + unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS + [ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh - # [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh + [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh # move all LibO sources into one build directory mkdir ${srcdir}/build && cd ${srcdir}/build @@ -222,16 +215,14 @@ build() { cd ${srcdir}/build # buildfixes & bugfixes - patch -Np1 -i ${srcdir}/buildfix_i116795.diff 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}/buildfix_bison25.diff # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 - unset CFLAGS - unset CXXFLAGS +# unset CFLAGS +# unset CXXFLAGS #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do @@ -258,95 +249,99 @@ build() { # non-SMP test build # export MAKEFLAGS="-j1" - ./configure --with-build-version="${_LOver} Parabola GNU/Linux build-${pkgrel}" \ - --with-vendor="ArchLinux" \ - --without-java \ - --with-unix-wrapper="libreoffice" \ - --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ - --with-external-tar="${srcdir}/ext_sources" \ - --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ - --with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \ - --with-lang="" \ - --disable-verbose \ - --enable-cairo \ - --enable-crashdump \ - --enable-dbus \ - --enable-evolution2 \ - --with-system-graphite \ - --enable-graphite \ - --enable-gio \ - --disable-gnome-vfs \ - --disable-kde \ - --disable-kde4 \ - --enable-ldap \ - --enable-lockdown \ - --enable-opengl \ - --enable-odk \ - --enable-opengl \ - --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 \ - --without-fonts \ - --without-afms \ - --without-ppds \ - --without-system-libwps \ - --without-system-mdds \ - --without-myspell-dicts \ - --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-cppunit \ - --with-system-libwpg \ - --with-system-libwps \ - --with-system-redland \ - --without-system-saxon \ - --with-system-libtextcat \ - --with-external-libtextcat-data \ - --with-openldap \ - --without-system-boost \ - --with-system-cairo \ - --with-system-libs \ - --with-system-mozilla \ - --with-system-mythes \ - --with-system-xrender-headers \ - --with-system-headers \ - --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 \ - || return 1 + ./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ + --with-unix-wrapper="libreoffice" \ + --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ + --with-external-tar="${srcdir}/ext_sources" \ + --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ + --with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \ + --with-lang="" \ + --disable-verbose \ + --enable-cairo\ + --enable-crashdump \ + --enable-dbus \ + --enable-evolution2\ + --disable-graphite\ + --enable-gio\ + --disable-gnome-vfs\ + --disable-kde\ + --enable-kde4\ + --enable-ldap \ + --enable-lockdown\ + --enable-opengl \ + --enable-odk\ + --enable-opengl\ + --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 \ + --without-fonts\ + --without-afms\ + --without-ppds\ + --without-system-libwps\ + --without-system-mdds\ + --without-myspell-dicts \ + --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-cppunit\ + --with-system-libwpg \ + --with-system-libwps \ + --with-system-redland\ + --without-system-saxon\ + --with-system-libtextcat \ + --with-external-libtextcat-data \ + --with-openldap\ + --with-ant-home="/usr/share/java/apache-ant"\ + --without-system-boost\ + --with-system-cairo\ + --with-system-libs\ + --with-system-mozilla\ + --with-system-mythes\ + --with-system-xrender-headers\ + --with-system-headers\ + --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\ + $EXTRAOPTS || return 1 + +#--with-system-graphite --enable-graohite ? +#--with-servlet-api-jar=JARFILE +# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136 +# --with-system-saxon\ +# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\ touch src.downloaded -# ./download + #./download unset MAKEFLAGS ./bootstrap make } -check() { - cd ${srcdir}/build - make check -} +#check() { +# cd ${srcdir}/build +# make check +#} package_libreoffice() { @@ -460,14 +455,27 @@ package_libreoffice() { package_libreoffice-sdk() { pkgdesc="Software development kit for LibreOffice" - depends=('libreoffice' 'gcc-libs' 'sh') + depends=('libreoffice' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') cd ${srcdir}/sdk-install cp -r * ${pkgdir} cd ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk - mv setsdkenv_unix setsdkenv_unix.sh && chmod 755 setsdkenv_unix.sh - rm -f ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in + cp setsdkenv_unix setsdkenv_unix.sh && chmod 755 setsdkenv_unix{,.sh} + + # 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,@OFFICE_HOME@,/usr/lib/libreoffice," \ + -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," \ + -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \ + -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," setsdkenv_unix.{csh,sh}.in #fix permissions find examples -type f -exec chmod -x {} \; } diff --git a/~xihh/libreoffice/PKGBUILD b/~xihh/libreoffice/PKGBUILD new file mode 100644 index 000000000..9f5b7ded7 --- /dev/null +++ b/~xihh/libreoffice/PKGBUILD @@ -0,0 +1,704 @@ +# $Id: PKGBUILD 126270 2011-06-03 14:47:40Z stephane $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> + +pkgbase="libreoffice" +pkgname=('libreoffice' 'libreoffice-sdk' + 'libreoffice-extension-diagram' + 'libreoffice-extension-google-docs' + 'libreoffice-extension-hunart' + 'libreoffice-extension-nlpsolver' + 'libreoffice-extension-ct2n' + 'libreoffice-extension-numbertext' + 'libreoffice-extension-oooblogger' + '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.0.2 +pkgver=3.4.0 +pkgrel=2 +arch=('i686' 'x86_64' 'mips64el') +#_LO_tree="3.4" +_OFFICEUPD="340" +license=('LGPL3') +url="http://www.libreoffice.org/" +if [ ${CARCH} = 'mips64el' ]; then + makedepends=( 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' + 'gperf' 'poppler' 'kdelibs' 'gconf' 'cppunit' + 'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick' + 'mesa' 'gstreamer0.10-base' + "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' + 'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' # keep gtk2 for install script + 'ttf-dejavu') +else + makedepends=( # makedepends + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes. + 'apache-ant' 'gperf' 'poppler' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' + 'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick' + 'mesa' 'gstreamer0.10-base' 'java-runtime' + # 'saxon' - currently broken + # the depends from libreoffice main pkg + "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' + 'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' # keep gtk2 for install script + 'ttf-dejavu') # to satisfy regression tests +fi + +# http://download.documentfoundation.org/mirrors/all.html +# http://wiki.documentfoundation.org/Mirrors +_mirror="http://download.documentfoundation.org/libreoffice/src" +#_mirror="http://dev-builds.libreoffice.org/pre-releases/src/" +_additional_source_url="http://hg.services.openoffice.org/binaries" +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}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + ${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz + ${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.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}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz + ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + ${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-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}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz + http://download.go-oo.org/src/7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2 + http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll + http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 + http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt + http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 + http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + 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/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.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_i116795.diff + buildfix_boost.diff + buildfix_ct2n.diff + vbahelper.visibility.patch + buildfix_bison25.diff) +noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll + b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 + 7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.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 + 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 + 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz + 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz + af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-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 + 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 + f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2) +md5sums=('7427ddd5ae63b6ee7aa868201dfbccaa' + 'a78a8e08731213da02c65060cedc5589' + '596da255e2728faccc8f2361171270ec' + '8ed9803a34d13da1764e7523d550d6b0' + '9be46d7c4bf3a60ee8dd0a5ef3638f82' + 'b60db802866ab71c485de42e6382d1bb' + '09e374cf3bd8f07a043883393012d69b' + 'af9f25aa04dc4ef7b797f7bcc743877c' + 'ad29de786d76d67759f9d2dd574b29be' + 'ff13a8ac0ea324122b75773fd80a9245' + '6eb8f53e01da7a945ee4cd42b7297732' + '90df27d4cbf490668ce4f03ff7dba521' + 'c0ea197183564c49306a1c79ca571e51' + '91e69ed3c0be542fa7f69ca3da2d7808' + 'a81c787b2e5469c2acc9f335b2c9e52f' + 'ee1c78af6553657614b1a43adf4750ac' + 'c970d6212618fc9b34526907eb030ce6' + '6d25488c81af09d87015bf487243042f' + '9a39234a49516b7035309e28dd4f0784' + '1f24ab1d39f4a51faf22244c94a6203f' + '35c94d2df8893241173de1d16b6034c0' + '798b2ffdc8bcfe7bca2cf92b62caf685' + 'fdb27bfe2dbe2e7b57ae194d9bf36bab' + 'ada24d37d8d638b3d8a9985e80bc2978' + '2a177023f9ea8ec8bd00837605c5df1b' + 'a7983f859eafb2677d7ff386a023bc40' + '3c219630e4302863a9a83d0efde889db' + '2ae988b339daec234019a7066f96733e' + '2c9b0f83ed5890af02c0df1c1776f39b' + 'af3c3acf618de6108d65fcdc92b492e1' + 'eeb2c7ddf0d302fba4bfc6e97eac9624' + '39bb3fcea1514f1369fcfc87542390fd' + '3404ab6b1792ae5f16bbd603bd1e1d03' + '97b2d4dba862397f446b217e2b623e71' + 'f94d9870737518e3b597f9265f4e9803' + '8ce2fcd72becf06c41f7201d15373ed9' + 'd8bd5eed178db6e2b18eeed243f85aa8' + '3bdf40c0d199af31923e900d082ca2dd' + 'ace6ab49184e329db254e454a010f56d' + 'db60e4fde8dd6d6807523deb71ee34dc' + 'ba2930200c9f019c2d93a8c88c651a0f' + '18f577b374d60b3c760a3a3350407632' + '7a0dcb3fe1e8c7229ab4fb868b7325e6' + '185d60944ea767075d27247c3162b3bc' + 'b4cae0700aa1c2aef7eb7f345365e6f1' + '451ccf439a36a568653b024534669971' + '90401bca927835b6fbae4a707ed187c8' + 'f02578f5218f217a9f20e9c30e119c6a' + '7e7efc5d4a03126bb9ae3ae9aa2c4e87' + '41c9b65ad60af4b3255bbecdfef11736' + '451ccf439a36a568653b024534669971' + 'bbdd5639ada63e3130761daaecae1a10' + '23bd75552206dfcd8fd4e29137dcac84' + 'b8cbca7b3363e6ca2d02bc0ba2b63904' + 'b632bdd25649cc4067bcb410bae23d2b' + '9d60b6cfa3ef1926848710bbcd11115b' + 'dbaafd21de055e582d92d7d32fe9da13' + 'b7b2d0e04e142f26dd96119c80757d1f' + '0520d63c946e272ed3bdfc863fbdc42e' + 'bc228237108cab7745897a9f466b6d39' + 'eee273f501ff45dc5f1365e78c6d57c0' + '43b145db28e6c0d73578ae6fd35e510d' + '4fa96e04b41a6e86774e74a972024b3e') + +build() { + if [ ! ${CARCH} = 'mips64el' ]; then + unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS + [ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh + [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh + fi + + [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.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 + + # move external sources into place + mkdir ${srcdir}/ext_sources && cd ${srcdir}/ext_sources + for source in "${noextract[@]}"; do + ln -s ${srcdir}/$source . + done + + cd ${srcdir}/build + + # buildfixes & bugfixes + patch -Np1 -i ${srcdir}/buildfix_i116795.diff + 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}/buildfix_bison25.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 + + CFLAGS=${ARCH_FLAGS[@]} + + # python2 fix + export PYTHON=python2 + + # http://wiki.documentfoundation.org/Development/How_to_build/Configure_options + + if [ "$CARCH" = "mips64el" ]; then + EXTRAOPTS="" + else + EXTRAOPTS=" --with-ant-home=\"/usr/share/java/apache-ant\" + --enable-opengl + --with-system-lucene + --with-lucene-core-jar=/usr/share/java/lucene-core.jar + --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar" + fi + +# autoconf -v -f + + ./configure --with-build-version="${_LOver} Parabola GNU/Linux build-${pkgrel}" --with-vendor="Parabola" \ + --with-unix-wrapper="libreoffice" \ + --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ + --with-external-tar="${srcdir}/ext_sources" \ + --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ + --with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \ + --with-lang="" \ + --disable-verbose \ + --enable-cairo \ + --enable-crashdump \ + --enable-dbus \ + --enable-evolution2\ + --enable-graphite \ + --with-system-graphite \ + --enable-gio \ + --disable-gnome-vfs \ + --disable-kde \ + --enable-kde4 \ + --enable-ldap \ + --enable-lockdown \ + --enable-odk \ + --enable-opengl \ + --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 \ + --without-fonts \ + --without-afms \ + --without-ppds \ + --without-system-libwps \ + --without-system-mdds \ + --without-myspell-dicts \ + --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-cppunit \ + --with-system-libwpg \ + --with-system-libwps \ + --with-system-redland \ + --without-system-saxon \ + --with-system-libtextcat \ + --with-external-libtextcat-data \ + --with-openldap \ + --without-system-boost \ + --with-system-cairo \ + --with-system-libs \ + --with-system-mozilla \ + --with-system-mythes \ + --with-system-xrender-headers \ + --with-system-headers \ + --with-alloc=system \ + --without-java \ + $EXTRAOPTS || return 1 + +# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136 +# --with-system-saxon\ +# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\ + + touch src.downloaded + #./download + unset MAKEFLAGS + ./bootstrap + make +} + +#check() { +# cd ${srcdir}/build +# make check +#} + +package_libreoffice() { + + pkgdesc="a productivity suite that is compatible with other major office suites" + install=${pkgbase}.install + depends=("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' + 'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2') # keep gtk2 for install script + #'java-runtime' + #'saxon' + optdepends=('java-runtime: adds java support' + 'libcups: adds printing support' + 'gconf: adds additional gnome support' + 'nss: adds support for signed files/macros' + 'pstoedit: translates PostScript and PDF graphics into other vector formats' + 'poppler: for shipped pdfimport extension' + 'kdelibs: for kde integration' + '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' + 'mesa: for the OGLTrans extension' + 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress') + backup=(etc/libreoffice/sofficerc + etc/libreoffice/bootstraprc + etc/libreoffice/psprint.conf) + provides=('go-openoffice') + conflicts=('go-openoffice') + replaces=('go-openoffice' 'openoffice-base' ) + + cd ${srcdir}/build + make DESTDIR=${pkgdir} install + + # fix missing desktop integration + install -dm755 ${pkgdir}/usr/bin + pushd ${pkgdir}/usr/bin + ln -vs /usr/lib/libreoffice/program/soffice ./libreoffice + ln -vs /usr/lib/libreoffice/program/soffice ./soffice + ln -vs /usr/lib/libreoffice/program/sbase ./lobase + ln -vs /usr/lib/libreoffice/program/scalc ./localc + ln -vs /usr/lib/libreoffice/program/sdraw ./lodraw + ln -vs /usr/lib/libreoffice/program/simpress ./loimpress + ln -vs /usr/lib/libreoffice/program/smath ./lomath + ln -vs /usr/lib/libreoffice/program/swriter ./lowriter + ln -vs /usr/lib/libreoffice/program/unopkg ./unopkg + popd + + # move sysui desktop files into place we want to use - javafilter and qstarter, but not unneeded printeradmin + install -dm755 ${pkgdir}/usr/share/{applications,icons,mime/packages,pixmaps} + rm ${pkgdir}/usr/lib/libreoffice/share/xdg/printeradmin.desktop + for i in base calc draw impress javafilter math qstart startcenter writer; do + cp ${pkgdir}/usr/lib/libreoffice/share/xdg/$i.desktop ${pkgdir}/usr/share/applications/libreoffice-$i.desktop + done + # remove version in menu entry and make it visible + sed -i -e "s/3.4//g" ${pkgdir}/usr/share/applications/*.desktop + sed -i -e "s/Icon=libreoffice34-/Icon=/g" ${pkgdir}/usr/share/applications/*.desktop + sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop + echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop + # remove unneeded .desktop files + rm -rf ${pkgdir}/usr/lib/libreoffice/share/xdg + + # add missing icon files + cp -R ${srcdir}/build/sysui/desktop/icons/{hi,lo}color ${pkgdir}/usr/share/icons/ + pushd ${pkgdir}/usr/share/pixmaps + for i in base calc draw impress main math printeradmin startcenter writer; do + ln -vs /usr/share/icons/hicolor/48x48/apps/$i.png . + done + popd + sed -i -e 's/Icon=libreoffice-/Icon=/' ${pkgdir}/usr/share/applications/*.desktop + + # add missing mimetype file + install -m644 ${srcdir}/build/sysui/unxlng*/misc/libreoffice/openoffice.org.xml ${pkgdir}/usr/share/mime/packages/libreoffice.xml + + # 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 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/ + ln -vsf /etc/libreoffice/psprint.conf . + + #fix http://bugs.archlinux.org/task/17656 + find ${pkgdir} -perm 444 -exec ls -lh {} \; + find ${pkgdir} -perm 444 -exec chmod 644 {} \; + find ${pkgdir} -perm 555 -exec ls -lh {} \; + find ${pkgdir} -perm 555 -exec chmod 755 {} \; + + # split out extensions + mv ${pkgdir}/usr/lib/libreoffice/share/extensions ${srcdir}/extensions-install + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + install -m644 ${srcdir}/extensions-install/package.txt ${pkgdir}/usr/lib/libreoffice/share/extensions/ + + # move SDK to separated package + mkdir -p ${srcdir}/sdk-install/usr/lib/libreoffice/basis3.4/sdk + mv ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk ${srcdir}/sdk-install/usr/lib/libreoffice/basis3.4/ + + # cleanup gid_Module files + mkdir ${srcdir}/splitlist + mv -f ${pkgdir}/gid_Module* ${srcdir}/splitlist/ +} + +package_libreoffice-sdk() { + + pkgdesc="Software development kit for LibreOffice" + depends=('libreoffice' 'gcc-libs' 'sh') + + cd ${srcdir}/sdk-install + cp -r * ${pkgdir} + + cd ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk + mv setsdkenv_unix setsdkenv_unix.sh && chmod 755 setsdkenv_unix.sh + rm -f ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in + #fix permissions + find examples -type f -exec chmod -x {} \; +} + +package_libreoffice-extension-barcode() { + + pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw " + #arch=('any') + depends=('libreoffice') + 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') + 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') + 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') + 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') +# 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') +# 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') + 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') + 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') + 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' 'coreutils') + 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" + depends=('libreoffice' 'poppler') + 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 +} + +package_libreoffice-extension-presenter-screen() { + + pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide" + depends=('libreoffice') + 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 +} + +package_libreoffice-extension-presentation-minimizer() { + + pkgdesc="This extension reduce the file size of the current presentation" + depends=('libreoffice' 'gcc-libs') + 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 +} + +package_libreoffice-extension-report-builder() { + + pkgdesc="This extension creates smart-looking database reports" + #arch=('any') + depends=('libreoffice') + 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') + 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') + 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') + 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') + 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 + chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo +} + +package_libreoffice-extension-validator() { + + pkgdesc="Validator extension for LibreOffice" + #arch=('any') + depends=('libreoffice') + 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') + 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') + 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 +} diff --git a/~xihh/libreoffice/buildfix_64bit_system_libjpeg.diff b/~xihh/libreoffice/buildfix_64bit_system_libjpeg.diff new file mode 100644 index 000000000..1f4eb110f --- /dev/null +++ b/~xihh/libreoffice/buildfix_64bit_system_libjpeg.diff @@ -0,0 +1,11 @@ +--- solenv/inc/libs.mk 2009-07-02 09:44:33.084467312 +0000 ++++ solenv/inc/libs.mk.new 2009-07-02 10:44:03.420819776 +0000 +@@ -211,7 +211,7 @@ + .IF "$(OS)" == "FREEBSD" + JPEG3RDLIB=/usr/local/lib/libjpeg.so + .ELIF "$(CPUNAME)" == "X86_64" || "$(CPUNAME)" == "S390X" || "$(CPUNAME)" == "POWERPC64" +-JPEG3RDLIB=/usr/lib64/libjpeg.so ++JPEG3RDLIB=/usr/lib/libjpeg.so + .ELSE + JPEG3RDLIB=/usr/lib/libjpeg.so + .ENDIF diff --git a/~xihh/libreoffice/buildfix_bison25.diff b/~xihh/libreoffice/buildfix_bison25.diff new file mode 100644 index 000000000..869b6c81e --- /dev/null +++ b/~xihh/libreoffice/buildfix_bison25.diff @@ -0,0 +1,23 @@ +--- connectivity/source/parse/sqlbison.y 2011-05-20 13:21:02.000000000 -0600 ++++ connectivity/source/parse/sqlbison.y 2011-05-20 13:22:11.000000000 -0600 +@@ -4338,7 +4338,7 @@ + } + + // ------------------------------------------------------------------------- +-void OSQLParser::error(sal_Char *fmt) ++void OSQLParser::error(const sal_Char *fmt) + { + if(!m_sErrorMessage.getLength()) + { +--- connectivity/inc/connectivity/sqlparse.hxx 2011-05-20 13:23:58.000000000 -0600 ++++ connectivity/inc/connectivity/sqlparse.hxx 2011-05-20 13:23:46.000000000 -0600 +@@ -233,7 +233,7 @@ + // returns the type for a parameter in a given function name + static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos); + +- void error(sal_Char *fmt); ++ void error(const sal_Char *fmt); + int SQLlex(); + #ifdef YYBISON + void setParseTree(OSQLParseNode * pNewParseTree); + diff --git a/~xihh/libreoffice/buildfix_boost.diff b/~xihh/libreoffice/buildfix_boost.diff new file mode 100644 index 000000000..d8608d0d4 --- /dev/null +++ b/~xihh/libreoffice/buildfix_boost.diff @@ -0,0 +1,40 @@ +From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001 +From: Caolán McNamara <caolanm@redhat.com> +Date: Tue, 05 Apr 2011 14:07:02 +0000 +Subject: silence some more of that annoying gcc#47679 + +--- +diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch +index 1c804aa..9b33a5f 100644 +--- a/boost/boost.gcc47679.patch ++++ b/boost/boost.gcc47679.patch +@@ -36,3 +36,26 @@ + template <int MaxDigits> + inline bool allow_more_digits(std::size_t i) + { ++--- misc/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 +++++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 ++@@ -31,6 +31,8 @@ ++ ++ #include "boost/optional/optional_fwd.hpp" ++ +++#include <string.h> +++ ++ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200) ++ // VC6.0 has the following bug: ++ // When a templated assignment operator exist, an implicit conversion ++@@ -114,6 +116,11 @@ ++ ++ public: ++ +++ aligned_storage() +++ { +++ memset(&dummy_, 0, sizeof(dummy_)); +++ } +++ ++ void const* address() const { return &dummy_.data[0]; } ++ void * address() { return &dummy_.data[0]; } ++ } ; +-- +cgit v0.8.3-6-g21f6 + diff --git a/~xihh/libreoffice/buildfix_ct2n.diff b/~xihh/libreoffice/buildfix_ct2n.diff new file mode 100644 index 000000000..979587f79 --- /dev/null +++ b/~xihh/libreoffice/buildfix_ct2n.diff @@ -0,0 +1,17 @@ +From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001 +From: Caolán McNamara <caolanm@redhat.com> +Date: Tue, 12 Apr 2011 19:35:51 +0000 +Subject: duplicate NULLs + +--- +diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst +index 91f44b7..714d926 100644 +--- a/ct2n/prj/build.lst ++++ b/ct2n/prj/build.lst +@@ -1,3 +1,3 @@ +-ct2n ct2n : solenv NULL NULL ++ct2n ct2n : solenv NULL + ct2n ct2n usr1 - all ct2n_mkout NULL + ct2n ct2n nmake - all ct2n_ct2n NULL +-- +cgit v0.8.3-6-g21f6 diff --git a/~xihh/libreoffice/buildfix_i116795.diff b/~xihh/libreoffice/buildfix_i116795.diff new file mode 100644 index 000000000..8601bc164 --- /dev/null +++ b/~xihh/libreoffice/buildfix_i116795.diff @@ -0,0 +1,22 @@ +diff -r 4ab9e11cb892 connectivity/qa/makefile.mk +--- a/connectivity/qa/makefile.mk Thu Mar 03 15:22:23 2011 +0100 ++++ b/connectivity/qa/makefile.mk Fri Mar 04 09:51:48 2011 +0100 +@@ -35,9 +35,16 @@ + + #----- compile .java files ----------------------------------------- + +-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar + JAVAFILES := $(shell @$(FIND) complex -name "*.java") + ++JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar ++ ++.IF "$(SYSTEM_HSQLDB)" == "YES" ++EXTRAJARFILES = $(HSQLDB_JAR) ++.ELSE ++JARFILES += hsqldb.jar ++.ENDIF ++ + #----- make a jar from compiled files ------------------------------ + + JARCLASSDIRS = $(PACKAGE) + diff --git a/~xihh/libreoffice/libreoffice.install b/~xihh/libreoffice/libreoffice.install new file mode 100644 index 000000000..27f3173ae --- /dev/null +++ b/~xihh/libreoffice/libreoffice.install @@ -0,0 +1,25 @@ +post_install() { + +gtk-update-icon-cache -f -q /usr/share/icons/hicolor +update-desktop-database -q +update-mime-database usr/share/mime > /dev/null 2>&1 + +echo " * see http://wiki.archlinux.org/index.php/Openoffice" +echo " * you may want to pacman -Ss libreoffice-extensions" +echo " to see what extensions are prepared to install" +echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg for spell checking" +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 +update-desktop-database -q +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 +update-mime-database usr/share/mime > /dev/null 2>&1 +} diff --git a/~xihh/libreoffice/vbahelper.visibility.patch b/~xihh/libreoffice/vbahelper.visibility.patch new file mode 100644 index 000000000..5739100d0 --- /dev/null +++ b/~xihh/libreoffice/vbahelper.visibility.patch @@ -0,0 +1,33 @@ +--- vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:27:51.507604173 +0000 ++++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:28:26.230045727 +0000 +@@ -238,7 +238,7 @@ + + // including a HelperInterface implementation + template< typename Ifc1 > +-class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > ++class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > + { + typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase; + protected: +--- sc/Library_vbaobj.mk ++++ sc/Library_vbaobj.mk +@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ + sc/source/ui/vba/vbaquerytable \ + sc/source/ui/vba/vbarange \ + sc/source/ui/vba/vbasheetobject \ +- sc/source/ui/vba/vbasheetobjects \ + sc/source/ui/vba/vbastyle \ + sc/source/ui/vba/vbastyles \ + sc/source/ui/vba/vbatextboxshape \ +@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ + sc/source/ui/vba/vbawsfunction \ + )) + ++$(eval $(call gb_Library_add_cxxobjects,vbaobj,\ ++ sc/source/ui/vba/vbasheetobjects \ ++ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ ++)) ++ + ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) + $(eval $(call gb_Library_set_ldflags,vbaobj,\ + $$(LDFLAGS) \ |