diff options
| author | maho <maho@FreeBSD.org> | 2008-07-20 16:49:35 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2008-07-20 16:49:35 +0800 |
| commit | 5f19767a939bdb30a9d0a807e7e27fe8b91027b8 (patch) | |
| tree | 5c94dc8d6e52426a9ac828db75d5b0dd0b87a19c /editors | |
| parent | 4604e27714a55c2c4dd50e9ef04ab578cae08471 (diff) | |
| download | freebsd-ports-gnome-5f19767a939bdb30a9d0a807e7e27fe8b91027b8.tar.gz freebsd-ports-gnome-5f19767a939bdb30a9d0a807e7e27fe8b91027b8.tar.zst freebsd-ports-gnome-5f19767a939bdb30a9d0a807e7e27fe8b91027b8.zip | |
Fix build with SYSTEM_FREETYPE when devel/icu is
installed.
PR: 121787
Submitted by: jkim
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/openoffice.org-2-RC/files/patch-i91861 | 26 | ||||
| -rw-r--r-- | editors/openoffice.org-2/files/patch-i91861 | 26 |
2 files changed, 52 insertions, 0 deletions
diff --git a/editors/openoffice.org-2-RC/files/patch-i91861 b/editors/openoffice.org-2-RC/files/patch-i91861 new file mode 100644 index 000000000000..06602529f013 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-i91861 @@ -0,0 +1,26 @@ +? vcl/unxfbsdi.pro +Index: vcl/source/glyphs/makefile.mk +=================================================================== +RCS file: /cvs/gsl/vcl/source/glyphs/makefile.mk,v +retrieving revision 1.13 +diff -u -r1.13 makefile.mk +--- vcl/source/glyphs/makefile.mk 11 Apr 2008 08:59:18 -0000 1.13 ++++ vcl/source/glyphs/makefile.mk 20 Jul 2008 03:14:41 -0000 +@@ -42,9 +42,17 @@ + .INCLUDE : $(PRJ)$/util$/makefile2.pmk + + .IF "$(SYSTEM_FREETYPE)" == "YES" ++.IF "$(OS)" != "FREEBSD" + CFLAGS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS) ++.ELSE ++ADDCDEFS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS) ++.ENDIF + .IF "$(USE_FT_EMBOLDEN)" == "YES" ++.IF "$(OS)" != "FREEBSD" + CFLAGS+=-DUSE_FT_EMBOLDEN ++.ELSE ++ADDCDEFS+=-DUSE_FT_EMBOLDEN ++.ENDIF + .ENDIF + .ENDIF + diff --git a/editors/openoffice.org-2/files/patch-i91861 b/editors/openoffice.org-2/files/patch-i91861 new file mode 100644 index 000000000000..06602529f013 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-i91861 @@ -0,0 +1,26 @@ +? vcl/unxfbsdi.pro +Index: vcl/source/glyphs/makefile.mk +=================================================================== +RCS file: /cvs/gsl/vcl/source/glyphs/makefile.mk,v +retrieving revision 1.13 +diff -u -r1.13 makefile.mk +--- vcl/source/glyphs/makefile.mk 11 Apr 2008 08:59:18 -0000 1.13 ++++ vcl/source/glyphs/makefile.mk 20 Jul 2008 03:14:41 -0000 +@@ -42,9 +42,17 @@ + .INCLUDE : $(PRJ)$/util$/makefile2.pmk + + .IF "$(SYSTEM_FREETYPE)" == "YES" ++.IF "$(OS)" != "FREEBSD" + CFLAGS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS) ++.ELSE ++ADDCDEFS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS) ++.ENDIF + .IF "$(USE_FT_EMBOLDEN)" == "YES" ++.IF "$(OS)" != "FREEBSD" + CFLAGS+=-DUSE_FT_EMBOLDEN ++.ELSE ++ADDCDEFS+=-DUSE_FT_EMBOLDEN ++.ENDIF + .ENDIF + .ENDIF + |