[arch-commits] Commit in go-openoffice/repos (6 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Fri May 1 16:19:51 UTC 2009
Date: Friday, May 1, 2009 @ 12:19:51
Author: andyrtr
Revision: 37425
Merged revisions 36751,37406,37424 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/go-openoffice/trunk
........
r36751 | andyrtr | 2009-04-27 12:59:06 +0200 (Mo, 27 Apr 2009) | 1 line
fix url; #14471
........
r37406 | andyrtr | 2009-05-01 15:22:45 +0200 (Fr, 01 Mai 2009) | 2 lines
upgpkg: go-openoffice 3.0.99.7-1
new version 3.0.99.7
........
r37424 | andyrtr | 2009-05-01 18:19:04 +0200 (Fr, 01 Mai 2009) | 2 lines
upgpkg: go-openoffice 3.0.99.7-1
new version 3.0.99.7
........
Modified:
go-openoffice/repos/extra-i686/ (properties)
go-openoffice/repos/extra-i686/ArchLinux.patch
go-openoffice/repos/extra-i686/ChangeLog
go-openoffice/repos/extra-i686/PKGBUILD
go-openoffice/repos/extra-i686/go-openoffice.install
Deleted:
go-openoffice/repos/extra-i686/ooo-build-3.0.99.6-apply.diff
-------------------------------+
ArchLinux.patch | 140 ++++++++++++++++++++--------------------
ChangeLog | 8 ++
PKGBUILD | 61 ++++++++---------
go-openoffice.install | 2
ooo-build-3.0.99.6-apply.diff | 10 --
5 files changed, 106 insertions(+), 115 deletions(-)
Property changes on: go-openoffice/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /go-openoffice/trunk:1-36748
+ /go-openoffice/trunk:1-37424
Modified: extra-i686/ArchLinux.patch
===================================================================
--- extra-i686/ArchLinux.patch 2009-05-01 16:19:04 UTC (rev 37424)
+++ extra-i686/ArchLinux.patch 2009-05-01 16:19:51 UTC (rev 37425)
@@ -1,73 +1,3 @@
---- configure.in 2009-04-07 19:03:29.000000000 +0000
-+++ configure.in.new 2009-04-12 16:16:34.784307439 +0000
-@@ -596,6 +596,7 @@
- AC_MSG_CHECKING([for vendor name based on the distribution name])
- VENDORNAME=OpenOffice
- case $DISTRO in
-+ ArchLinux*) VENDORNAME="ArchLinux" ;;
- Ark*) VENDORNAME="Ark" ;;
- Debian*|Ubuntu*) VENDORNAME="Debian" ;;
- Dropline*) VENDORNAME="DroplineGNOME" ;;
-@@ -1405,6 +1406,7 @@
- desktop/mimetypes/32x32/Makefile
- desktop/mimetypes/48x48/Makefile
- distro-configs/Makefile
-+distro-configs/ArchLinux.conf
- distro-configs/Ark.conf
- distro-configs/Common.conf
- distro-configs/CommonLinux.conf
---- download.in 2009-03-23 16:46:47.000000000 +0000
-+++ download.in.new 2009-04-12 16:24:32.250848107 +0000
-@@ -414,7 +414,8 @@
- }
-
- my $distro = '@DISTRO@';
--if ($distro eq 'Ark' ||
-+if ($distro eq 'ArchLinux' ||
-+ $distro eq 'Ark' ||
- $distro eq 'DroplineGNOME' ||
- $distro eq 'Frugalware' || $distro eq 'Frugalware64' ||
- $distro eq 'Gentoo.conf' ||
---- distro-configs/Makefile.in 2009-04-07 21:03:32.000000000 +0200
-+++ distro-configs/Makefile.in.new 2009-04-12 18:38:59.447428557 +0200
-@@ -30,7 +30,7 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- subdir = distro-configs
--DIST_COMMON = $(srcdir)/Ark.conf.in $(srcdir)/Common.conf.in \
-+DIST_COMMON = $(srcdir)/ArchLinux.conf.in $(srcdir)/Ark.conf.in $(srcdir)/Common.conf.in \
- $(srcdir)/CommonLinux.conf.in $(srcdir)/CommonWin32.conf.in \
- $(srcdir)/Debian.conf.in $(srcdir)/DebianEtch.conf.in \
- $(srcdir)/DebianSarge.conf.in $(srcdir)/DroplineGNOME.conf.in \
-@@ -68,7 +68,7 @@
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
--CONFIG_CLEAN_FILES = Ark.conf Common.conf CommonLinux.conf \
-+CONFIG_CLEAN_FILES = ArchLinux.conf Ark.conf Common.conf CommonLinux.conf \
- CommonWin32.conf GoOoWin32.conf DroplineGNOME.conf \
- DroplineGNOME64.conf Debian.conf DebianEtch.conf \
- DebianSarge.conf FSFhuLinux.conf FSFhuMacOSX.conf \
-@@ -315,6 +315,8 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+ArchLinux.conf: $(top_builddir)/config.status $(srcdir)/ArchLinux.conf.in
-+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- Ark.conf: $(top_builddir)/config.status $(srcdir)/Ark.conf.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- Common.conf: $(top_builddir)/config.status $(srcdir)/Common.conf.in
---- patches/dev300/apply 2009-04-07 18:04:28.000000000 +0200
-+++ patches/dev300/apply.new 2009-04-12 18:51:01.881522476 +0200
-@@ -114,6 +114,8 @@
- rPathCommon: LinuxCommon, NotDebian, Lockdown, BerkeleyDB43, CairoFonts
- rpl2: rPathCommon
- rpl2-64: rPathCommon
-+# ArchLinux - maybe , Gcc43 , NotDebian
-+ArchLinux: LinuxCommon
- # Win32
- Win32 : Win32Common
- # translate.org.za
--- distro-configs/ArchLinux.conf.in 2009-04-19 09:29:40.000000000 +0000
+++ distro-configs/ArchLinux.conf.in.new 2009-04-19 09:35:54.000000000 +0000
@@ -0,0 +1,41 @@
@@ -112,3 +42,73 @@
+--with-serializer-jar=/usr/share/java/serializer.jar
+--with-use-shell=bash
+--disable-dependency-tracking
+--- distro-configs/Makefile.in 2009-04-30 16:26:20.000000000 +0000
++++ distro-configs/Makefile.in.new 2009-05-01 10:02:40.000000000 +0000
+@@ -30,7 +30,7 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ subdir = distro-configs
+-DIST_COMMON = $(srcdir)/Ark.conf.in $(srcdir)/Common.conf.in \
++DIST_COMMON = $(srcdir)/ArchLinux.conf.in $(srcdir)/Ark.conf.in $(srcdir)/Common.conf.in \
+ $(srcdir)/CommonLinux.conf.in $(srcdir)/CommonMac.conf.in \
+ $(srcdir)/CommonWin32.conf.in $(srcdir)/Debian.conf.in \
+ $(srcdir)/DebianEtch.conf.in $(srcdir)/DebianSarge.conf.in \
+@@ -65,7 +65,7 @@
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(install_sh) -d
+-CONFIG_CLEAN_FILES = Ark.conf Common.conf CommonLinux.conf \
++CONFIG_CLEAN_FILES = ArchLinux.conf Ark.conf Common.conf CommonLinux.conf \
+ CommonWin32.conf CommonMac.conf GoOoWin32.conf \
+ DroplineGNOME.conf DroplineGNOME64.conf Debian.conf \
+ DebianEtch.conf DebianSarge.conf FSFhuLinux.conf \
+@@ -300,6 +300,8 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++ArchLinux.conf: $(top_builddir)/config.status $(srcdir)/ArchLinux.conf.in
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ Ark.conf: $(top_builddir)/config.status $(srcdir)/Ark.conf.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ Common.conf: $(top_builddir)/config.status $(srcdir)/Common.conf.in
+--- configure.in 2009-04-30 16:26:17.000000000 +0000
++++ configure.in.new 2009-05-01 10:10:08.000000000 +0000
+@@ -592,6 +592,7 @@
+ AC_MSG_CHECKING([for vendor name based on the distribution name])
+ VENDORNAME=OpenOffice
+ case $DISTRO in
++ ArchLinux*) VENDORNAME="ArchLinux" ;;
+ Ark*) VENDORNAME="Ark" ;;
+ Debian*|Ubuntu*) VENDORNAME="Debian" ;;
+ Dropline*) VENDORNAME="DroplineGNOME" ;;
+@@ -1378,6 +1379,7 @@
+ desktop/mimetypes/32x32/Makefile
+ desktop/mimetypes/48x48/Makefile
+ distro-configs/Makefile
++distro-configs/ArchLinux.conf
+ distro-configs/Ark.conf
+ distro-configs/Common.conf
+ distro-configs/CommonLinux.conf
+--- download.in 2009-04-28 09:39:18.000000000 +0000
++++ download.in.new 2009-05-01 10:12:15.000000000 +0000
+@@ -383,7 +383,8 @@
+ }
+
+ my $distro = '@DISTRO@';
+-if ($distro eq 'Ark' ||
++if ($distro eq 'ArchLinux' ||
++ $distro eq 'Ark' ||
+ $distro eq 'DroplineGNOME' ||
+ $distro eq 'Frugalware' || $distro eq 'Frugalware64' ||
+ $distro eq 'Gentoo.conf' ||
+--- patches/dev300/apply 2009-04-30 14:55:12.000000000 +0000
++++ patches/dev300/apply.new 2009-05-01 10:15:16.000000000 +0000
+@@ -105,6 +105,8 @@
+ rPathCommon: LinuxCommon, NotDebian, Lockdown, BerkeleyDB43, CairoFonts
+ rpl2: rPathCommon
+ rpl2-64: rPathCommon
++# ArchLinux
++ArchLinux: LinuxCommon
+ # Win32
+ Win32 : Win32Common
+ # translate.org.za
Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog 2009-05-01 16:19:04 UTC (rev 37424)
+++ extra-i686/ChangeLog 2009-05-01 16:19:51 UTC (rev 37425)
@@ -1,5 +1,12 @@
2009-04-25 Andreas Radke <andyrtr at archlinux.org>
+ * 3.0.99.7-1 :
+ new upstream release, OOo 310_m11=3.1.0rc2
+ fix project url
+ rediff the ArchLinux.patch - will send it upstream now
+
+2009-04-25 Andreas Radke <andyrtr at archlinux.org>
+
* 3.0.99.6-1 :
new upstream pre-release
manually install all built dicts+extension
@@ -10,4 +17,4 @@
initial ArchLinux pkg
based on the vanilla OOo-base-beta pkg
known issue: Xfce menu does not show icons
- and dictionaries are not present
\ No newline at end of file
+ and dictionaries are not present
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-05-01 16:19:04 UTC (rev 37424)
+++ extra-i686/PKGBUILD 2009-05-01 16:19:51 UTC (rev 37425)
@@ -2,16 +2,16 @@
# Maintainer: AndyRTR <andyrtr at archlinux.org>
pkgname=go-openoffice
-pkgver=3.0.99.6
-_GOver=3.0.99.6
+pkgver=3.0.99.7
+_GOver=3.0.99.7
pkgrel=1
pkgdesc="OpenOffice.org - go-oo.org enhanced version of SUN's office suite"
arch=('i686' 'x86_64')
_go_tree="OOO310"
_dir=DEV300
-_ootag=ooo310-m10
+_ootag=ooo310-m11 # = OOo 3.1.0 RC2
license=('LGPL3')
-url="http://www.openoffice.org"
+url="http://go-oo.org/"
install=${pkgname}.install
depends=("curl>=7.19.4" "hunspell>=1.2.8" "python>=2.6.1" 'libwpd' 'redland' 'gstreamer0.10-base-plugins>=0.10.22'
'libxaw' "neon>=0.28.3-2" "icu>=4.0-2" 'hsqldb-java' 'libxslt' 'libxtst' 'desktop-file-utils' 'mono>=2.4')
@@ -23,7 +23,7 @@
'poppler: for the pdfimport extension'
'mesa: for the OGLTrans extension')
makedepends=('automake' 'autoconf' 'wget' 'bison' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl'
- 'pam' 'sane' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.0.9" 'apache-ant' 'cairo'
+ 'pam' 'sane' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.0.10" 'apache-ant' 'cairo'
'gperf' 'libcups' 'pstoedit' 'gconf' "openjdk6>=1.4" 'unixodbc' 'mesa>=7.4' 'poppler>=0.10.5') # 'boost' # 'libjpeg'
provides=('openoffice-base')
conflicts=('openoffice-base')
@@ -40,44 +40,42 @@
http://download.go-oo.org//DEV300/scsolver.2008-10-30.tar.bz2
http://download.go-oo.org//libwpd/libwpd-0.8.14.tar.gz
http://download.go-oo.org//SRC680/libwps-0.1.2.tar.gz
- http://download.go-oo.org//SRC680/libwpg-0.1.3.tar.gz
- ooo-build-3.0.99.6-apply.diff)
+ http://download.go-oo.org//SRC680/libwpg-0.1.3.tar.gz)
#options=('!distcc' '!ccache' '!makeflags')
noextract=(ooo-cli-prebuilt-3.1.tar.bz2 cairo-1.4.10.tar.gz mdbtools-0.6pre1.tar.gz
${_ootag}-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions}.tar.bz2
extras-3.tar.bz2 biblio.tar.bz2 unowinreg.dll scsolver.2008-10-30.tar.bz2 libwpd-0.8.14.tar.gz libwps-0.1.2.tar.gz libwpg-0.1.3.tar.gz)
-md5sums=('e8a22aa0e9e0a29973bda7d9c8a75c4f'
- '98ed05c5ffea196ae2103c06b8a9321a'
+md5sums=('95771debb2a2c9b6497a319eba672131'
+ 'da31e2f5d5b342f3ad6ff2e66337f3b2'
'b5b895b338e81191a6abacc644e3f705'
'5598a5e500ad922e37b159dee72fc993'
'246e8f38b2a1af1bcff60ee0da59300b'
- 'c88cbe383939419c19bf42ba729295b8'
- 'a783b9644c70d366ebcb2f9d42e6b774'
- '44b842858076ba56637665f6ba1e0181'
- 'cc6d535a1e6b8c90ed773b09bbc24420'
- 'b16a41c1b59ddafb12c6522201abdc0b'
- 'f41808ca7b3c67d1415c85a7e5ea4583'
- '02ebdcdc1d9427f1f3e754adc7a612b7'
- '2dd25c574622f6bc7e75f7bacc033c68'
- 'fdffeb76bf3d4933d7cf49493806a3eb'
- '1f9b26bd6b24a88ac61e0b56d86dca25'
- '7ac84643bf26552c34ffc69290c5fe93'
- '63ebec0b30d0a9c94a7933d1fdc12432'
- '60d6d6d87eef391109a129ab69b00376'
- 'c90e67e9522bee94280c3aa5dde0dc27'
- '620367e2ab6c45d770a79faea2197a10'
- '2397a13855179c60137c765584409b2d'
- '70b832f059ea931b30917b8ab41c902c'
- '7fbc0e2a2724596973a4e19ca3c8cb77'
- '7607fd150c048f3ff3ca18417e0dc847'
+ '287978048c08659b39810de992d4c26a'
+ '6c32c4f173d1207481a499ab1d6d5d47'
+ '1bc62a4f88f193695541101bf8dc4b57'
+ '448b6d98a082617a6abc45307b376a4d'
+ '61d518e0b9a21d5e986824825dfe7fb6'
+ '4806489c7e53ae8c5144fb91352fe70e'
+ '9898ac373bd5688134e24372d0e16a95'
+ '7a23528b72ebee8788d5597ef7acbacd'
+ 'a1e342e34e88c05bb2fb7234ae0a15a3'
+ '933efdcc45e957730431c3064dff4b39'
+ '8df6d9dc84c43c74db4016a031810213'
+ '12c46788771f174cc83f0e82a957ec1b'
+ '80f6d4a00e06c9df595e7b4a9ebf021a'
+ '9c963adff8b10bc0e8bcc97e2ca0a9f8'
+ 'a768843afb06e3eef0d9c481be6c5db8'
+ 'b6e79c5245666ef40cb006970e1a1ecf'
+ '7379d5ad47237193d26c7b55a3518dd7'
+ 'a4b76722a9024595984c67bd4d9fecff'
+ '7df2da16025ecb6a466824ba6c388054'
'36f323a55ee83e9dc968e1b92569b62a'
'1948e39a68f12bfa0b7eb309c14d940c'
'e3a0b76dcd876f3d721ee7183729153d'
'04181e5ef82973eb349d3122a19d2274'
'64d66018897d759358f454010b6e75d2'
'799fc3b835a79adce8c88a3fee0150c1'
- 'db556b750bf3eac8481a4cc5e29e5af1'
- 'f1a3700b30faad5c486c22f60150b56c')
+ 'db556b750bf3eac8481a4cc5e29e5af1')
build() {
unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
@@ -85,9 +83,6 @@
[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
cd ${srcdir}/ooo-build-${_GOver}
-
- # upstream buildfix
- patch -Np0 -i $srcdir/ooo-build-3.0.99.6-apply.diff || return 1
# our ArchLinux distribution patch until we go upstream
patch -Np0 -i ${srcdir}/ArchLinux.patch || return 1
Modified: extra-i686/go-openoffice.install
===================================================================
--- extra-i686/go-openoffice.install 2009-05-01 16:19:04 UTC (rev 37424)
+++ extra-i686/go-openoffice.install 2009-05-01 16:19:51 UTC (rev 37425)
@@ -3,7 +3,7 @@
gtk-update-icon-cache -f -q /usr/share/icons/hicolor
update-desktop-database -q
-_GOver='3.0.99.6'
+_GOver='3.0.99.7'
echo " see http://wiki.archlinux.org/index.php/Openoffice"
echo " how to use extensions, e.g. for spell checking"
Deleted: extra-i686/ooo-build-3.0.99.6-apply.diff
===================================================================
--- extra-i686/ooo-build-3.0.99.6-apply.diff 2009-05-01 16:19:04 UTC (rev 37424)
+++ extra-i686/ooo-build-3.0.99.6-apply.diff 2009-05-01 16:19:51 UTC (rev 37425)
@@ -1,10 +0,0 @@
---- patches/dev300/apply.old 2009-04-24 18:37:11.000000000 +0200
-+++ patches/dev300/apply 2009-04-24 18:53:06.000000000 +0200
-@@ -2903,7 +2903,6 @@ xlsx-snapshot.diff
- # (converts the xlsx export to a UNO filter)
- xlsx-shared-import-and-export.diff
-
--[ Fixes ]
- # manually force page preview obj to PRESOBJ_PAGE
- sd-pptin-slidepreview-fix.diff, i#101051, thorsten
-
More information about the arch-commits
mailing list