Date: Wednesday, September 29, 2010 @ 12:42:09
Author: andyrtr
Revision: 92404
fix some vars + fix our libjpeg buildfix
Modified:
libreoffice/trunk/PKGBUILD
libreoffice/trunk/buildfix_64bit_system_libjpeg.diff
------------------------------------+
PKGBUILD | 38 ++++++++++-------------------------
buildfix_64bit_system_libjpeg.diff | 4 +--
2 files changed, 13 insertions(+), 29 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-09-29 16:13:29 UTC (rev 92403)
+++ PKGBUILD 2010-09-29 16:42:09 UTC (rev 92404)
@@ -78,39 +78,22 @@
'310bf13fb37477cb0b533e92596c4c23'
'1fb344dd20334f42d7632e2f76ffb54c'
'a77cc2fdff90146485e0b1f1398bb0d4'
- 'b005c4cf9f8e586539ca98c9cfe9bb77')
+ '7ef850978f435c32abc81862404936fc')
-# source PKGBUILD && mksource
-#mksource() {
-# source /etc/makepkg.conf && echo ${SRCDEST}
-# mkdir /tmp/$pkgname-source
-# pushd /tmp/$pkgname-source
-# if [ -e ${SRCDEST}/{pkgname}-build-${_LOver}.tar.gz ]; then
-# cp $SRCDEST/{pkgname}-build-${_LOver}.tar.gz .
-# else wget ${_mirror}/${_LO_tree}/{pkgname}-build-${_LOver}.tar.gz
-# fi
-# tar -xvf {pkgname}-build-${_LOver}.tar.gz
-# cd {pkgname}-build-${_LOver}
-# ./configure --quiet --with-distro=ArchLinux
-# ./download --all
-# pushd src; tar -cvJf ../../${pkgname}-${_ootag}.tar.xz clone; popd
-# popd
-#}
-
build() {
unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
[ -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
- cd ${srcdir}/{pkgname}-build-${_LOver}
+ cd ${srcdir}/${pkgname}-build-${_LOver}
# our ArchLinux distribution patch until we go upstream
patch -Np0 -i ${srcdir}/ArchLinux.patch || return 1
# hotfixes not yet upstream
-# cp ${srcdir}/*.diff
${srcdir}/{pkgname}-build-${_LOver}/patches/hotfixes/
- cp ${srcdir}/buildfix_64bit_system_libjpeg.diff
${srcdir}/{pkgname}-build-${_LOver}/patches/hotfixes/
+# cp ${srcdir}/*.diff
${srcdir}/${pkgname}-build-${_LOver}/patches/hotfixes/
+ cp ${srcdir}/buildfix_64bit_system_libjpeg.diff
${srcdir}/${pkgname}-build-${_LOver}/patches/hotfixes/
# export C(XX)FLAGS
# http://www.openoffice.org/issues/show_bug.cgi?id=103205
@@ -128,11 +111,11 @@
--without-git \
--with-srcdir=${srcdir} \
--with-max-jobs=${MAKEFLAGS/-j/} \
- --with-installed-{pkgname}-dirname="${pkgname}" \
+ --with-installed-${pkgname}-dirname="${pkgname}" \
--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
--with-docdir=/usr/share/doc/packages/"${pkgname}" \
--mandir=/usr/share/man \
- --with-lang="" \
+ --with-lang="en-US" \
--with-dict=ALL\
--with-binsuffix=no \
--enable-cairo\
@@ -187,24 +170,25 @@
# --with-additional-sections="OOXMLExport"
unset MAKEFLAGS
-# ./download
+ ./download
LD_PRELOAD="" make || return 1
# make test || return 1
}
package() {
- cd ${srcdir}/{pkgname}-build-${_LOver}
+ cd ${srcdir}/${pkgname}-build-${_LOver}
+ #bin/ooinstall <path-to-install>
LD_PRELOAD="" make DESTDIR=${pkgdir} install || return 1
# install all built dictionaries from source tree
- pushd
${srcdir}/{pkgname}-build-${_LOver}/build/${_ootag}/dictionaries/unxlng?6.pro/bin/
+ pushd
${srcdir}/${pkgname}-build-${_LOver}/build/${_ootag}/dictionaries/unxlng?6.pro/bin/
for i in `ls -1 dict-??.oxt`; do
install -D -m644 $i
${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/$i || return 1
done
popd
# install all other built extensions
- pushd
${srcdir}/{pkgname}-build-${_LOver}/build/${_ootag}/solver/320/unxlng?6.pro/bin/
+ pushd
${srcdir}/${pkgname}-build-${_LOver}/build/${_ootag}/solver/320/unxlng?6.pro/bin/
install -D -m644 report-builder.oxt
${pkgdir}/usr/lib/openoffice/share/extension/install/report-builder.oxt ||
return 1
install -D -m644 swext/wiki-publisher.oxt
${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/wiki-publisher.oxt ||
return 1
install -D -m644 minimizer/presentation-minimizer.oxt
${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/presentation-minimizer.oxt
|| return 1
Modified: buildfix_64bit_system_libjpeg.diff
===================================================================
--- buildfix_64bit_system_libjpeg.diff 2010-09-29 16:13:29 UTC (rev 92403)
+++ buildfix_64bit_system_libjpeg.diff 2010-09-29 16:42:09 UTC (rev 92404)
@@ -1,9 +1,9 @@
--- 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
-@@ -219,7 +219,7 @@
+@@ -211,7 +211,7 @@
.IF "$(OS)" == "FREEBSD"
JPEG3RDLIB=/usr/local/lib/libjpeg.so
- .ELIF "$(CPUNAME)" == "X86_64"
+ .ELIF "$(CPUNAME)" == "X86_64" || "$(CPUNAME)" == "S390X" || "$(CPUNAME)" ==
"POWERPC64"
-JPEG3RDLIB=/usr/lib64/libjpeg.so
+JPEG3RDLIB=/usr/lib/libjpeg.so
.ELSE
