misc/90636: [PATCH] print/freetype2: failed to apply CJK patches

[lwj]

>Number:         90636
>Category:       misc
>Synopsis:       [PATCH] print/freetype2: failed to apply CJK patches
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 19 07:30:07 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     lwj
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
foxsemicon integrated tech. Inc.
>Environment:
FreeBSD freebsd.my.home 6.0-STABLE FreeBSD 6.0-STABLE #2: Sun Dec 11 13:32:08 CST 2005     root at freebsd.my.home:/usr/obj/usr/src/sys/KERNEL  i386
>Description:
The WITH_CJK knob causes failed patching for freetype2.

>How-To-Repeat:
# cd /usr/ports/print/freetype2
# make -DWITH_CJK

You may want not to compile a bytecode interpreter into the
TrueType driver. Without this you will only compile the code
necessary to load TrueType glyphs without hinting.

Hit Ctrl-C now and use "make WITHOUT_TTF_BYTECODE_ENABLED=yes"

Note that there are important patent issues related to the
use of the interpreter.

===>  Vulnerability check disabled, database not found
===>  Extracting for freetype2-2.1.10_2
=> MD5 Checksum OK for freetype-2.1.10.tar.bz2.
=> SHA256 Checksum OK for freetype-2.1.10.tar.bz2.
=> MD5 Checksum OK for cjk-freetype-2.1.10-20050728.patch.gz.
=> SHA256 Checksum OK for cjk-freetype-2.1.10-20050728.patch.gz.
===>  Patching for freetype2-2.1.10_2
===>  Applying distribution patches for freetype2-2.1.10_2
===>  Applying FreeBSD patches for freetype2-2.1.10_2
1 out of 1 hunks failed--saving rejects to src/base/ftsynth.c.rej
=> Patch patch-src::base::ftsynth.c failed to apply cleanly.
=> Patch(es) patch-aa patch-builds::unix::configure patch-builds::unix::freetype-config.in patch-builds::unix::freetype2.in applied cleanly.
*** Error code 1

Stop in /usr/ports/print/freetype2.

>Fix:
--- freetype2.diff begins here ---

diff -ruN freetype2.orig/Makefile freetype2/Makefile
--- freetype2.orig/Makefile     Mon Dec 19 14:56:46 2005
+++ freetype2/Makefile  Mon Dec 19 15:17:14 2005
@@ -37,10 +37,8 @@
 .endif

 .if defined(WITH_CJK)
-PATCH_SITES+=  http://bsdchat.com/dist/firefly-cjk-patchset/ \
-               http://bbs.ilc.edu.tw/~chinsan/ \
-               ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/
-PATCHFILES+=   cjk-freetype-2.1.10-20050728.patch.gz
+PATCH_SITES+=  http://lwj-hinet.myweb.hinet.net/
+PATCHFILES+=   cjk-freetype-2.1.10-20051219.patch.gz
 PATCH_DIST_STRIP+=     -p1
 .endif

diff -ruN freetype2.orig/distinfo freetype2/distinfo
--- freetype2.orig/distinfo     Mon Dec 19 14:56:46 2005
+++ freetype2/distinfo  Mon Dec 19 15:01:22 2005
@@ -1,6 +1,6 @@
 MD5 (freetype-2.1.10.tar.bz2) = a4012e7d1f6400df44a16743b11b8423
 SHA256 (freetype-2.1.10.tar.bz2) = fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53
 SIZE (freetype-2.1.10.tar.bz2) = 1037107
-MD5 (cjk-freetype-2.1.10-20050728.patch.gz) = 7584b9c3de3e1e032897a48f00e2c0f4
-SHA256 (cjk-freetype-2.1.10-20050728.patch.gz) = 5f7fe3c93fc604175c84226883306b7b848e549d799b2d03ce9cc9ac53e3efa0
-SIZE (cjk-freetype-2.1.10-20050728.patch.gz) = 1200
+MD5 (cjk-freetype-2.1.10-20051219.patch.gz) = dc8f11908c22f5c617c0fff73bd07a52
+SHA256 (cjk-freetype-2.1.10-20051219.patch.gz) = 7bc8d79d4a68dbb4fbc640f6befe3b0868ff0de8295522a316a6dc21ab07a9b0
+SIZE (cjk-freetype-2.1.10-20051219.patch.gz) = 1081

>Release-Note:
>Audit-Trail:
>Unformatted: