diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-08-25 16:13:14 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-08-25 16:13:14 +0200 |
| commit | 0636f639785eda8b058488f8b0ef20ac51027dbf (patch) | |
| tree | 8b4e80267e7427d200417ca1592c1732097fa817 | |
| parent | 4ac99fac74b99c792110fb0bcbe2a641f48b28a3 (diff) | |
| parent | 9f4039fcab2ff318c0423dc062b974011ceb8008 (diff) | |
DEV300: changesets OOO330 up to m5
| -rwxr-xr-x | graphite/graphite-2.3.1.patch.mingw | 9 | ||||
| -rw-r--r-- | more_fonts/fonts/ttf_liberation/makefile.mk | 4 | ||||
| -rw-r--r-- | more_fonts/prj/d.lst | 5 |
3 files changed, 5 insertions, 13 deletions
diff --git a/graphite/graphite-2.3.1.patch.mingw b/graphite/graphite-2.3.1.patch.mingw index ecec00da7c6e..c5fc3ecdf252 100755 --- a/graphite/graphite-2.3.1.patch.mingw +++ b/graphite/graphite-2.3.1.patch.mingw @@ -116,15 +116,6 @@ #include <assert.h> --- misc/silgraphite-2.3.1/wrappers/win32/WinFont.cpp 2009-01-29 17:33:19.000000000 +0900 +++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.cpp 2009-08-23 20:59:16.211375000 +0900 -@@ -408,7 +408,7 @@ - if (pPolyCurve->wType == TT_PRIM_QSPLINE && - // test if this is the last curve - pPolyHdr->cb - (int)((byte *)(&pPolyCurve->apfx[j]) - (byte *)(pPolyHdr)) -- == sizeof POINTFX && -+ == sizeof(POINTFX) && - // and the two points are identical - CompareFixed(pPolyCurve->apfx[j].x, pPolyHdr->pfxStart.x) && - CompareFixed(pPolyCurve->apfx[j].y, pPolyHdr->pfxStart.y)) @@ -846,7 +846,7 @@ } // namespace gr diff --git a/more_fonts/fonts/ttf_liberation/makefile.mk b/more_fonts/fonts/ttf_liberation/makefile.mk index de711a644690..a49c568e2770 100644 --- a/more_fonts/fonts/ttf_liberation/makefile.mk +++ b/more_fonts/fonts/ttf_liberation/makefile.mk @@ -36,8 +36,8 @@ TARGET=ttf_liberation # --- Files -------------------------------------------------------- -TARFILE_NAME=liberation-fonts-ttf-1.05.3.20100427 -TARFILE_MD5=ef9ab6c1740682fbd730606d5f6922e6 +TARFILE_NAME=liberation-fonts-ttf-1.06.0.20100721 +TARFILE_MD5=ca4870d899fd7e943ffc310a5421ad4d TARFILE_ROOTDIR=. PATCH_FILES= diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst index 0bc15242b086..261aae0b2d28 100644 --- a/more_fonts/prj/d.lst +++ b/more_fonts/prj/d.lst @@ -1,9 +1,10 @@ mkdir: %COMMON_DEST%\pck%_EXT% ..\fonts\fc_local.conf %COMMON_DEST%\pck%_EXT%\fc_local.conf +# TODO: replace explicit versions by wildcard when the build system learns to handle them ..\%__SRC%\misc\build\dejavu-fonts-ttf-2.30\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf ..\%__SRC%\misc\build\dejavu-fonts-ttf-2.30\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu -..\%__SRC%\misc\build\Liberation*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf -..\%__SRC%\misc\build\License.txt %COMMON_DEST%\pck%_EXT%\LICENSE_liberation +..\%__SRC%\misc\build\liberation-fonts-ttf-1.06.0.20100721/Liberation*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf +..\%__SRC%\misc\build\liberation-fonts-ttf-1.06.0.20100721/License.txt %COMMON_DEST%\pck%_EXT%\LICENSE_liberation ..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf ..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_gentium |