Skip to content

Commit 0211dd4

Browse files
Use Fontconfig in Poppler
1 parent b6b151c commit 0211dd4

3 files changed

Lines changed: 15 additions & 1 deletion

File tree

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
--- CMakeLists.txt 2019-09-22 15:56:22.000000000 -0000
2+
+++ CMakeLists.txt 2019-12-04 21:07:14.085000000 -0000
3+
@@ -93,9 +93,6 @@
4+
5+
if(WIN32)
6+
set(_default_fontconfiguration "win32")
7+
-elseif(ANDROID)
8+
- # on android we don't have fontconfig and we don't want windows-specific code
9+
- set(_default_fontconfiguration "generic")
10+
else()
11+
set(_default_fontconfiguration "fontconfig")
12+
endif()

dependency-builder/src/main/cpp/packages/poppler-Patch-Source.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ sed -i "/macro_optional_find_package(TIFF)/a if(TIFF_FOUND)\n SET(TIFF_LIBRARIES
1515
CAIRO_LIBS=`$THIRDPARTY_PREFIX/bin/pkg-config --libs cairo`
1616
sed -i "/set(poppler_LIBS \${FREETYPE_LIBRARIES})/a if(CAIRO_FOUND)\n set(poppler_LIBS \${poppler_LIBS} $CAIRO_LIBS)\nendif()" $CMAKELISTS
1717

18+
patch $1/CMakeLists.txt <$BASEDIR/poppler-Patch-Source-use-fontconfig.patch
19+

dependency-builder/src/main/cpp/packages/poppler.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ELSE()
77
ENDIF ()
88

99
ExternalProjectCMake(poppler
10-
DEPENDS cairo freetype glib-2.0 lcms2 libpng libjpeg libopenjp2 libtiff-4 poppler-data
10+
DEPENDS cairo fontconfig freetype glib-2.0 lcms2 libpng libjpeg libopenjp2 libtiff-4 poppler-data
1111

1212
URL https://poppler.freedesktop.org/poppler-0.81.0.tar.xz
1313
URL_HASH SHA256=212d020b035b67b36c9666bd08ac778dff3222d85c01c338787d546f0f9bfe02

0 commit comments

Comments
 (0)