[arch-commits] Commit in openoffice-base-devel/repos (4 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sat Feb 28 22:16:20 UTC 2009
Date: Saturday, February 28, 2009 @ 17:16:20
Author: andyrtr
Revision: 28362
Merged revisions 28030 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/openoffice-base-devel/trunk
........
r28030 | andyrtr | 2009-02-27 19:06:52 +0000 (Fr, 27 Feb 2009) | 2 lines
upgpkg: openoffice-base-devel 3.2_dev300_m42-1
new snapshot DEV300_m42
........
Added:
openoffice-base-devel/repos/extra-i686/DEV300m42-helpcontent2.diff
(from rev 28030, openoffice-base-devel/trunk/DEV300m42-helpcontent2.diff)
Modified:
openoffice-base-devel/repos/extra-i686/ (properties)
openoffice-base-devel/repos/extra-i686/ChangeLog
openoffice-base-devel/repos/extra-i686/PKGBUILD
-----------------------------+
ChangeLog | 3 +++
DEV300m42-helpcontent2.diff | 13 +++++++++++++
PKGBUILD | 16 +++++++++-------
3 files changed, 25 insertions(+), 7 deletions(-)
Property changes on: openoffice-base-devel/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /openoffice-base-devel/trunk:1-25851
+ /openoffice-base-devel/trunk:1-28361
Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog 2009-02-28 19:59:49 UTC (rev 28361)
+++ extra-i686/ChangeLog 2009-02-28 22:16:20 UTC (rev 28362)
@@ -1,3 +1,6 @@
+openoffice-base-devel - 3.2_dev300_m42-1
+- next snapshot
+
openoffice-base-devel - 3.2_dev300_m41-1
- next snapshot
- disable qadevooo again
Copied: openoffice-base-devel/repos/extra-i686/DEV300m42-helpcontent2.diff (from rev 28030, openoffice-base-devel/trunk/DEV300m42-helpcontent2.diff)
===================================================================
--- extra-i686/DEV300m42-helpcontent2.diff (rev 0)
+++ extra-i686/DEV300m42-helpcontent2.diff 2009-02-28 22:16:20 UTC (rev 28362)
@@ -0,0 +1,13 @@
+Index: makefile.pmk
+===================================================================
+--- helpcontent2/makefile.pmk (revision 268394)
++++ helpcontent2/makefile.pmk (working copy)
+@@ -44,7 +44,7 @@
+
+ $(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
+ .IF "$(WITH_LANG)"!=""
+- @$(WRAPCMD) helpex -QQ -p helpcontent2 -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@
++ @$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) helpex -QQ -p helpcontent2 -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@
+ .ELSE # "$(WITH_LANG)"!=""
+ .IF "$(USE_SHELL)"=="4nt"
+ # it's getting real ugly...
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-02-28 19:59:49 UTC (rev 28361)
+++ extra-i686/PKGBUILD 2009-02-28 22:16:20 UTC (rev 28362)
@@ -2,16 +2,16 @@
# Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
pkgname=openoffice-base-devel
-pkgver=3.2_dev300_m41
+pkgver=3.2_dev300_m42
pkgrel=1
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
arch=('i686' 'x86_64')
-_OO_milestone=DEV300_m41
+_OO_milestone=DEV300_m42
license=('LGPL3')
url="http://www.openoffice.org"
install=openoffice.install
depends=("curl>=7.19.2" "hunspell>=1.2.8" "python>=2.6.1" 'libwpd' 'redland'
- 'libxaw' "neon>=0.28.3-2" 'dbus-glib' "icu>=4.0-2" 'hsqldb-java' 'libxslt' 'sqlite3')
+ 'libxaw' "neon>=0.28.3-2" 'dbus-glib' "icu>=4.0-2" 'hsqldb-java' 'libxslt')
optdepends=('java-runtime: adds java support'
'libcups: adds printing support'
'gconf: adds additional gnome support'
@@ -31,6 +31,7 @@
shell.patch
system_hsqldb.diff
buildfix_FormulaMissingHeader.diff
+ DEV300m42-helpcontent2.diff
openoffice.profile)
options=('!distcc' '!ccache' '!makeflags')
@@ -62,6 +63,7 @@
# build fixes
patch -Np0 -i ${srcdir}/buildfix-gcc43.diff || return 1
patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
+ patch -Np0 -i ${srcdir}/DEV300m42-helpcontent2.diff || return 1
# allows soffice to find the user's firefox profile so that it can read
# his digital certificates. Nss stores digital certificates in your mozilla firefox profile.
@@ -182,14 +184,14 @@
cd ${pkgdir}/opt/
## Step 1
cd ${pkgdir}/opt/openoffice.org || return 1
- mv ure/ basis3.0/ || return 1
- cd basis3.0 || return 1
+ mv ure/ basis3.1/ || return 1
+ cd basis3.1 || return 1
rm ure-link && mv ure ure-link || return 1
## Step 2
cd ${pkgdir}/opt/ || return 1
- mv openoffice.org/basis3.0/ openoffice.org3/ || return 1
+ mv openoffice.org/basis3.1/ openoffice.org3/ || return 1
cd openoffice.org3/ || return 1
- rm basis-link && mv basis3.0 basis-link || return 1
+ rm basis-link && mv basis3.1 basis-link || return 1
## Step 3
cd ${pkgdir}/opt/ || return 1
rmdir ${pkgdir}/opt/openoffice.org || return 1
More information about the arch-commits
mailing list