Update to 2.0.2.7

3 files changed, 30 insertions, 12 deletions

diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile
index d04ad18fd6a2..048bcc1f1a2e 100644
--- a/editors/ooo-build/Makefile
+++ b/editors/ooo-build/Makefile
@@ -28,7 +28,7 @@ OOO_CRYSTAL_IMAGES=	ooo_crystal_images-1.tar.gz
 OOO_OPENCLIPART=	openclipart-0.18-full.tar.gz
 OOO_PATCHDIR=src680
 .else
-OOOBUILD_VERSION=2.0.2
+OOOBUILD_VERSION=2.0.2.7
 OOOBUILD_TAG=oob680-m5
 OOOBUILD=	ooo-build-${OOOBUILD_VERSION}
 OOOBUILD_SOURCE=${OOOBUILD}.tar.gz
diff --git a/editors/ooo-build/distinfo b/editors/ooo-build/distinfo
index f1f81f245a8b..fe35e23f48e5 100644
--- a/editors/ooo-build/distinfo
+++ b/editors/ooo-build/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/ooo-build-2.0.2.tar.gz) = a745d2aedde615ee98b591901161c228
-SHA256 (openoffice.org2.0/ooo-build-2.0.2.tar.gz) = deec58383939fed182d670a77e2ff09eb79e28e00f5c71728e319e364e011e1e
-SIZE (openoffice.org2.0/ooo-build-2.0.2.tar.gz) = 5097547
+MD5 (openoffice.org2.0/ooo-build-2.0.2.7.tar.gz) = 67b73c718a6712289aa30a4d56f006da
+SHA256 (openoffice.org2.0/ooo-build-2.0.2.7.tar.gz) = f1eecaab8085693156415db08058f0c3da9aef223e935c96f1b699aaebf11683
+SIZE (openoffice.org2.0/ooo-build-2.0.2.7.tar.gz) = 5234766
 MD5 (openoffice.org2.0/cairo-1.0.2.tar.gz) = d0b7111a14f90ec3afa777ec40c44984
 SHA256 (openoffice.org2.0/cairo-1.0.2.tar.gz) = d6fba4b522decbda4aed8c9ad7243f6e923740761d677567758aebb01cdd1f5e
 SIZE (openoffice.org2.0/cairo-1.0.2.tar.gz) = 1458903
diff --git a/editors/ooo-build/files/ooo-build-patch b/editors/ooo-build/files/ooo-build-patch
index e7e5e4b83487..01ea2a8ac4bd 100644
--- a/editors/ooo-build/files/ooo-build-patch
+++ b/editors/ooo-build/files/ooo-build-patch
@@ -20,9 +20,9 @@ gnu patch is gpatch for FreeBSD.
  	$base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd;
      }
 
---- patches/src680/apply.orig	Fri Mar 10 01:33:16 2006
-+++ patches/src680/apply	Fri Mar 17 08:49:29 2006
-@@ -70,6 +70,8 @@
+--- patches/src680/apply.orig	Fri Apr 14 03:52:06 2006
++++ patches/src680/apply	Fri Apr 21 07:11:03 2006
+@@ -71,6 +71,8 @@
  Gentoo64: GentooBase, 64bit
  # Win32
  Win32 : Win32Common, NovellOnly, NovellOnlyWin32, NovellSplash
@@ -31,7 +31,7 @@ gnu patch is gpatch for FreeBSD.
  # translate.org.za
  translate-org-za-linux: translate-org-za-common, translate-org-za-splash, LinuxCommon, Common, Lockdown
  translate-org-za-win32: translate-org-za-common, translate-org-za-splash, Win32Common, Common
-@@ -328,7 +330,7 @@
+@@ -356,7 +358,7 @@
  
  [ Shrink ]
  # strip 450k of .comment sections - i#57063
@@ -40,16 +40,25 @@ gnu patch is gpatch for FreeBSD.
  
  
  [ QuickStarter ]
-@@ -341,7 +343,7 @@
+@@ -376,7 +378,7 @@
  # Show more steps during startup
  speed-ooqstart-more-steps.diff
  # Make it X11+glib-only
 -speed-ooqstart-x11-only.diff
 +# speed-ooqstart-x11-only.diff
+ # Fix -display and other options, n#160296
+ speed-ooqstart-options.diff
  
+@@ -678,7 +680,7 @@
+ buildfix-qadevOOo-java-encoding.diff
  
- # make the office socket name more predictable for external re-use
-@@ -657,11 +659,11 @@
+ # fix error on jdk 1.5 from enum reserved word
+-java-1_5-enum-reserved-word.diff
++# java-1_5-enum-reserved-word.diff
+ 
+ # detect the right CFLAGS in configure rather than in makafile.mk
+ buildfix-system-moz-plugin.diff
+@@ -696,11 +698,11 @@
  buildfix-connectivity-kab-stdio.diff
  
  # do not pack any potential .orig files with ppds
@@ -63,7 +72,16 @@ gnu patch is gpatch for FreeBSD.
  
  [ MandrivaOnly ]
  mozilla-firefox.diff
-@@ -756,10 +758,10 @@
+@@ -734,7 +736,7 @@
+ 
+ [ GCJ ]
+ # Use jaxp api for helpcontent building utilities #58308 CWS jaxpapi
+-cws-jaxpapi.diff
++# cws-jaxpapi.diff
+ 
+ [ GCJExperimental ]
+ # Another fix for --without-java i#56619
+@@ -795,10 +797,10 @@
  parallel-sysui-makefiles.diff
  
  # Fix/workaround race condition with .REMOVE rule #16752