control: tags -1 patch pending Uploaded the one line patch
diff -Nru hdrmerge-0.5+git20200117/debian/changelog hdrmerge-0.5+git20200117/debian/changelog --- hdrmerge-0.5+git20200117/debian/changelog 2023-07-07 22:22:08.000000000 +0200 +++ hdrmerge-0.5+git20200117/debian/changelog 2023-07-16 21:12:40.000000000 +0200 @@ -1,3 +1,12 @@ +hdrmerge (0.5+git20200117-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches/221.patch: + - cherry-pick upstream proposed patch to fix gcc-13 build failure (Closes: + #1037686) + + -- Gianfranco Costamagna <locutusofb...@debian.org> Sun, 16 Jul 2023 21:12:40 +0200 + hdrmerge (0.5+git20200117-3) unstable; urgency=medium* Team upload.
diff -Nru hdrmerge-0.5+git20200117/debian/patches/221.patch hdrmerge-0.5+git20200117/debian/patches/221.patch --- hdrmerge-0.5+git20200117/debian/patches/221.patch 1970-01-01 01:00:00.000000000 +0100 +++ hdrmerge-0.5+git20200117/debian/patches/221.patch 2023-07-16 21:12:40.000000000 +0200 @@ -0,0 +1,21 @@ +From 7a799d5c3adee9865f9956be51ec9d4955a087b7 Mon Sep 17 00:00:00 2001 +From: jdeluyck <5451787+jdelu...@users.noreply.github.com> +Date: Thu, 29 Jun 2023 13:53:55 +0200 +Subject: [PATCH] fix compilation by including cstdlib + +--- + src/TiffDirectory.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/TiffDirectory.hpp b/src/TiffDirectory.hpp +index de989a4..dd9668d 100644 +--- a/src/TiffDirectory.hpp ++++ b/src/TiffDirectory.hpp +@@ -22,6 +22,7 @@ + + #include <vector> + #include <string> ++#include <cstdint> + + #ifndef _TIFFDIRECTORY_HPP_ + #define _TIFFDIRECTORY_HPP_ diff -Nru hdrmerge-0.5+git20200117/debian/patches/series hdrmerge-0.5+git20200117/debian/patches/series --- hdrmerge-0.5+git20200117/debian/patches/series 2023-07-07 22:22:08.000000000 +0200 +++ hdrmerge-0.5+git20200117/debian/patches/series 2023-07-16 21:12:40.000000000 +0200 @@ -1 +1,2 @@ 0001-Fix-LibRaw-0.21-API-change.patch +221.patch On Wed, 14 Jun 2023 09:25:26 +0000 Matthias Klose <d...@debian.org> wrote:
Package: src:hdrmerge Version: 0.5+git20200117-2 Severity: normal Tags: sid trixie User: debian-...@lists.debian.org Usertags: ftbfs-gcc-13 [This bug is targeted to the upcoming trixie release] Please keep this issue open in the bug tracker for the package it was filed for. If a fix in another package is required, please file a bug for the other package (or clone), and add a block in this package. Please keep the issue open until the package can be built in a follow-up test rebuild. The package fails to build in a test rebuild on at least amd64 with gcc-13/g++-13, but succeeds to build with gcc-12/g++-12. The severity of this report will be raised before the trixie release. The full build log can be found at: http://qa-logs.debian.net/2023/05/22/logs/hdrmerge_0.5+git20200117-2_unstable_gccexp.log The last lines of the build log are at the end of this report. To build with GCC 13, either set CC=gcc-13 CXX=g++-13 explicitly, or install the gcc, g++, gfortran, ... packages from experimental.apt-get -t=experimental install g++Common build failures are new warnings resulting in build failures with -Werror turned on, or new/dropped symbols in Debian symbols files. For other C/C++ related build failures see the porting guide at http://gcc.gnu.org/gcc-13/porting_to.html [...] 57 | void IFD::write(uint8_t * buffer, size_t & pos, bool hasNext) { | ^ /<<PKGBUILDDIR>>/src/TiffDirectory.cpp:57:44: error: ‘pos’ was not declared in this scope 57 | void IFD::write(uint8_t * buffer, size_t & pos, bool hasNext) { | ^~~ /<<PKGBUILDDIR>>/src/TiffDirectory.cpp:57:49: error: expected primary-expression before ‘bool’ 57 | void IFD::write(uint8_t * buffer, size_t & pos, bool hasNext) { | ^~~~ /<<PKGBUILDDIR>>/src/TiffDirectory.cpp: In member function ‘size_t hdrmerge::IFD::length() const’: /<<PKGBUILDDIR>>/src/TiffDirectory.cpp:77:46: error: request for member ‘size’ in ‘((const hdrmerge::IFD*)this)->hdrmerge::IFD::entryData’, which is of non-class type ‘const int’ 77 | return 6 + 12*entries.size() + entryData.size(); | ^~~~ /<<PKGBUILDDIR>>/src/TiffDirectory.cpp: At global scope: /<<PKGBUILDDIR>>/src/TiffDirectory.cpp:81:17: error: ‘hdrmerge::IFD::DirEntry* hdrmerge::IFD::getEntry’ is not a static data member of ‘class hdrmerge::IFD’ 81 | IFD::DirEntry * IFD::getEntry(uint16_t tag) { | ^~~ /<<PKGBUILDDIR>>/src/TiffDirectory.cpp:81:31: error: ‘uint16_t’ was not declared in this scope 81 | IFD::DirEntry * IFD::getEntry(uint16_t tag) { | ^~~~~~~~ /<<PKGBUILDDIR>>/src/TiffDirectory.cpp:81:31: note: ‘uint16_t’ is defined in header ‘<cstdint>’; did you forget to ‘#include <cstdint>’? make[3]: *** [CMakeFiles/hdrmerge.dir/build.make:216: CMakeFiles/hdrmerge.dir/src/TiffDirectory.cpp.o] Error 1 make[3]: *** Waiting for unfinished jobs.... In file included from /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/hdrmerge_autogen/UVLADIE3JM/moc_AboutDialog.cpp:10, from /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/hdrmerge_autogen/mocs_compilation.cpp:2: /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/hdrmerge_autogen/UVLADIE3JM/../../../src/AboutDialog.hpp:32:68: warning: ‘constexpr QFlags<T>::QFlags(Zero) [with Enum = Qt::WindowType; Zero = int QFlags<Qt::WindowType>::Private::*]’ is deprecated: Use default constructor instead [-Wdeprecated-declarations] 32 | explicit AboutDialog(QWidget * parent = 0, Qt::WindowFlags f = 0);
OpenPGP_signature
Description: OpenPGP digital signature
