summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-1.1
diff options
context:
space:
mode:
authorAlexander Kabaev <kan@FreeBSD.org>2007-08-23 12:46:35 +0000
committerAlexander Kabaev <kan@FreeBSD.org>2007-08-23 12:46:35 +0000
commit8e8ea068b094bf4ba39a761866b8fae2f479bfb7 (patch)
tree863d2f7426fa96a57371b9952bcd1c61428010d8 /editors/openoffice.org-1.1
parentAdd a link to the main article to saved articles (diff)
Regenerate patch-objformat with 5 lines of context. If target file was
already patched by optpatch-freetype and patch program needs to locate shifted position for the hunk, default three lines of context are not enough to properly locate the right place. This unbreaks builds with optional WITH_TTF_BYTECODE_ENABLED feature enabled.
Notes
Notes: svn path=/head/; revision=198197
Diffstat (limited to 'editors/openoffice.org-1.1')
-rw-r--r--editors/openoffice.org-1.1/files/patch-objformat5
1 files changed, 3 insertions, 2 deletions
diff --git a/editors/openoffice.org-1.1/files/patch-objformat b/editors/openoffice.org-1.1/files/patch-objformat
index 53587fc236d8..b36e94bf85e2 100644
--- a/editors/openoffice.org-1.1/files/patch-objformat
+++ b/editors/openoffice.org-1.1/files/patch-objformat
@@ -125,7 +125,9 @@ retrieving revision 1.2
diff -u -r1.2 freetype-2.1.4.patch
--- freetype/freetype-2.1.4.patch 17 Apr 2003 15:11:01 -0000 1.2
+++ freetype/freetype-2.1.4.patch 3 May 2007 01:15:56 -0000
-@@ -131,3 +131,22 @@
+@@ -147,5 +147,24 @@
+ ! if( !unicmap ) /* HDU: #107980# Saraswati workaround */
+ ! unicmap = cur; /* record we found a Unicode charmap */
/* XXX If some new encodings to represent UCS-4 are added, */
/* they should be added here. */
@@ -148,7 +150,6 @@ diff -u -r1.2 freetype-2.1.4.patch
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
-
Index: sndfile/libsndfile-1.0.9.patch
===================================================================
RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v