1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
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 Thu Dec 22 18:47:08 2005
+++ patches/src680/apply Wed Jan 11 19:30:14 2006
@@ -64,6 +64,8 @@
Gentoo64: GentooBase, 64bit
# Win32
Win32 : Win32Common, NovellOnly, NovellOnlyWin32
+# FreeBSD
+FreeBSD : LinuxCommon, NotDebian
# -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
@@ -306,9 +308,9 @@
[ Shrink ]
# strip 450k of .comment sections - i#57063
-size-strip.diff
+# size-strip.diff
# save 1.7Mb of (shared) memory for non-asian locales
-cws-i18nshrink.diff
+# cws-i18nshrink.diff
[ QuickStarter ]
@@ -557,7 +559,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
@@ -665,7 +667,7 @@
# declared, i#58972, CWS gcc41
buildfix-gcc41-friend-decl-configmgr.diff
buildfix-gcc41-friend-decl-desktop.diff
-buildfix-gcc41-friend-decl-i18npool.diff
+# buildfix-gcc41-friend-decl-i18npool.diff
buildfix-gcc41-friend-decl-svx.diff
buildfix-gcc41-friend-decl-sw.diff
# fixes usage of the String classes; I wonder how it could work in the past :-)
|
