external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk | 2 +- external/mariadb-connector-c/README | 2 +- external/poppler/poppler-config.patch.1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 5915391068f69a12396c11993c56245399ca3261 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Nov 5 11:43:55 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Nov 5 13:21:48 2025 +0100 external: fix some cmake related comments Change-Id: Ie3159fcb5354fde82d3a04327dfad8b3f05098a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193452 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk b/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk index ba814e476444..3ba991d713e0 100644 --- a/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk +++ b/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk @@ -19,7 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libjpeg-turbo, \ )) # jconfigint.h and jconfig.h generated via -# cmake -DENABLE_STATIC:BOOL=ON -DENABLE_SHARED:BOOL=NO -DWITH_JAVA:BOOL=OFF -DWITH_TURBOJPEG:BOOL=OFF -DWITH_SIMD:BOOL=ON +# (cd workdir/UnpackedTarball/libjpeg-turbo && cmake -DENABLE_STATIC:BOOL=ON -DENABLE_SHARED:BOOL=NO -DWITH_JAVA:BOOL=OFF -DWITH_TURBOJPEG:BOOL=OFF -DWITH_SIMD:BOOL=ON) # and then tweaking $(eval $(call gb_UnpackedTarball_add_file,libjpeg-turbo,src/jconfigint.h,external/libjpeg-turbo/jconfigint.h)) diff --git a/external/mariadb-connector-c/README b/external/mariadb-connector-c/README index 25209f97f4d2..66c5763507aa 100644 --- a/external/mariadb-connector-c/README +++ b/external/mariadb-connector-c/README @@ -5,4 +5,4 @@ https://downloads.mariadb.com/Connectors/c/ configs/ generated like this: -cmake -DWITH_CURL=OFF -DWITH_SSL=OFF -DWITH_UNIT_TESTS=OFF -DWITH_DYNCOL=OFF .../workdir/UnpackedTarball/mariadb-connector-c/ +(cd workdir/UnpackedTarball/mariadb-connector-c/ && cmake -DWITH_CURL=OFF -DWITH_SSL=OFF -DWITH_UNIT_TESTS=OFF -DWITH_DYNCOL=OFF) diff --git a/external/poppler/poppler-config.patch.1 b/external/poppler/poppler-config.patch.1 index f61826de7f36..1c09810fd403 100644 --- a/external/poppler/poppler-config.patch.1 +++ b/external/poppler/poppler-config.patch.1 @@ -2,7 +2,7 @@ note: to get the 3rd one, use -DENABLE_CPP=on -mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg -DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none -DENABLE_LIBCURL=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_GPGME=off -DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_SPLASH=on -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off -DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off -DENABLE_QT6=off +(cd workdir/UnpackedTarball/poppler && cmake -DENABLE_DCTDECODER=libjpeg -DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none -DENABLE_LIBCURL=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_GPGME=off -DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_SPLASH=on -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off -DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off -DENABLE_QT6=off) manually disabled these because cmake failed to do it: HAVE_CAIRO
