diff options
| author | kwm <kwm@FreeBSD.org> | 2013-12-25 05:22:21 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2013-12-25 05:22:21 +0800 |
| commit | 3602daba968a0e16ff8817cb961f23cd54730acc (patch) | |
| tree | 93506aaee5230ee46b75930c4b3a6b8e0f243d74 /graphics/podofo | |
| parent | b6e03796b2af561162757d9125b17f9d15197d64 (diff) | |
| download | freebsd-ports-gnome-3602daba968a0e16ff8817cb961f23cd54730acc.tar.gz freebsd-ports-gnome-3602daba968a0e16ff8817cb961f23cd54730acc.tar.zst freebsd-ports-gnome-3602daba968a0e16ff8817cb961f23cd54730acc.zip | |
Update freetype to 2.5.2.
Remove patch to add -I/usr/local/include in freetype-config --cflags. If
ports need extra headers they should look for them, and not get them via
a side-effect.
Freetype had a header resuffle in 2.5.1, patch ports to use the new header
style.
Thanks go to bdrewery for the two exp-runs and rakuco for helping me with
some troublesome cmake ports.
PR: ports/184587
Diffstat (limited to 'graphics/podofo')
| -rw-r--r-- | graphics/podofo/Makefile | 3 | ||||
| -rw-r--r-- | graphics/podofo/files/patch-cmake_modules_FindFREETYPE.cmake | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile index b4d6e9a8154e..4b824d5e8c31 100644 --- a/graphics/podofo/Makefile +++ b/graphics/podofo/Makefile @@ -17,13 +17,14 @@ LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig -USES= cmake +USES= cmake dos2unix CMAKE_ARGS= -DPODOFO_BUILD_SHARED:BOOL=TRUE \ -DPODOFO_BUILD_STATIC:BOOL=FALSE \ -DOPENSSL_INCLUDE_DIR:PATH="${OPENSSLINC}" \ -DOPENSSL_LIBRARIES:PATH="${OPENSSLDIR}" USE_OPENSSL= yes USE_LDCONFIG= yes +DOS2UNIX_FILES= cmake/modules/FindFREETYPE.cmake OPTIONS_DEFINE= IMPOSE JPEG PNG TIFF OPTIONS_DEFAULT= JPEG PNG TIFF diff --git a/graphics/podofo/files/patch-cmake_modules_FindFREETYPE.cmake b/graphics/podofo/files/patch-cmake_modules_FindFREETYPE.cmake new file mode 100644 index 000000000000..fab85541e57c --- /dev/null +++ b/graphics/podofo/files/patch-cmake_modules_FindFREETYPE.cmake @@ -0,0 +1,19 @@ +--- cmake/modules/FindFREETYPE.cmake.orig 2013-12-23 19:53:54.000000000 +0200 ++++ cmake/modules/FindFREETYPE.cmake 2013-12-23 19:54:05.000000000 +0200 +@@ -12,14 +12,14 @@ + + SET(FREETYPE_FIND_QUIETLY 1) + +-FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD freetype2/ft2build.h + /usr/include/ + /usr/local/include/ + /usr/X11/include/ + NO_CMAKE_SYSTEM_PATH + ) + +-FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h + /usr/include/freetype2 + /usr/local/include/freetype2 + /usr/X11/include/freetype2 |