1 files changed, 60 insertions, 0 deletions

diff --git a/editors/ooo-build/files/ooo-build-patch-devel b/editors/ooo-build/files/ooo-build-patch-devel
new file mode 100644
index 000000000000..fa28f6b6238d
--- /dev/null
+++ b/editors/ooo-build/files/ooo-build-patch-devel
@@ -0,0 +1,60 @@
+gnu patch is gpatch for FreeBSD.
+--- patches/apply.pl	Tue Nov  1 00:07:02 2005
++++ patches/apply.pl	Tue Nov  1 00:07:32 2005
+@@ -473,7 +473,7 @@
+     my $ver_line;
+     my $is_old = 1;
+ 
+-    open ($Patch, "patch --version|") || die "Can't run patch: $!";
++    open ($Patch, "gpatch --version|") || die "Can't run patch: $!";
+     $ver_line = <$Patch>;
+     $ver_line =~ m/\s+(\d+)\.(\d+)\.(\d+)/ || die "Can't get patch version\n";
+     if ($1 >= 2 && $2 >= 5 && $3 >= 9) {
+@@ -597,7 +597,7 @@
+     $applied_patches = $dest_dir.'/applied_patches';
+ 
+     $opts = join ' ', @arguments;
+-    $base_cmd = "patch -l -p0 $opts -d $dest_dir";
++    $base_cmd = "gpatch -l -p0 $opts -d $dest_dir";
+     if (is_old_patch_version()) {
+ 	$base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd;
+     }
+
+--- patches/src680/apply.orig	Wed Nov 30 18:02:19 2005
++++ patches/src680/apply	Sat Dec  3 20:05:50 2005
+@@ -64,6 +64,8 @@
+ Gentoo64: GentooBase, 64bit
+ # Win32
+ Win32 : Win32Common, NovellOnly, NovellOnlyWin32
++# FreeBSD
++FreeBSD : LinuxCommon, NotDebian
+ 
+ # -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
+ 
+@@ -80,7 +82,7 @@
+ 
+ [ TemporaryHacks == src680-m140 ]
+ # silly snafu.
+-buildfix-svtools-m140.diff
++# buildfix-svtools-m140.diff # not compatible with my checkout(master fixed)
+ 
+ [ TemporaryHacks ]
+ # adding glib-2.0 and ORBit-2.0 to pkgconfig modules; i#47923
+@@ -338,7 +340,7 @@
+ 
+ [ Shrink ]
+ # strip 450k of .comment sections - i#57063
+-size-strip.diff
++# size-strip.diff #break the build of FBSD see my comment on #i57063#
+ # save 1.7Mb of (shared) memory for non-asian locales
+ cws-i18nshrink.diff
+ 
+@@ -587,7 +589,7 @@
+ # Fix missing __cxa_guard_acquire/__cxa_guard_release - #34676 (for FC3)
+ sal-cxa-guard.diff
+ # do not pack any potential .orig files with ppds
+-psprint_config-no-orig.diff
++#psprint_config-no-orig.diff #don't apply for FBSD patch (workaround)
+ # Fix ODK Java bits
+ odk-java-wizpanel.diff
+ # add possibility to set ARCH_FLAGS when building libnas