aboutsummaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authormaho <maho@FreeBSD.org>2006-01-11 18:32:02 +0800
committermaho <maho@FreeBSD.org>2006-01-11 18:32:02 +0800
commit5d48d4af4e9315ebaaa508a4cbd4279b3fe7dfc1 (patch)
tree6f19118305809a8ad5ab0d881ca1ba8d3e2aabac /editors
parente2e443ececd1f986dcb0c93dd4283186d2303b22 (diff)
downloadfreebsd-ports-gnome-5d48d4af4e9315ebaaa508a4cbd4279b3fe7dfc1.tar.gz
freebsd-ports-gnome-5d48d4af4e9315ebaaa508a4cbd4279b3fe7dfc1.tar.zst
freebsd-ports-gnome-5d48d4af4e9315ebaaa508a4cbd4279b3fe7dfc1.zip
do not apply i18n patch since it breaks CJK environment
Diffstat (limited to 'editors')
-rw-r--r--editors/ooo-build/files/ooo-build-patch18
-rw-r--r--editors/ooo-build/files/ooo-build-patch-devel9
2 files changed, 21 insertions, 6 deletions
diff --git a/editors/ooo-build/files/ooo-build-patch b/editors/ooo-build/files/ooo-build-patch
index 6c1632f2beb0..efa0372153a0 100644
--- a/editors/ooo-build/files/ooo-build-patch
+++ b/editors/ooo-build/files/ooo-build-patch
@@ -21,7 +21,7 @@ gnu patch is gpatch for FreeBSD.
}
--- patches/src680/apply.orig Thu Dec 22 18:47:08 2005
-+++ patches/src680/apply Sat Dec 24 01:46:07 2005
++++ patches/src680/apply Wed Jan 11 19:30:14 2006
@@ -64,6 +64,8 @@
Gentoo64: GentooBase, 64bit
# Win32
@@ -31,15 +31,18 @@ gnu patch is gpatch for FreeBSD.
# -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
-@@ -306,7 +308,7 @@
+@@ -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
++# cws-i18nshrink.diff
+
+ [ QuickStarter ]
@@ -557,7 +559,7 @@
# Fix missing __cxa_guard_acquire/__cxa_guard_release - #34676 (for FC3)
sal-cxa-guard.diff
@@ -49,3 +52,12 @@ gnu patch is gpatch for FreeBSD.
# 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 :-)
diff --git a/editors/ooo-build/files/ooo-build-patch-devel b/editors/ooo-build/files/ooo-build-patch-devel
index fa28f6b6238d..a907276270cb 100644
--- a/editors/ooo-build/files/ooo-build-patch-devel
+++ b/editors/ooo-build/files/ooo-build-patch-devel
@@ -40,15 +40,18 @@ gnu patch is gpatch for FreeBSD.
[ TemporaryHacks ]
# adding glib-2.0 and ORBit-2.0 to pkgconfig modules; i#47923
-@@ -338,7 +340,7 @@
+@@ -306,9 +308,9 @@
[ Shrink ]
# strip 450k of .comment sections - i#57063
-size-strip.diff
-+# size-strip.diff #break the build of FBSD see my comment on #i57063#
++# size-strip.diff
# save 1.7Mb of (shared) memory for non-asian locales
- cws-i18nshrink.diff
+-cws-i18nshrink.diff
++# cws-i18nshrink.diff
+
+ [ QuickStarter ]
@@ -587,7 +589,7 @@
# Fix missing __cxa_guard_acquire/__cxa_guard_release - #34676 (for FC3)
sal-cxa-guard.diff