commit 2e81bf8cb13676b81781fe7fec760940f9a42ff4 Author: Tim Biermann <tbier@posteo.de> Date: Thu May 28 17:45:50 2020 +0200 inkscape: fixed poppler build diff --git a/inkscape/.signature b/inkscape/.signature index 76ef4577d..5eb3e8ef2 100644 --- a/inkscape/.signature +++ b/inkscape/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35W8EynzUOdAPLUtXTMk1tKkRPwptCVfcs90/U0aU8gT3OGcge6En/2u4l/Kt+NICo5MfK6kgNVHqrXBj5L4ogc= -SHA256 (Pkgfile) = 139d3a4c5418b00a3c7993da883665b6b97b68f4e283645a9cd83b46b6920bf9 +RWSagIOpLGJF3wd8+PzxpeUNRUqDjGWLvKXlu9HCyPsDkSBXEvtcIUb39cvwWSxnwvEPpyfzNJwlbg+2K3+nc2ArQLTIxvPolA4= +SHA256 (Pkgfile) = 88212154a9ad8da02be81a77e1b8fd0b3cf29ef0c3b950d569f3a6cacbcb7aae SHA256 (.footprint) = 5ad09c891de18fb7c8a2f346f6724e48634dd7da8a4990a78d0ac28a1972f2af SHA256 (inkscape-1.0.tar.xz) = 89c123d1a62ac52db6a08fe3be730584411b89a88ecc528a410b4f3fa53f94bb SHA256 (poppler-0.88.0.tar.xz) = b4453804e9a5a519e6ceee0ac8f5efc229e3b0bf70419263c239124474d256c7 diff --git a/inkscape/Pkgfile b/inkscape/Pkgfile index e45ce49c8..b0077f94b 100644 --- a/inkscape/Pkgfile +++ b/inkscape/Pkgfile @@ -11,8 +11,8 @@ source=(https://media.inkscape.org/dl/resources/file/$name-$version.tar.xz poppler() { cmake -Spoppler-0.88.0 -Bbuild-poppler -GNinja \ - -DCMAKE_INSTALL_PREFIX=$SRC/poppler \ - -DCMAKE_INSTALL_LIBDIR=$SRC/poppler/lib \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ -DENABLE_UTILS=ON \ -DENABLE_SPLASH=ON \ @@ -24,12 +24,12 @@ poppler() { -DENABLE_LIBOPENJPEG=none \ -DWITH_NSS3=OFF - make --build build-poppler + cmake --build build-poppler DESTDIR=$SRC/poppler cmake --build build-poppler --target install - install -D -t $PKG/usr/lib $SRC/poppler/lib/libpoppler.so.99 + install -D -t $PKG/usr/lib $SRC/poppler/usr/lib/libpoppler.so.99 - export CXXFLAGS+=" -I$SRC/poppler/include -I$SRC/poppler/include/poppler" - export PKG_CONFIG_PATH="$SRC/poppler/lib/pkgconfig:$PKG_CONFIG_PATH" + export CXXFLAGS+=" -I$SRC/poppler/usr/include -I$SRC/poppler/usr/include/poppler" + export PKG_CONFIG_PATH="$SRC/poppler/usr/lib/pkgconfig:$PKG_CONFIG_PATH" } build() {