libreoffice without java

6 files changed, 256 insertions, 130 deletions

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 {} \;
 }