Merge branch 'Exiv2:main' into main

.github/workflows/on_PR_mac_special_builds.yml

@@ -29,4 +29,4 @@ jobs:
 
       - name: Test
         run: |
-          ctest --test-dir build --output-on-failure
+          ASAN_OPTIONS=detect_container_overflow=0 ctest --test-dir build --output-on-failure

.github/workflows/on_PR_meson.yaml

@@ -31,7 +31,7 @@ jobs:
     name: Linux-Clang${{matrix.cxx}}-deps=${{matrix.deps}}
     strategy:
       matrix:
-        cxx: ['7', '18']
+        cxx: ['7', '19']
         deps: ['forcefallback', 'default']
     steps:
       - uses: actions/checkout@v4

.github/workflows/on_push_BasicWinLinMac.yml

@@ -86,8 +86,8 @@ jobs:
     strategy:
       matrix:
         runner:
-          - { os: macos-12, arch: X64   }
-          - { os: macos-14, arch: ARM64 }
+          - { os: macos-13,     arch: X64   }
+          - { os: macos-latest, arch: ARM64 }
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/on_push_clang_format.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: DoozyX/clang-format-lint-action@v0.17
+      - uses: DoozyX/clang-format-lint-action@v0.18
         with:
           source: '.'
           exclude: './xmpsdk ./contrib'

README.md

@@ -905,7 +905,7 @@ All project resources are accessible from the project website.
 
 ## License
 
-Copyright (C) 2004-2023 Exiv2 authors.
+Copyright (C) 2004-2024 Exiv2 authors.
 You should have received a copy of the file [COPYING](COPYING) which details the GPLv2 license.
 
 Exiv2 is free software; you can redistribute it and/or modify

app/CMakeLists.txt

@@ -1,16 +1,22 @@
 set(APP_SOURCES
     exiv2.cpp
-    exiv2app.hpp
     actions.cpp
-    actions.hpp
     getopt.cpp
-    getopt.hpp
     app_utils.cpp
-    app_utils.hpp
 )
 
 add_executable(exiv2 ${APP_SOURCES})
 
+# Make app use UTF-8 code page in Windows
+if(WIN32)
+  if(MSVC)
+    target_sources(exiv2 PRIVATE utf8.manifest)
+  else()
+    # Must wrap manifest in .rc w/ other toolchains
+    target_sources(exiv2 PRIVATE utf8.rc)
+  endif()
+endif()
+
 target_include_directories(exiv2 PRIVATE ${PROJECT_SOURCE_DIR}/src) # To find i18n.hpp
 
 set_target_properties(exiv2 PROPERTIES COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS} XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS[variant=Debug] "YES")
@@ -27,24 +33,6 @@ endif()
 
 target_link_libraries(exiv2 PRIVATE std::filesystem)
 
-if(MSVC OR MINGW)
-  # Trick to get properly UTF-8 encoded argv.
-
-  # More info at: https://github.com/huangqinjin/wmain
-  add_library(wmain STATIC wmain.cpp)
-  target_link_libraries(exiv2 PRIVATE wmain)
-endif()
-
-if(MSVC)
-  target_link_options(wmain INTERFACE /WHOLEARCHIVE:$<TARGET_FILE:wmain>)
-  target_link_options(exiv2 PRIVATE "/ENTRY:wWinMainCRTStartup")
-endif()
-
-if(MINGW)
-  target_compile_options(exiv2 PRIVATE -municode)
-  target_link_options(exiv2 PRIVATE -municode)
-endif()
-
 if(USING_CONAN
    AND WIN32
    AND EXISTS ${PROJECT_BINARY_DIR}/conanDlls