From 93f5bdb6037cdb9efbe5e72e2ecfd8cf3a11eb84 Mon Sep 17 00:00:00 2001 From: Steven Maude Date: Mon, 23 Oct 2023 14:47:59 +0000 Subject: [PATCH 1/2] Revert "Revert "Remove vendored msgpack-c repository"" This reverts commit a0a9f79b313fe22471a261b1ede56aa86ac71dcb. --- .gitmodules | 4 ---- vendor/github.com/msgpack/msgpack-c | 1 - 2 files changed, 5 deletions(-) delete mode 160000 vendor/github.com/msgpack/msgpack-c diff --git a/.gitmodules b/.gitmodules index b08e519..8c344ad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,7 +13,3 @@ [submodule "vendor/anongit.freedesktop.org/git/poppler/poppler.git"] path = vendor/anongit.freedesktop.org/git/poppler/poppler.git url = https://anongit.freedesktop.org/git/poppler/poppler.git -[submodule "vendor/github.com/msgpack/msgpack-c"] - path = vendor/github.com/msgpack/msgpack-c - url = https://github.com/msgpack/msgpack-c - branch = cpp_master diff --git a/vendor/github.com/msgpack/msgpack-c b/vendor/github.com/msgpack/msgpack-c deleted file mode 160000 index 63511f2..0000000 --- a/vendor/github.com/msgpack/msgpack-c +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 63511f29dbac8a1200a7653e561055e82e43d391 From 610bbb3c70412cf8fd256a754a25a5300ef0081a Mon Sep 17 00:00:00 2001 From: Steven Maude Date: Mon, 23 Oct 2023 14:48:07 +0000 Subject: [PATCH 2/2] Revert "Revert "Switch to sensiblecodeio fork of msgpack-cpp"" This reverts commit 6357fe2f98abf5685bc33afcb35ce8bbefd6777c. --- .gitmodules | 4 ++++ vendor/github.com/sensiblecodeio/msgpack-c | 1 + wscript | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 160000 vendor/github.com/sensiblecodeio/msgpack-c diff --git a/.gitmodules b/.gitmodules index 8c344ad..571d328 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,7 @@ [submodule "vendor/anongit.freedesktop.org/git/poppler/poppler.git"] path = vendor/anongit.freedesktop.org/git/poppler/poppler.git url = https://anongit.freedesktop.org/git/poppler/poppler.git +[submodule "vendor/github.com/sensiblecodeio/msgpack-c"] + path = vendor/github.com/sensiblecodeio/msgpack-c + url = https://github.com/sensiblecodeio/msgpack-c + branch = cpp-6.1.0-with-4.1.1-float-double-behaviour diff --git a/vendor/github.com/sensiblecodeio/msgpack-c b/vendor/github.com/sensiblecodeio/msgpack-c new file mode 160000 index 0000000..dfec9a8 --- /dev/null +++ b/vendor/github.com/sensiblecodeio/msgpack-c @@ -0,0 +1 @@ +Subproject commit dfec9a8b85b53f873fe798ad10d1aba2b4892184 diff --git a/wscript b/wscript index 9b7c18b..3cadc0d 100644 --- a/wscript +++ b/wscript @@ -114,5 +114,5 @@ def build(ctx): target="pdf2msgpack", use="poppler", features=features, - includes=["vendor/github.com/msgpack/msgpack-c/include"], + includes=["vendor/github.com/sensiblecodeio/msgpack-c/include"], )