Merge pull request #346 from sensiblecodeio/update-dependencies-2024-07

Update dependencies 2024-07
sensiblecodeio · Jul 22, 2024 · b8987a0 · b8987a0
2 parents c002672 + 6d55167
commit b8987a0
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 30 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,19 +1,20 @@
-[submodule "vendor/gitlab.freedesktop.org/freetype/freetype.git"]
-	path = vendor/gitlab.freedesktop.org/freetype/freetype.git
+[submodule "vendor/gitlab.freedesktop.org/freetype/freetype"]
+	path = vendor/gitlab.freedesktop.org/freetype/freetype
 	url = https://gitlab.freedesktop.org/freetype/freetype.git
 [submodule "vendor/anongit.freedesktop.org/git/fontconfig"]
-	path = vendor/anongit.freedesktop.org/git/fontconfig
-	url = https://anongit.freedesktop.org/git/fontconfig
+	path = vendor/gitlab.freedesktop.org/fontconfig/fontconfig
+	url = https://gitlab.freedesktop.org/fontconfig/fontconfig.git
 [submodule "vendor/github.com/mm2/Little-CMS"]
 	path = vendor/github.com/mm2/Little-CMS
-	url = https://github.com/mm2/Little-CMS
+	url = https://github.com/mm2/Little-CMS.git
 [submodule "vendor/github.com/uclouvain/openjpeg"]
 	path = vendor/github.com/uclouvain/openjpeg
-	url = https://github.com/uclouvain/openjpeg
-[submodule "vendor/anongit.freedesktop.org/git/poppler/poppler.git"]
-	path = vendor/anongit.freedesktop.org/git/poppler/poppler.git
+	url = https://github.com/uclouvain/openjpeg.git
+[submodule "vendor/anongit.freedesktop.org/git/poppler/poppler"]
+	path = vendor/github.com/sensiblecodeio/poppler
 	url = https://github.com/sensiblecodeio/poppler.git
+	branch = pdf2msgpack
 [submodule "vendor/github.com/sensiblecodeio/msgpack-c"]
 	path = vendor/github.com/sensiblecodeio/msgpack-c
-	url = https://github.com/sensiblecodeio/msgpack-c
+	url = https://github.com/sensiblecodeio/msgpack-c.git
 	branch = cpp-6.1.0-with-4.1.1-float-double-behaviour
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,10 @@
 # syntax = docker/dockerfile:experimental
 
-FROM alpine:3.19 AS cachebase
+FROM alpine:3.20 AS cachebase
 RUN mkdir -p /tmp/ccache \
  && chown nobody:nogroup /tmp/ccache
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 ARG BUILD_CONCURRENCY=4
 
@@ -46,7 +46,7 @@ USER nobody:nogroup
 
 RUN --mount=type=cache,src=/tmp/ccache,target=/tmp/ccache,id=ccache,from=cachebase \
     \
-    cd vendor/gitlab.freedesktop.org/freetype/freetype.git/ \
+    cd vendor/gitlab.freedesktop.org/freetype/freetype/ \
  && NOCONFIGURE=1 ./autogen.sh \
  # workaround for docker #9547 (Text file busy) \
  && sync \
@@ -55,23 +55,23 @@ RUN --mount=type=cache,src=/tmp/ccache,target=/tmp/ccache,id=ccache,from=cacheba
  && make -j${BUILD_CONCURRENCY} \
  && make install
 
-ENV PKG_CONFIG_PATH="/src/vendor/gitlab.freedesktop.org/freetype/freetype.git/build/install/lib/pkgconfig:$PKG_CONFIG_PATH" \
-    LINKFLAGS="-L/src/vendor/gitlab.freedesktop.org/freetype/freetype.git/build/install/lib $LINKFLAGS" \
+ENV PKG_CONFIG_PATH="/src/vendor/gitlab.freedesktop.org/freetype/freetype/build/install/lib/pkgconfig:$PKG_CONFIG_PATH" \
+    LINKFLAGS="-L/src/vendor/gitlab.freedesktop.org/freetype/freetype/build/install/lib $LINKFLAGS" \
     # Required for poppler cmake \
-    FREETYPE_DIR=/src/vendor/gitlab.freedesktop.org/freetype/freetype.git/build/install
+    FREETYPE_DIR=/src/vendor/gitlab.freedesktop.org/freetype/freetype/build/install
 
 
 RUN --mount=type=cache,src=/tmp/ccache,target=/tmp/ccache,id=ccache,from=cachebase \
     \
-    cd vendor/anongit.freedesktop.org/git/fontconfig \
+    cd vendor/gitlab.freedesktop.org/fontconfig/fontconfig/ \
  && NOCONFIGURE=1 ./autogen.sh \
  && mkdir build && cd build \
  && ../configure --prefix=$PWD/install --enable-static \
  && make -j${BUILD_CONCURRENCY} \
  && make install
 
-ENV PKG_CONFIG_PATH="/src/vendor/anongit.freedesktop.org/git/fontconfig/build/install/lib/pkgconfig:$PKG_CONFIG_PATH" \
-    LINKFLAGS="-L/src/vendor/anongit.freedesktop.org/git/fontconfig/build/install/lib $LINKFLAGS"
+ENV PKG_CONFIG_PATH="/src/vendor/gitlab.freedesktop.org/fontconfig/fontconfig/build/install/lib/pkgconfig:$PKG_CONFIG_PATH" \
+    LINKFLAGS="-L/src/vendor/gitlab.freedesktop.org/fontconfig/fontconfig/build/install/lib $LINKFLAGS"
 
 
 RUN --mount=type=cache,src=/tmp/ccache,target=/tmp/ccache,id=ccache,from=cachebase \
@@ -103,7 +103,7 @@ ENV PKG_CONFIG_PATH="/src/vendor/github.com/uclouvain/openjpeg/build/install/lib
 
 RUN --mount=type=cache,src=/tmp/ccache,target=/tmp/ccache,id=ccache,from=cachebase \
     \
-    cd vendor/anongit.freedesktop.org/git/poppler/poppler.git \
+    cd vendor/github.com/sensiblecodeio/poppler/ \
  && mkdir build && cd build \
  && cmake .. \
           -DCMAKE_INSTALL_PREFIX=$PWD/install \
@@ -124,9 +124,9 @@ RUN --mount=type=cache,src=/tmp/ccache,target=/tmp/ccache,id=ccache,from=cacheba
  && make V=1 -j${BUILD_CONCURRENCY} \
  && make install
 
-ENV PKG_CONFIG_PATH="/src/vendor/anongit.freedesktop.org/git/poppler/poppler.git/build/install/lib/pkgconfig:$PKG_CONFIG_PATH" \
-    LINKFLAGS="-L/src/vendor/anongit.freedesktop.org/git/poppler/poppler.git/build/install/lib $LINKFLAGS" \
-    CXXFLAGS="-I/src/vendor/anongit.freedesktop.org/git/poppler/poppler.git/build/install/include $CXXFLAGS"
+ENV PKG_CONFIG_PATH="/src/vendor/github.com/sensiblecodeio/poppler/build/install/lib/pkgconfig:$PKG_CONFIG_PATH" \
+    LINKFLAGS="-L/src/vendor/github.com/sensiblecodeio/poppler/build/install/lib $LINKFLAGS" \
+    CXXFLAGS="-I/src/vendor/github.com/sensiblecodeio/poppler/build/install/include $CXXFLAGS"
 
 
 COPY --chown=nobody:nogroup ./src /src/src

diff --git a/vendor/anongit.freedesktop.org/git/fontconfig b/vendor/anongit.freedesktop.org/git/fontconfig
diff --git a/vendor/anongit.freedesktop.org/git/poppler/poppler.git b/vendor/anongit.freedesktop.org/git/poppler/poppler.git
diff --git a/vendor/github.com/mm2/Little-CMS b/vendor/github.com/mm2/Little-CMS
diff --git a/vendor/github.com/sensiblecodeio/msgpack-c b/vendor/github.com/sensiblecodeio/msgpack-c
diff --git a/vendor/github.com/sensiblecodeio/poppler b/vendor/github.com/sensiblecodeio/poppler
diff --git a/vendor/github.com/uclouvain/openjpeg b/vendor/github.com/uclouvain/openjpeg
diff --git a/vendor/gitlab.freedesktop.org/fontconfig/fontconfig b/vendor/gitlab.freedesktop.org/fontconfig/fontconfig
diff --git a/vendor/gitlab.freedesktop.org/freetype/freetype b/vendor/gitlab.freedesktop.org/freetype/freetype
diff --git a/vendor/gitlab.freedesktop.org/freetype/freetype.git b/vendor/gitlab.freedesktop.org/freetype/freetype.git
diff --git a/wscript b/wscript
@@ -37,14 +37,14 @@ def options(opt):
 def configure(ctx):
     ctx.load('compiler_cxx')
 
-    ctx.check(features='cxx cxxprogram', cxxflags="--std=c++17")
+    ctx.check(features='cxx cxxprogram', cxxflags="--std=c++20")
 
     ctx.env.append_value("CXXFLAGS", [
         "-g",
         "-Wall",
         "-Werror",
         "-ansi",
-        "--std=c++17",
+        "--std=c++20",
         "-DMSGPACK_NO_BOOST",
     ])
+25 −43		.github/workflows/build.yml
+4 −4		.github/workflows/codeql-analysis.yml
+4 −4		.github/workflows/scorecard.yml
+3 −3		include/lcms2.h
+2 −1		plugins/fast_float/src/fast_16_tethra.c
+8 −4		plugins/fast_float/src/fast_8_curves.c
+2 −1		plugins/fast_float/src/fast_8_matsh.c
+2 −1		plugins/fast_float/src/fast_8_matsh_sse.c
+2 −1		plugins/fast_float/src/fast_8_tethra.c
+2 −1		plugins/fast_float/src/fast_float_15mats.c
+1 −1		plugins/fast_float/src/fast_float_cmyk.c
+4 −4		plugins/fast_float/src/fast_float_curves.c
+1 −1		plugins/fast_float/src/fast_float_lab.c
+1 −1		plugins/fast_float/src/fast_float_matsh.c
+1 −1		plugins/fast_float/src/fast_float_tethra.c
+4 −4		src/cmsalpha.c
+102 −55		src/cmscgats.c
+1 −2		src/cmscnvrt.c
+659 −659		src/cmsgmt.c
+5 −0		src/cmsio0.c
+4 −4		src/cmsmd5.c
+34 −21		src/cmsps2.c
+4 −2		src/cmsvirt.c
+35 −27		src/cmsxform.c
+ −		testbed/new.icc
+ −		testbed/testbed.exp
+0 −3		testbed/testcms2.c
+1 −0		utils/tificc/tificc.c
+3 −3		.github/depends/boost.sh
+3 −3		.github/depends/zlib.sh
+1 −1		.github/workflows/coverage.yml
+14 −10		.github/workflows/gha.yml
+5 −0		CHANGELOG.md
+1 −1		QUICKSTART-CPP.md
+1 −1		README.md
+8 −8		appveyor.yml
+2 −2		include/msgpack/v1/adaptor/cpp17/variant.hpp
+1 −1		include/msgpack/version_master.hpp
+22 −0		test/msgpack_cpp17.cpp