diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2024-06-30 03:44:00 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-30 03:44:00 +1000 |
| commit | 43a855d4c3b283de2ad716223a09bd9c41bab195 (patch) | |
| tree | 6e9de663fbefb7dd4486d7ecb166220decaf6268 | |
| parent | 345e77e974d346af41ad768716eaeb6990b941ab (diff) | |
| parent | 1b552f6ee2d4fdffb828224fa58b753857ba4ed8 (diff) | |
Merge pull request #25406 from fuzzard/depends_exiv2_cstdint
[tools/depends][target] exiv2 add patch for GCC13 cstdint include
| -rw-r--r-- | cmake/modules/FindExiv2.cmake | 3 | ||||
| -rw-r--r-- | tools/depends/target/exiv2/0005-GCC13-cstdint.patch | 10 | ||||
| -rw-r--r-- | tools/depends/target/exiv2/Makefile | 6 |
3 files changed, 17 insertions, 2 deletions
diff --git a/cmake/modules/FindExiv2.cmake b/cmake/modules/FindExiv2.cmake index 8bd5df2543..0496a11f0f 100644 --- a/cmake/modules/FindExiv2.cmake +++ b/cmake/modules/FindExiv2.cmake @@ -16,7 +16,8 @@ if(NOT TARGET ${APP_NAME_LC}::${CMAKE_FIND_PACKAGE_NAME}) set(patches "${CMAKE_SOURCE_DIR}/tools/depends/target/${MODULE_LC}/0001-Add-EXIV2_ENABLE_FILESYSTEM_ACCESS-option.patch" "${CMAKE_SOURCE_DIR}/tools/depends/target/${MODULE_LC}/0002-Set-conditional-HTTP-depending-on-EXIV2_ENABLE_WEBRE.patch" "${CMAKE_SOURCE_DIR}/tools/depends/target/${MODULE_LC}/0003-UWP-Disable-getLoadedLibraries.patch" - "${CMAKE_SOURCE_DIR}/tools/depends/target/${MODULE_LC}/0004-WIN-lib-postfix.patch") + "${CMAKE_SOURCE_DIR}/tools/depends/target/${MODULE_LC}/0004-WIN-lib-postfix.patch" + "${CMAKE_SOURCE_DIR}/tools/depends/target/${MODULE_LC}/0005-GCC13-cstdint.patch") generate_patchcommand("${patches}") diff --git a/tools/depends/target/exiv2/0005-GCC13-cstdint.patch b/tools/depends/target/exiv2/0005-GCC13-cstdint.patch new file mode 100644 index 0000000000..72746e0605 --- /dev/null +++ b/tools/depends/target/exiv2/0005-GCC13-cstdint.patch @@ -0,0 +1,10 @@ +--- a/src/futils.cpp ++++ b/src/futils.cpp +@@ -11,6 +11,7 @@ + // + standard includes + #include <algorithm> + #include <array> ++#include <cstdint> + #include <cstring> + #include <sstream> + #include <stdexcept> diff --git a/tools/depends/target/exiv2/Makefile b/tools/depends/target/exiv2/Makefile index b26a4459a4..b289e02eb3 100644 --- a/tools/depends/target/exiv2/Makefile +++ b/tools/depends/target/exiv2/Makefile @@ -2,7 +2,9 @@ include ../../Makefile.include EXIV2-VERSION ../../download-files.include DEPS = ../../Makefile.include Makefile EXIV2-VERSION ../../download-files.include \ 0001-Add-EXIV2_ENABLE_FILESYSTEM_ACCESS-option.patch \ 0002-Set-conditional-HTTP-depending-on-EXIV2_ENABLE_WEBRE.patch \ - 0003-UWP-Disable-getLoadedLibraries.patch + 0003-UWP-Disable-getLoadedLibraries.patch \ + 0004-WIN-lib-postfix.patch \ + 0005-GCC13-cstdint.patch # configuration settings CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX=$(PREFIX) \ @@ -30,6 +32,8 @@ $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) cd $(PLATFORM); patch -p1 -i ../0001-Add-EXIV2_ENABLE_FILESYSTEM_ACCESS-option.patch cd $(PLATFORM); patch -p1 -i ../0002-Set-conditional-HTTP-depending-on-EXIV2_ENABLE_WEBRE.patch cd $(PLATFORM); patch -p1 -i ../0003-UWP-Disable-getLoadedLibraries.patch + cd $(PLATFORM); patch -p1 -i ../0004-WIN-lib-postfix.patch + cd $(PLATFORM); patch -p1 -i ../0005-GCC13-cstdint.patch cd $(PLATFORM)/build; $(CMAKE) $(CMAKE_OPTIONS) .. $(LIBDYLIB): $(PLATFORM) |