From 90a96182c25755a68b9c7418093dfd0c9f36e52d Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sun, 15 Jan 2023 23:24:25 +0000 Subject: [PATCH 1/3] Bump conan version --- .github/workflows/on_PR_linux_matrix.yml | 2 +- .github/workflows/on_PR_linux_special_buils.yml | 8 ++++---- .github/workflows/on_PR_windows_matrix.yml | 2 +- .github/workflows/on_push_BasicWinLinMac.yml | 4 ++-- .github/workflows/on_push_ExtraJobsForMain.yml | 2 +- .github/workflows/release.yml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/on_PR_linux_matrix.yml b/.github/workflows/on_PR_linux_matrix.yml index e58b14bedd..4292316252 100644 --- a/.github/workflows/on_PR_linux_matrix.yml +++ b/.github/workflows/on_PR_linux_matrix.yml @@ -19,7 +19,7 @@ jobs: - name: install dependencies run: | sudo apt-get install ninja-build - pip3 install conan==1.52.0 + pip3 install conan==1.53.0 - name: Conan common config run: | diff --git a/.github/workflows/on_PR_linux_special_buils.yml b/.github/workflows/on_PR_linux_special_buils.yml index b1e5c653ac..c46f717a7d 100644 --- a/.github/workflows/on_PR_linux_special_buils.yml +++ b/.github/workflows/on_PR_linux_special_buils.yml @@ -16,7 +16,7 @@ jobs: - name: install dependencies run: | sudo apt-get install ninja-build - pip3 install conan==1.52.0 + pip3 install conan==1.53.0 - name: Conan common config run: | @@ -63,7 +63,7 @@ jobs: run: | sudo apt-get update sudo apt-get install valgrind ninja-build - pip3 install conan==1.52.0 + pip3 install conan==1.53.0 - name: Conan common config run: | @@ -100,7 +100,7 @@ jobs: - name: install dependencies run: | sudo apt-get install ninja-build - pip3 install conan==1.52.0 + pip3 install conan==1.53.0 - name: Conan common config run: | @@ -136,7 +136,7 @@ jobs: run: | sudo apt-get update sudo apt-get install valgrind doxygen graphviz gettext - pip3 install conan==1.52.0 + pip3 install conan==1.53.0 - name: Conan common config run: | diff --git a/.github/workflows/on_PR_windows_matrix.yml b/.github/workflows/on_PR_windows_matrix.yml index bf737e3b0b..4d04c6fcff 100644 --- a/.github/workflows/on_PR_windows_matrix.yml +++ b/.github/workflows/on_PR_windows_matrix.yml @@ -46,7 +46,7 @@ jobs: - name: Install Conan & Common config run: | - pip.exe install "conan==1.52.0" + pip.exe install "conan==1.53.0" conan profile new --detect default conan profile update settings.build_type=${{matrix.build_type}} default conan profile update settings.compiler="Visual Studio" default diff --git a/.github/workflows/on_push_BasicWinLinMac.yml b/.github/workflows/on_push_BasicWinLinMac.yml index 2ba61a1594..6a0926d91a 100644 --- a/.github/workflows/on_push_BasicWinLinMac.yml +++ b/.github/workflows/on_push_BasicWinLinMac.yml @@ -31,7 +31,7 @@ jobs: - name: Install Conan & Common config run: | - pip.exe install "conan==1.52.0" + pip.exe install "conan==1.53.0" conan config install https://github.com/conan-io/conanclientcert.git conan profile new --detect default conan profile show default @@ -77,7 +77,7 @@ jobs: - name: install dependencies run: | sudo apt-get install ninja-build - pip3 install conan==1.52.0 + pip3 install conan==1.53.0 - name: Conan run: | diff --git a/.github/workflows/on_push_ExtraJobsForMain.yml b/.github/workflows/on_push_ExtraJobsForMain.yml index f515d753d5..e122e59f7c 100644 --- a/.github/workflows/on_push_ExtraJobsForMain.yml +++ b/.github/workflows/on_push_ExtraJobsForMain.yml @@ -17,7 +17,7 @@ jobs: - name: install dependencies run: | - pip3 install conan==1.52.0 + pip3 install conan==1.53.0 - name: Conan common config run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9eae9c6100..0abf80bdc3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: - name: Install dependencies run: | sudo apt-get install ninja-build gettext doxygen graphviz - pip3 install conan==1.51.0 + pip3 install conan==1.53.0 - name: Conan common config run: | @@ -110,7 +110,7 @@ jobs: - name: Install Conan & Common config run: | - pip.exe install "conan==1.51.0" + pip.exe install "conan==1.53.0" conan config install https://github.com/conan-io/conanclientcert.git conan profile new --detect default conan profile update settings.build_type=Release default From c8fab3abad2ec4637b8670fd2c67d09c8f6e9f04 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Wed, 18 Jan 2023 01:07:41 +0000 Subject: [PATCH 2/3] Replace array with std::vector in decodeBase64() This serves as a work around for a weird bug in Apple Clang 14.0.* xref: https://stackoverflow.com/q/75153729/1005215 --- src/preview.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/preview.cpp b/src/preview.cpp index 8b68a3c4f2..ee9d430c91 100644 --- a/src/preview.cpp +++ b/src/preview.cpp @@ -23,6 +23,7 @@ #include #include +#include #include "preview.hpp" #include "futils.hpp" @@ -936,9 +937,8 @@ namespace { // create decoding table unsigned long invalid = 64; - unsigned long decodeBase64Table[256] = {}; - for (unsigned long i = 0; i < 256; i++) - decodeBase64Table[i] = invalid; + std::vector decodeBase64Table(256, invalid); + for (unsigned long i = 0; i < 64; i++) decodeBase64Table[(unsigned char)encodeBase64Table[i]] = i; From d2ed6f47594fc5535d538ef3cfcf53d410fe201a Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Mon, 16 Jan 2023 00:32:23 +0000 Subject: [PATCH 3/3] Exiv2 v0.27.6 --- CMakeLists.txt | 10 ++-------- doc/ChangeLog | 12 ++++++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a9580f857..2b70eaff29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,8 @@ # Minimum version imposed by Debian:9 cmake_minimum_required( VERSION 3.7.2 ) -project(exiv2 # use TWEAK to categorize the build - VERSION 0.27.5 # 0.27.5 = GM (tagged and released) - # 0.27.5.3 = RC3 - # 0.27.5.9 = 27.4.9 Development - # 0.27.5.00 = GM Preview - # 0.27.5.3 = RC3 (tagged and released) - # 0.27.5.30 = RC2 Preview - # 0.27.5.39 = RC2 Development +project(exiv2 + VERSION 0.27.6 LANGUAGES CXX ) diff --git a/doc/ChangeLog b/doc/ChangeLog index 008b2540f0..982a6d0b85 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,15 @@ +Changes from version 0.27.5 to 0.27.6 +------------------------------------- + +Closed: +https://github.com/Exiv2/exiv2/milestone/10?closed=1 + +Open: +https://github.com/Exiv2/exiv2/milestone/10?open=1 + +Release Notes: +https://github.com/Exiv2/exiv2/issues/2406#issuecomment-1383302378 + Changes from version 0.27.4 to 0.27.5 -------------------------------------