[arch-commits] Commit in openoffice-base-beta/trunk (3 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Sat Jul 31 17:19:29 EDT 2010


    Date: Saturday, July 31, 2010 @ 17:19:28
  Author: andyrtr
Revision: 86392

upgpkg: openoffice-base-beta 3.3.0_ooo330_m2-1
new version ooo330_m2

Modified:
  openoffice-base-beta/trunk/ChangeLog
  openoffice-base-beta/trunk/PKGBUILD
Deleted:
  openoffice-base-beta/trunk/dictionaries-needs-th-gen-idx.pl.diff

---------------------------------------+
 ChangeLog                             |    4 ++-
 PKGBUILD                              |    6 ++---
 dictionaries-needs-th-gen-idx.pl.diff |   36 --------------------------------
 3 files changed, 6 insertions(+), 40 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-07-31 12:19:40 UTC (rev 86391)
+++ ChangeLog	2010-07-31 21:19:28 UTC (rev 86392)
@@ -1,7 +1,9 @@
-2010-07-27 Andreas Radke <andyrtr at archlinux.org>
+2010-07-31 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.3.0-OOO330_m2-1 :
 	- new snapshot
+	- drop patch for system libmythes
+	- add patch for http://www.openoffice.org/issues/show_bug.cgi?id=113563
 	
 2010-07-17 Andreas Radke <andyrtr at archlinux.org>
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-31 12:19:40 UTC (rev 86391)
+++ PKGBUILD	2010-07-31 21:19:28 UTC (rev 86392)
@@ -31,8 +31,8 @@
 	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
 	openoffice-beta.profile)
 options=('!distcc' '!ccache' '!makeflags')
 
@@ -69,8 +69,8 @@
 	# gcc4.5 fix
 	patch -Np0 -i ${srcdir}/cppu-lbnames-enable-gcc-4.5.diff
 	patch -Np0 -i ${srcdir}/sal-cpprt-gcc-4.5-workaround.diff
-	# 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=113563
+	patch -Np1 -i ${srcdir}/fixup.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. 

Deleted: dictionaries-needs-th-gen-idx.pl.diff
===================================================================
--- dictionaries-needs-th-gen-idx.pl.diff	2010-07-31 12:19:40 UTC (rev 86391)
+++ dictionaries-needs-th-gen-idx.pl.diff	2010-07-31 21:19:28 UTC (rev 86392)
@@ -1,36 +0,0 @@
-diff --git a/dictionaries/prj/build.lst b/dictionaries/prj/build.lst
---- a/dictionaries/prj/build.lst
-+++ b/dictionaries/prj/build.lst
-@@ -1,4 +1,4 @@
--di      dictionaries : soltools MYTHES:mythes NULL
-+di      dictionaries : soltools mythes NULL
- di	dictionaries					usr1 - all di_mkout NULL
- di      dictionaries\af_ZA      nmake   -       all     di_af_ZA NULL
- di      dictionaries\ca         nmake   -       all     di_ca NULL
-diff --git a/mythes/makefile.mk b/mythes/makefile.mk
---- a/mythes/makefile.mk
-+++ b/mythes/makefile.mk
-@@ -47,6 +47,8 @@
- .IF "$(GUI)"=="UNX"
- CONFIGURE_DIR=$(BUILD_DIR)
- 
-+.IF "$(SYSTEM_MYTHES)" != "YES"
-+
- .IF "$(SYSTEM_HUNSPELL)" != "YES"
- HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell
- HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.2
-@@ -74,14 +76,9 @@
- CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
- .ENDIF
- 
--.IF "$(SYSTEM_MYTHES)" == "YES"
-- at all:
--	echo "Nothing to do here."
--.ELSE
- BUILD_ACTION=make
- OUT2INC += mythes.hxx
- .ENDIF
--
- .ENDIF # "$(GUI)"=="UNX"
- 
- 



More information about the arch-commits mailing list