From 6afccf95f0afe466e7070a2e0c6076a0abdf233f Mon Sep 17 00:00:00 2001
From: tsdgeos <aacid@kde.org>
Date: Wed, 6 Jul 2022 05:30:51 +0200
Subject: [PATCH] Fix poppler build (#7945)

---
 projects/poppler/build.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/projects/poppler/build.sh b/projects/poppler/build.sh
index fa7ee3160..a2e14a429 100755
--- a/projects/poppler/build.sh
+++ b/projects/poppler/build.sh
@@ -84,7 +84,8 @@ make install
 
 mkdir -p $SRC/openjpeg/build
 pushd $SRC/openjpeg/build
-cmake .. -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=$PREFIX
+sed -i "s#\${LCMS_LIBNAME}#-L$PREFIX/lib \${LCMS_LIBNAME}#" ../src/bin/jp2/CMakeLists.txt
+PKG_CONFIG=`which pkg-config` cmake .. -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=$PREFIX
 make -j$(nproc) install
 
 if [ "$SANITIZER" != "memory" ]; then
@@ -131,7 +132,7 @@ if [ "$SANITIZER" != "memory" ]; then
     popd
 
     pushd $SRC/pango
-    meson \
+    CFLAGS="$CFLAGS -fno-sanitize=vptr" CXXFLAGS="$CXXFLAGS -fno-sanitize=vptr" meson \
         -Ddefault_library=static \
         --prefix=$PREFIX \
         --libdir=lib \