From 85842bcc1433337d536a0e4b605ef4880fd08c5f Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sun, 8 Nov 2020 11:19:41 +0000 Subject: [PATCH] inkscape: updated cmake syntax --- inkscape/.signature | 4 ++-- inkscape/Pkgfile | 42 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/inkscape/.signature b/inkscape/.signature index 45c73aed2..e99764b71 100644 --- a/inkscape/.signature +++ b/inkscape/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF379enhhAyqPRpHktVVPmM1JNnWbjLKdrXJetHfMvpbhNmUWHzmsKKeqr3wUGnXO+aC2RJgbCUhVyjK0l1bIpqgk= -SHA256 (Pkgfile) = 3c5140026d077925331020e193f6ca52beb8e446b524a06f7a083db3e0bab697 +RWSagIOpLGJF32M1QmW9BoEaZpR2kUC9L+/ZYjZ3pVytMrMx2G9UPXunknr2w6x0paDiiHLYJhamMLwxTjT/pM6G0XJF05xsWAk= +SHA256 (Pkgfile) = c09430de85329326408b77c3f90e7eb962d1f76200905d301cfc666fe0c1a06a SHA256 (.footprint) = 207a968d87902372405b30a1e2bfaf21396f6ba21d14628eb77d7435936981ce SHA256 (inkscape-1.0.1.tar.xz) = cf9295edf46a633caf3aac0562364a24aef7cd6294601365aca38aeead2d57c2 SHA256 (poppler-20.09.0.tar.xz) = 4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363 diff --git a/inkscape/Pkgfile b/inkscape/Pkgfile index 226a2715c..97840a73f 100644 --- a/inkscape/Pkgfile +++ b/inkscape/Pkgfile @@ -11,22 +11,22 @@ source=(https://media.inkscape.org/dl/resources/file/$name-$version.tar.xz inkscape.patch) poppler() { - cmake -Spoppler-20.09.0 -Bbuild-poppler -GNinja \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG" \ - -DCMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG" \ - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ - -DENABLE_UTILS=ON \ - -DENABLE_SPLASH=ON \ - -DENABLE_CPP=ON \ - -DENABLE_GLIB=ON \ - -DENABLE_QT5=OFF \ - -DENABLE_ZLIB=ON \ - -DENABLE_CMS=lcms2 \ - -DENABLE_LIBOPENJPEG=none \ - -DWITH_NSS3=OFF \ + cmake -S poppler-20.09.0 -B build-poppler -G Ninja \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_INSTALL_LIBDIR=lib \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG" \ + -D CMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG" \ + -D ENABLE_UNSTABLE_API_ABI_HEADERS=ON \ + -D ENABLE_UTILS=ON \ + -D ENABLE_SPLASH=ON \ + -D ENABLE_CPP=ON \ + -D ENABLE_GLIB=ON \ + -D ENABLE_QT5=OFF \ + -D ENABLE_ZLIB=ON \ + -D ENABLE_CMS=lcms2 \ + -D ENABLE_LIBOPENJPEG=none \ + -D WITH_NSS3=OFF \ -Wno-dev cmake --build build-poppler @@ -44,11 +44,11 @@ build() { export PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig:$PKG_CONFIG_PATH" - cmake -S$name-${version}_2020-09-07_3bc2e813f5 -Bbuild -GNinja \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG" \ - -DCMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG" \ + cmake -S $name-${version}_2020-09-07_3bc2e813f5 -B build -G Ninja \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG" \ + -D CMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG" \ -Wno-dev