Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 8, 2024

Update version numbers for the new release.


This is an automatic backport of pull request #3009 done by Mergify.

Copy link
Contributor Author

mergify bot commented Jul 8, 2024

Cherry-pick of c5b922c has failed:

On branch mergify/bp/main/pr-3009
Your branch is up to date with 'origin/main'.

You are currently cherry-picking commit c5b922cf5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   SECURITY.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CMakeLists.txt
	both modified:   doc/ChangeLog
	both modified:   meson.build
	both modified:   po/exiv2.pot

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@kevinbackhouse kevinbackhouse force-pushed the mergify/bp/main/pr-3009 branch from dfb4bba to 4efdcfd Compare July 8, 2024 09:30
@1div0
Copy link
Collaborator

1div0 commented Jul 8, 2024

So far so good. Just compiled on nVIDIA Jetson Nano with only three warnings. It would be great to get rid of them entirely for 1.0.0.

peter.kovar@JetsonNano:/usr/src/github.com/Exiv2/exiv2$ time nice ninja -C Linux/AArch64
ninja: Entering directory `Linux/AArch64'

count = sscanf ( strValue, "%lld%c", &result, &nextCh );
~~~~~~~ ^
../../xmpsdk/src/XMPUtils.cpp:1223:57: warning: format ‘%llx’ expects argument of type ‘long long unsigned int*’, but argument 3 has type ‘XMP_Int64* {aka long int*}’ [-Wformat=]
count = sscanf ( strValue, "%llx%c", &result, &nextCh );
~~~~~~~ ^
[86/182] Compiling C++ object src/libexiv2.so.0.28.3.p/.._xmpsdk_src_XMPMeta.cpp.o
../../xmpsdk/src/XMPMeta.cpp: In function ‘XMP_Status DumpNodeOptions(XMP_OptionBits, XMP_TextOutputProc, void*)’:
../../xmpsdk/src/XMPMeta.cpp:90:78: warning: format ‘%lX’ expects argument of type ‘long unsigned int’, but argument 4 has type ‘XMP_OptionBits {aka unsigned int}’ [-Wformat=]
#define OutProcHexInt(num) { snprintf ( buffer, sizeof(buffer), "%lX", (num) ); /* AUDIT: Using sizeof for snprintf length is safe */
~~~~~ ^
../../xmpsdk/src/XMPMeta.cpp:241:3: note: in expansion of macro ‘OutProcHexInt’
OutProcHexInt ( options );
^~~~~~~~~~~~~
[182/182] Linking target path-test

real 3m6,103s
user 9m43,420s
sys 0m49,204s

@kmilos
Copy link
Collaborator

kmilos commented Jul 8, 2024

Re XMP SDK warnings - we have a tracking issue (a PR actually) for those, so off-topic here... But as I said there, I'd rather the whole SDK gets updated...

Co-authored-by: Miloš Komarčević <[email protected]>
@kevinbackhouse
Copy link
Collaborator

Re XMP SDK warnings - we have a tracking issue (a PR actually) for those, so off-topic here... But as I said there, I'd rather the whole SDK gets updated...

Are you talking about #3011, or is that new?

@kmilos kmilos removed the conflicts label Jul 8, 2024
@kmilos
Copy link
Collaborator

kmilos commented Jul 8, 2024

Re XMP SDK warnings - we have a tracking issue (a PR actually) for those, so off-topic here... But as I said there, I'd rather the whole SDK gets updated...

Are you talking about #3011, or is that new?

That's new and unrelated. Talking about #2671, please continue discussion there.

@kmilos kmilos merged commit 2738730 into main Jul 8, 2024
@mergify mergify bot deleted the mergify/bp/main/pr-3009 branch July 8, 2024 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants