diff options
author | maho <maho@FreeBSD.org> | 2005-01-16 08:47:09 +0000 |
---|---|---|
committer | maho <maho@FreeBSD.org> | 2005-01-16 08:47:09 +0000 |
commit | 1ce462fb99681f1861cddee9609e30cd3ec0f692 (patch) | |
tree | 9a7e7305eafc5fe8a8d054c3e66f81f6bef6fea6 /editors | |
parent | 446b070b62dbfb8670d6d7113042f34b011aec7c (diff) | |
download | FreeBSD-ports-1ce462fb99681f1861cddee9609e30cd3ec0f692.zip FreeBSD-ports-1ce462fb99681f1861cddee9609e30cd3ec0f692.tar.gz |
Add a knob, enable Freetype bytecode support
Reported by: Mikhail Fedotov <mikhail@kittown.com>
Diffstat (limited to 'editors')
-rw-r--r-- | editors/openoffice-1.1/Makefile | 4 | ||||
-rw-r--r-- | editors/openoffice-1.1/files/Makefile.knobs | 11 | ||||
-rw-r--r-- | editors/openoffice-1.1/files/optpatch-freetype | 87 | ||||
-rw-r--r-- | editors/openoffice.org-1.1/Makefile | 4 | ||||
-rw-r--r-- | editors/openoffice.org-1.1/files/Makefile.knobs | 11 | ||||
-rw-r--r-- | editors/openoffice.org-1.1/files/optpatch-freetype | 87 |
6 files changed, 202 insertions, 2 deletions
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index 54460ef..40d7dc9 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -158,6 +158,9 @@ pre-everything:: .endif post-extract: +.if defined(WITH_TTF_BYTECODE_ENABLED) + @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype +.endif @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz - @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/ @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/ @@ -223,6 +226,7 @@ post-install: ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ ${PREFIX}/bin/${EXECBASE} + @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw diff --git a/editors/openoffice-1.1/files/Makefile.knobs b/editors/openoffice-1.1/files/Makefile.knobs index 09dce7f..efb76fa 100644 --- a/editors/openoffice-1.1/files/Makefile.knobs +++ b/editors/openoffice-1.1/files/Makefile.knobs @@ -50,6 +50,15 @@ pre-fetch: @${ECHO} "You can compile OOo without Mozilla connectivity by" @${ECHO} "make -DWITHOUT_MOZILLA" .endif +.if !defined(WITH_TTF_BYTECODE_ENABLED) + @${ECHO} + @${ECHO} "You may get better quality of glyphs" + @${ECHO} "at small bitmap sizes, If you have" + @${ECHO} "licensed the Apple patents" + @${ECHO} "US05155805 US05159668 and US05325479, by" + @${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED" + @${ECHO} "See http://www.freetype.org/patents.html for details" +.endif .if !defined(WITHOUT_JAVA) @${ECHO} @${ECHO} "You can compile OOo without Java support by" @@ -58,7 +67,7 @@ pre-fetch: @${ECHO} @${ECHO} "NOTICE:" @${ECHO} - @${ECHO} "To build Openoffice, you should have a lot" + @${ECHO} "To build OpenOffice.org, you should have a lot" .if defined(WITH_DEBUG) @${ECHO} "of free diskspace (~ 8GB)." .else diff --git a/editors/openoffice-1.1/files/optpatch-freetype b/editors/openoffice-1.1/files/optpatch-freetype new file mode 100644 index 0000000..fb96fb1 --- /dev/null +++ b/editors/openoffice-1.1/files/optpatch-freetype @@ -0,0 +1,87 @@ +Index: freetype/freetype-2.1.4.patch +=================================================================== +RCS file: /cvs/external/freetype/freetype-2.1.4.patch,v +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 16 Jan 2005 08:29:56 -0000 +@@ -1,5 +1,5 @@ +-*** misc/freetype-2.1.4/builds/compiler/visualc.mk Thu Dec 14 00:44:33 2000 +---- misc/build/freetype-2.1.4/builds/compiler/visualc.mk Wed Apr 9 16:45:16 2003 ++*** misc/freetype-2.1.4/builds/compiler/visualc.mk Thu Dec 14 08:44:33 2000 ++--- misc/build/freetype-2.1.4/builds/compiler/visualc.mk Sun Jan 16 17:01:31 2005 + *************** + *** 63,69 **** + # ANSI compliance. +@@ -17,8 +17,8 @@ + endif + + # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. +-*** misc/freetype-2.1.4/builds/unix/ltmain.sh Sat Jan 18 17:39:18 2003 +---- misc/build/freetype-2.1.4/builds/unix/ltmain.sh Wed Apr 9 16:45:16 2003 ++*** misc/freetype-2.1.4/builds/unix/ltmain.sh Sun Jan 19 01:39:18 2003 ++--- misc/build/freetype-2.1.4/builds/unix/ltmain.sh Sun Jan 16 17:01:31 2005 + *************** + *** 2296,2302 **** + ;; +@@ -36,8 +36,8 @@ + + case $version_type in + nonstopux) verstring_prefix=nonstopux ;; +-*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp Fri Jan 31 00:24:18 2003 +---- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp Wed Apr 9 16:45:16 2003 ++*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp Fri Jan 31 08:24:18 2003 ++--- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp Sun Jan 16 17:01:32 2005 + *************** + *** 44,51 **** + # PROP Output_Dir "..\..\..\objs\release" +@@ -57,8 +57,8 @@ + # SUBTRACT CPP /nologo /YX + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" +-*** misc/freetype-2.1.4/include/freetype/config/ftmodule.h Thu Oct 31 09:29:31 2002 +---- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h Wed Apr 9 16:45:16 2003 ++*** misc/freetype-2.1.4/include/freetype/config/ftmodule.h Thu Oct 31 17:29:31 2002 ++--- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h Sun Jan 16 17:01:32 2005 + *************** + *** 1,8 **** + FT_USE_MODULE(autohint_module_class) +@@ -92,8 +92,8 @@ + FT_USE_MODULE(winfnt_driver_class) + + #endif + +-*** misc/freetype-2.1.4/include/freetype/config/ftoption.h Fri Jan 31 00:24:18 2003 +---- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h Wed Apr 9 16:45:16 2003 ++*** misc/freetype-2.1.4/include/freetype/config/ftoption.h Fri Jan 31 08:24:18 2003 ++--- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h Sun Jan 16 17:04:45 2005 + *************** + *** 108,114 **** + /* this will however force you to link the zlib to any program that */ +@@ -111,8 +111,25 @@ + + + /*************************************************************************/ +-*** misc/freetype-2.1.4/src/base/ftobjs.c Thu Mar 27 22:35:43 2003 +---- misc/build/freetype-2.1.4/src/base/ftobjs.c Sun Apr 13 17:57:51 2003 ++*************** ++*** 378,384 **** ++ /* do not #undef this macro here, since the build system might */ ++ /* define for certain configurations */ ++ /* */ ++! /* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ ++ ++ ++ /*************************************************************************/ ++--- 378,384 ---- ++ /* do not #undef this macro here, since the build system might */ ++ /* define for certain configurations */ ++ /* */ ++! #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER ++ ++ ++ /*************************************************************************/ ++*** misc/freetype-2.1.4/src/base/ftobjs.c Fri Mar 28 06:35:43 2003 ++--- misc/build/freetype-2.1.4/src/base/ftobjs.c Sun Jan 16 17:01:32 2005 + *************** + *** 804,810 **** + { diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index 54460ef..40d7dc9 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -158,6 +158,9 @@ pre-everything:: .endif post-extract: +.if defined(WITH_TTF_BYTECODE_ENABLED) + @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype +.endif @cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz - @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/ @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/ @@ -223,6 +226,7 @@ post-install: ${WRKDIR}/openoffice-wrapper @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \ ${PREFIX}/bin/${EXECBASE} + @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/openoffice.org @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw diff --git a/editors/openoffice.org-1.1/files/Makefile.knobs b/editors/openoffice.org-1.1/files/Makefile.knobs index 09dce7f..efb76fa 100644 --- a/editors/openoffice.org-1.1/files/Makefile.knobs +++ b/editors/openoffice.org-1.1/files/Makefile.knobs @@ -50,6 +50,15 @@ pre-fetch: @${ECHO} "You can compile OOo without Mozilla connectivity by" @${ECHO} "make -DWITHOUT_MOZILLA" .endif +.if !defined(WITH_TTF_BYTECODE_ENABLED) + @${ECHO} + @${ECHO} "You may get better quality of glyphs" + @${ECHO} "at small bitmap sizes, If you have" + @${ECHO} "licensed the Apple patents" + @${ECHO} "US05155805 US05159668 and US05325479, by" + @${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED" + @${ECHO} "See http://www.freetype.org/patents.html for details" +.endif .if !defined(WITHOUT_JAVA) @${ECHO} @${ECHO} "You can compile OOo without Java support by" @@ -58,7 +67,7 @@ pre-fetch: @${ECHO} @${ECHO} "NOTICE:" @${ECHO} - @${ECHO} "To build Openoffice, you should have a lot" + @${ECHO} "To build OpenOffice.org, you should have a lot" .if defined(WITH_DEBUG) @${ECHO} "of free diskspace (~ 8GB)." .else diff --git a/editors/openoffice.org-1.1/files/optpatch-freetype b/editors/openoffice.org-1.1/files/optpatch-freetype new file mode 100644 index 0000000..fb96fb1 --- /dev/null +++ b/editors/openoffice.org-1.1/files/optpatch-freetype @@ -0,0 +1,87 @@ +Index: freetype/freetype-2.1.4.patch +=================================================================== +RCS file: /cvs/external/freetype/freetype-2.1.4.patch,v +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 16 Jan 2005 08:29:56 -0000 +@@ -1,5 +1,5 @@ +-*** misc/freetype-2.1.4/builds/compiler/visualc.mk Thu Dec 14 00:44:33 2000 +---- misc/build/freetype-2.1.4/builds/compiler/visualc.mk Wed Apr 9 16:45:16 2003 ++*** misc/freetype-2.1.4/builds/compiler/visualc.mk Thu Dec 14 08:44:33 2000 ++--- misc/build/freetype-2.1.4/builds/compiler/visualc.mk Sun Jan 16 17:01:31 2005 + *************** + *** 63,69 **** + # ANSI compliance. +@@ -17,8 +17,8 @@ + endif + + # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. +-*** misc/freetype-2.1.4/builds/unix/ltmain.sh Sat Jan 18 17:39:18 2003 +---- misc/build/freetype-2.1.4/builds/unix/ltmain.sh Wed Apr 9 16:45:16 2003 ++*** misc/freetype-2.1.4/builds/unix/ltmain.sh Sun Jan 19 01:39:18 2003 ++--- misc/build/freetype-2.1.4/builds/unix/ltmain.sh Sun Jan 16 17:01:31 2005 + *************** + *** 2296,2302 **** + ;; +@@ -36,8 +36,8 @@ + + case $version_type in + nonstopux) verstring_prefix=nonstopux ;; +-*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp Fri Jan 31 00:24:18 2003 +---- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp Wed Apr 9 16:45:16 2003 ++*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp Fri Jan 31 08:24:18 2003 ++--- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp Sun Jan 16 17:01:32 2005 + *************** + *** 44,51 **** + # PROP Output_Dir "..\..\..\objs\release" +@@ -57,8 +57,8 @@ + # SUBTRACT CPP /nologo /YX + # ADD BASE RSC /l 0x409 /d "NDEBUG" + # ADD RSC /l 0x409 /d "NDEBUG" +-*** misc/freetype-2.1.4/include/freetype/config/ftmodule.h Thu Oct 31 09:29:31 2002 +---- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h Wed Apr 9 16:45:16 2003 ++*** misc/freetype-2.1.4/include/freetype/config/ftmodule.h Thu Oct 31 17:29:31 2002 ++--- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h Sun Jan 16 17:01:32 2005 + *************** + *** 1,8 **** + FT_USE_MODULE(autohint_module_class) +@@ -92,8 +92,8 @@ + FT_USE_MODULE(winfnt_driver_class) + + #endif + +-*** misc/freetype-2.1.4/include/freetype/config/ftoption.h Fri Jan 31 00:24:18 2003 +---- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h Wed Apr 9 16:45:16 2003 ++*** misc/freetype-2.1.4/include/freetype/config/ftoption.h Fri Jan 31 08:24:18 2003 ++--- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h Sun Jan 16 17:04:45 2005 + *************** + *** 108,114 **** + /* this will however force you to link the zlib to any program that */ +@@ -111,8 +111,25 @@ + + + /*************************************************************************/ +-*** misc/freetype-2.1.4/src/base/ftobjs.c Thu Mar 27 22:35:43 2003 +---- misc/build/freetype-2.1.4/src/base/ftobjs.c Sun Apr 13 17:57:51 2003 ++*************** ++*** 378,384 **** ++ /* do not #undef this macro here, since the build system might */ ++ /* define for certain configurations */ ++ /* */ ++! /* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ ++ ++ ++ /*************************************************************************/ ++--- 378,384 ---- ++ /* do not #undef this macro here, since the build system might */ ++ /* define for certain configurations */ ++ /* */ ++! #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER ++ ++ ++ /*************************************************************************/ ++*** misc/freetype-2.1.4/src/base/ftobjs.c Fri Mar 28 06:35:43 2003 ++--- misc/build/freetype-2.1.4/src/base/ftobjs.c Sun Jan 16 17:01:32 2005 + *************** + *** 804,810 **** + { |