From f951c6e7fd988cf8339b4377fea80fa96900dcd7 Mon Sep 17 00:00:00 2001 From: Fabian Dellwing Date: Wed, 21 Feb 2024 14:23:12 +0100 Subject: [PATCH] Ports: Improve `poppler` We now link against `boost`, `lcms2` and `openjpeg`. We also depend on `gpgme` but don't link against it because of #23557 --- Ports/poppler/package.sh | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/Ports/poppler/package.sh b/Ports/poppler/package.sh index f3e16be8f857df9..752ce94232af0e3 100755 --- a/Ports/poppler/package.sh +++ b/Ports/poppler/package.sh @@ -7,36 +7,41 @@ files=( "https://poppler.freedesktop.org/poppler-data-${version_data}.tar.gz#c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74" ) depends=( + 'boost' 'curl' 'fontconfig' 'freetype' + 'gpgme' + 'lcms2' 'libjpeg' 'libpng' 'libtiff' + 'openjpeg' ) useconfigure='true' configopts=( '-B build' "-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" '-DCMAKE_BUILD_TYPE=release' - '-DENABLE_BOOST=OFF' '-DENABLE_CPP=OFF' '-DBUILD_CPP_TESTS=OFF' '-DENABLE_GLIB=OFF' '-DENABLE_GOBJECT_INTROSPECTION=OFF' - '-DENABLE_GPGME=OFF' - '-DENABLE_GTK_DOC=OFF' - '-DENABLE_LCMS=OFF' - '-DENABLE_LIBOPENJPEG=unmaintained' + '-DENABLE_GPGME=OFF' # Enabling GPGME causes the program to crash (#23557) '-DENABLE_NSS3=OFF' '-DENABLE_QT5=OFF' '-DBUILD_QT5_TESTS=OFF' '-DENABLE_QT6=OFF' '-DBUILD_QT6_TESTS=OFF' '-DBUILD_GTK_TESTS=OFF' - '-DBUILD_MANUAL_TESTS=OFF' + '-DBUILD_MANUAL_TESTS=OFF' ) +pre_configure() { + # Fix the GpgmeppConfig.cmake file to use the correct path for cross-compilation + run sed -i'.bak' "s#/usr/local#${SERENITY_INSTALL_ROOT}/usr/local#g" ${SERENITY_INSTALL_ROOT}/usr/local/lib/cmake/Gpgmepp/GpgmeppConfig.cmake +} + configure() { run cmake "${configopts[@]}" } @@ -50,3 +55,8 @@ install() { cd "poppler-data-${version_data}" run_nocd make install datadir=${SERENITY_INSTALL_ROOT}/usr/local } + +post_install() { + # Restore the GpgmeppConfig.cmake file + run mv ${SERENITY_INSTALL_ROOT}/usr/local/lib/cmake/Gpgmepp/GpgmeppConfig.cmake.bak ${SERENITY_INSTALL_ROOT}/usr/local/lib/cmake/Gpgmepp/GpgmeppConfig.cmake +}