diff options
Diffstat (limited to 'editors/ooo-build/files/ooo-build-patch')
| -rw-r--r-- | editors/ooo-build/files/ooo-build-patch | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/editors/ooo-build/files/ooo-build-patch b/editors/ooo-build/files/ooo-build-patch index 01ea2a8ac4bd..b6a72902221e 100644 --- a/editors/ooo-build/files/ooo-build-patch +++ b/editors/ooo-build/files/ooo-build-patch @@ -20,8 +20,8 @@ gnu patch is gpatch for FreeBSD. $base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd; } ---- patches/src680/apply.orig Fri Apr 14 03:52:06 2006 -+++ patches/src680/apply Fri Apr 21 07:11:03 2006 +--- patches/src680/apply.orig Thu May 4 21:48:36 2006 ++++ patches/src680/apply Sun May 14 09:40:19 2006 @@ -71,6 +71,8 @@ Gentoo64: GentooBase, 64bit # Win32 @@ -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 -@@ -356,7 +358,7 @@ +@@ -367,7 +369,7 @@ [ Shrink ] # strip 450k of .comment sections - i#57063 @@ -40,7 +40,7 @@ gnu patch is gpatch for FreeBSD. [ QuickStarter ] -@@ -376,7 +378,7 @@ +@@ -389,7 +391,7 @@ # Show more steps during startup speed-ooqstart-more-steps.diff # Make it X11+glib-only @@ -49,7 +49,7 @@ gnu patch is gpatch for FreeBSD. # Fix -display and other options, n#160296 speed-ooqstart-options.diff -@@ -678,7 +680,7 @@ +@@ -696,7 +698,7 @@ buildfix-qadevOOo-java-encoding.diff # fix error on jdk 1.5 from enum reserved word @@ -58,13 +58,17 @@ gnu patch is gpatch for FreeBSD. # detect the right CFLAGS in configure rather than in makafile.mk buildfix-system-moz-plugin.diff -@@ -696,11 +698,11 @@ +@@ -714,7 +716,7 @@ buildfix-connectivity-kab-stdio.diff # do not pack any potential .orig files with ppds -psprint_config-no-orig.diff +# psprint_config-no-orig.diff + # changes the SDK gid module name to gid_Module_Root_SDK, so the generated list + # of files does not conflict with the main package, i#64802 +@@ -724,7 +726,7 @@ + [ BuildBits == oob680-m5 != OOO_2_0_2 ] # install ppd and afm again by default, added as master fix to oob680-m5, i#62068 -buildfix-ppd-afm-check-62068.diff @@ -72,7 +76,7 @@ gnu patch is gpatch for FreeBSD. [ MandrivaOnly ] mozilla-firefox.diff -@@ -734,7 +736,7 @@ +@@ -758,7 +760,7 @@ [ GCJ ] # Use jaxp api for helpcontent building utilities #58308 CWS jaxpapi @@ -81,7 +85,7 @@ gnu patch is gpatch for FreeBSD. [ GCJExperimental ] # Another fix for --without-java i#56619 -@@ -795,10 +797,10 @@ +@@ -819,10 +821,10 @@ parallel-sysui-makefiles.diff # Fix/workaround race condition with .REMOVE rule #16752 |