[arch-commits] Commit in openoffice-base-devel/trunk (3 files)
Date: Wednesday, August 11, 2010 @ 13:50:15
Author: andyrtr
Revision: 87272
upgpkg: openoffice-base-devel 3.4_dev300_m86-1
new version 3.4_dev300_m86-1
Modified:
openoffice-base-devel/trunk/ChangeLog
openoffice-base-devel/trunk/PKGBUILD
Deleted:
openoffice-base-devel/trunk/dictionaries-needs-th-gen-idx.pl.diff
---+
ChangeLog |4 ++-
PKGBUILD | 20 +++--
dictionaries-needs-th-gen-idx.pl.diff | 36
3 files changed, 7 insertions(+), 53 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2010-08-11 15:57:56 UTC (rev 87271)
+++ ChangeLog 2010-08-11 17:50:15 UTC (rev 87272)
@@ -1,7 +1,9 @@
-2010-08-04 Andreas Radke andyrtr at archlinux.org
+2010-08-11 Andreas Radke andyrtr at archlinux.org
* 3.3_dev300_m86-1:
- new snapshot
+ - add buildfix for x86_64
+ - drop another buildfix
2010-07-23 Andreas Radke andyrtr at archlinux.org
Modified: PKGBUILD
===
--- PKGBUILD2010-08-11 15:57:56 UTC (rev 87271)
+++ PKGBUILD2010-08-11 17:50:15 UTC (rev 87272)
@@ -31,9 +31,9 @@
buildfix_FormulaMissingHeader.diff
http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff
http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/sal-cpprt-gcc-4.5-workaround.diff
- dictionaries-needs-th-gen-idx.pl.diff
cppunit_gcc45.diff
http://www.openoffice.org/nonav/issues/showattachment.cgi/70906/fixup.patch
+
http://www.openoffice.org/nonav/issues/showattachment.cgi/70985/vcl.empty-library_path.patch
openoffice.profile)
options=('!distcc' '!ccache' '!makeflags')
@@ -75,9 +75,9 @@
patch -Np0 -i ${srcdir}/sal-cpprt-gcc-4.5-workaround.diff
# buildfix for http://www.openoffice.org/issues/show_bug.cgi?id=113563
patch -Np1 -i ${srcdir}/fixup.patch
- # http://www.openoffice.org/issues/show_bug.cgi?id=113223
-# patch -Np1 -i ${srcdir}/dictionaries-needs-th-gen-idx.pl.diff
-
+ # buildfix for http://www.openoffice.org/issues/show_bug.cgi?id=113773,
http://www.openoffice.org/issues/show_bug.cgi?id=113632
+ patch -Np1 -i ${srcdir}/vcl.empty-library_path.patch
+
# allows soffice to find the user's firefox profile so that it can read
# its digital certificates. Nss stores digital certificates in your
mozilla firefox profile.
patch -Np0 -i ${srcdir}/soffice-detect-mozilla-certificates.diff
@@ -315,7 +315,6 @@
## Develize it!
cd ${pkgdir}/usr/lib/
-# mv openoffice openoffice-dev
mv openoffice.org openoffice.org-dev
mv openoffice.org3 openoffice.org3-dev
# fix link
@@ -327,9 +326,6 @@
cd ${pkgdir}/usr/bin
rm -f soffice spadmin
-# ln -sf /usr/lib/openoffice-dev/program/soffice soffice-dev
-# ln -sf /usr/lib/openoffice-dev/program/spadmin spadmin-dev
-# ln -sf /usr/lib/openoffice-dev/program/unopkg unopkg-dev
ln -sf /usr/lib/openoffice.org3-dev/program/soffice soffice-dev
ln -sf /usr/lib/openoffice.org3-dev/program/spadmin spadmin-dev
ln -sf /usr/lib/openoffice.org3-dev/program/unopkg unopkg-dev
@@ -345,7 +341,6 @@
sed -i -e 's|Icon=|Icon=dev-|g'
${pkgdir}/usr/share/applications/*.desktop
sed -i -e 's|OpenOffice\.org\ 3\.4|OpenOffice\.org\ devel|g'
${pkgdir}/usr/share/applications/*.desktop
-# cd ${pkgdir}/usr/lib/openoffice-dev/program/
ln -vsf /usr/lib/openoffice.org3-dev/program/soffice.bin soffice-dev.bin
# set desktop variable to force gtk/gnome vcl usage
@@ -354,8 +349,6 @@
# link the mozilla-plugin
mkdir -p ${pkgdir}/usr/lib/mozilla/plugins/
-# cd ${pkgdir}/usr/lib/mozilla/plugins/
-# ln -v -s /usr/lib/openoffice-dev/program/libnpsoplugin.so .
ln -vs /usr/lib/openoffice.org3-dev/program/libnpsoplugin.so
${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin.so
mv ${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin.so
${pkgdir}/usr/lib/mozilla/plugins/libnpsoplugin-dev.so
}
@@ -398,16 +391,11 @@
done
cd ${pkgdir}/usr/lib/
-# mv openoffice.org openoffice
-# cd ${pkgdir}/usr/lib/openoffice/
-# mv basis3.4 basis-link
-
# fix ownership and permissions
chown root.root -R ${pkgdir}/
## Develize it!
cd ${pkgdir}/usr/lib/
-# mv openoffice openoffice-dev
mv openoffice.org openoffice.org-dev
}
Deleted: dictionaries-needs-th-gen-idx.pl.diff
===
--- dictionaries-needs-th-gen-idx.pl.diff 2010-08-11 15:57:56 UTC (rev
87271)
+++ dictionaries-needs-th-gen-idx.pl.diff 2010-08-11 17:50:15
[arch-commits] Commit in openoffice-base-devel/trunk (3 files)
Date: Sunday, July 18, 2010 @ 23:58:31
Author: andyrtr
Revision: 85740
prepare DEV300_m84
Modified:
openoffice-base-devel/trunk/ChangeLog
openoffice-base-devel/trunk/PKGBUILD
openoffice-base-devel/trunk/openoffice.profile
+
ChangeLog |7 +++
PKGBUILD | 97 ---
openoffice.profile |2 -
3 files changed, 55 insertions(+), 51 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2010-07-19 03:57:48 UTC (rev 85739)
+++ ChangeLog 2010-07-19 03:58:31 UTC (rev 85740)
@@ -1,3 +1,10 @@
+2010-0717 Andreas Radke andyrtr at archlinux.org
+
+* 3.3_dev300_m84-1:
+ - disable PYTHONPATH changes in profile file
+ - remove system-mythes patch that went upstream
+ - explicitly point to internal mdds
+
2010-06-18 Andreas Radke andyrtr at archlinux.org
* 3.3_dev300_m83-1:
Modified: PKGBUILD
===
--- PKGBUILD2010-07-19 03:57:48 UTC (rev 85739)
+++ PKGBUILD2010-07-19 03:58:31 UTC (rev 85740)
@@ -4,7 +4,7 @@
pkgbase=openoffice-base-devel
pkgname=('openoffice-base-devel' 'openoffice-sdk-devel')
-_OO_milestone=DEV300_m83
+_OO_milestone=DEV300_m84
pkgver=3.3_${_OO_milestone/DEV/dev}
pkgrel=1
arch=('i686' 'x86_64')
@@ -31,7 +31,6 @@
buildfix_FormulaMissingHeader.diff
http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff
http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/sal-cpprt-gcc-4.5-workaround.diff
-
http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/fix-system-mythes-for-mythes-1.2.diff
cppunit_gcc45.diff
openoffice.profile)
options=('!distcc' '!ccache' '!makeflags')
@@ -67,23 +66,20 @@
export NO_HIDS=true
# build fixes
- patch -Np0 -i ${srcdir}/buildfix-gcc44.diff || return 1
- patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
+ patch -Np0 -i ${srcdir}/buildfix-gcc44.diff
+ patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff
# gcc4.5 fix
- patch -Np0 -i ${srcdir}/cppu-lbnames-enable-gcc-4.5.diff || return 1
- patch -Np0 -i ${srcdir}/sal-cpprt-gcc-4.5-workaround.diff || return 1
+ patch -Np0 -i ${srcdir}/cppu-lbnames-enable-gcc-4.5.diff
+ patch -Np0 -i ${srcdir}/sal-cpprt-gcc-4.5-workaround.diff
- # allow build with system mythes
- patch -Np0 -i ${srcdir}/fix-system-mythes-for-mythes-1.2.diff || return
1
-
# allows soffice to find the user's firefox profile so that it can read
# its digital certificates. Nss stores digital certificates in your
mozilla firefox profile.
- patch -Np0 -i ${srcdir}/soffice-detect-mozilla-certificates.diff ||
return 1
+ patch -Np0 -i ${srcdir}/soffice-detect-mozilla-certificates.diff
# remove the startup wizard
- patch -Np0 -i ${srcdir}/default-no-startup-wizard.diff || return 1
+ patch -Np0 -i ${srcdir}/default-no-startup-wizard.diff
# enables the default system-file-picker in case we have that built
- patch -Np0 -i ${srcdir}/default-system-fpicker.diff || return 1
+ patch -Np0 -i ${srcdir}/default-system-fpicker.diff
if [ $CARCH = x86_64 ]; then
EXTRAOPTS=--without-stlport
@@ -98,7 +94,7 @@
cd ${srcdir}/${_OO_milestone}
# needed to build the OO-SDK
- mv ${srcdir}/unowinreg.dll external/unowinreg || return 1
+ mv ${srcdir}/unowinreg.dll external/unowinreg
# export C(XX)FLAGS
# http://www.openoffice.org/issues/show_bug.cgi?id=103205
@@ -106,7 +102,7 @@
unset CXXFLAGS
# Need to recreate the configure script because of patches
- autoreconf -v || return 1
+ autoreconf -v
./configure --with-build-version=${pkgver} ArchLinux build-${pkgrel}
(${_OO_milestone}) \
--with-vendor=ArchLinux\
@@ -147,6 +143,7 @@
--without-nas\
--without-ppds\
--without-system-agg\
+ --without-system-mdds\
--with-system-cppunit\
--with-system-redland\
--without-system-saxon\
@@ -165,7 +162,7 @@
--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
--with-use-shell=bash\
--with-external-tar=${SRCDEST}\
-$EXTRAOPTS || return 1
+$EXTRAOPTS
# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
@@ -185,10 +182,10 @@
fi
# Build dmake utility
- ./bootstrap || return 1
+ ./bootstrap
cd instsetoo_native
- build.pl -P${SMP} ${MAXMODULESFLAG} ${MAXPROCESSESFLAG} --dlv_switch
-link --all || return 1
+ build.pl -P${SMP} ${MAXMODULESFLAG} ${MAXPROCESSESFLAG} --dlv_switch
