Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ufraw for openSUSE:Factory checked in at 2023-08-17 19:44:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ufraw (Old) and /work/SRC/openSUSE:Factory/.ufraw.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ufraw" Thu Aug 17 19:44:14 2023 rev:54 rq:1104305 version:0.22 Changes: -------- --- /work/SRC/openSUSE:Factory/ufraw/ufraw.changes 2022-05-12 22:59:53.568759138 +0200 +++ /work/SRC/openSUSE:Factory/.ufraw.new.1766/ufraw.changes 2023-08-17 19:44:33.450902945 +0200 @@ -1,0 +2,6 @@ +Tue Jul 11 11:25:13 UTC 2023 - [email protected] + +- Add ufraw-0.22-exiv2-0.28.patch to fix build with exiv 0.28. + (https://cgit.freebsd.org/ports/tree/graphics/ufraw/files/patch-ufraw__exiv2.cc) + +------------------------------------------------------------------- New: ---- ufraw-0.22-exiv2-0.28.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ufraw.spec ++++++ --- /var/tmp/diff_new_pack.iZdZuu/_old 2023-08-17 19:44:34.418904756 +0200 +++ /var/tmp/diff_new_pack.iZdZuu/_new 2023-08-17 19:44:34.426904771 +0200 @@ -1,7 +1,7 @@ # # spec file for package ufraw # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,7 +42,8 @@ Patch11: 06_lensfun_destroy_cleanup.patch Patch12: Fix-build-with-GCC9.patch Patch13: ufraw-fix-c++.patch - +# PATCH-FIX-FREEBSD: ufraw-0.22-exiv2-0.28.patch https://cgit.freebsd.org/ports/diff/graphics/ufraw/files/patch-ufraw__exiv2.cc?id=0e4d3e69d22d89c1e0972f90bab859473c3935ca +Patch14: ufraw-0.22-exiv2-0.28.patch BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libjpeg-devel ++++++ ufraw-0.22-exiv2-0.28.patch ++++++ --- a/ufraw_exiv2.cc +++ b/ufraw_exiv2.cc @@ -50,10 +50,10 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf) uf->inputExifBuf = NULL; uf->inputExifBufLen = 0; - Exiv2::Image::AutoPtr image; + Exiv2::Image::UniquePtr image; if (uf->unzippedBuf != NULL) { - image = Exiv2::ImageFactory::open( - (const Exiv2::byte*)uf->unzippedBuf, uf->unzippedBufLen); + image = std::move(Exiv2::ImageFactory::open( + (const Exiv2::byte*)uf->unzippedBuf, uf->unzippedBufLen)); } else { char *filename = uf_win32_locale_filename_from_utf8(uf->filename); image = Exiv2::ImageFactory::open(filename); @@ -66,7 +66,9 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf) if (exifData.empty()) { std::string error(uf->filename); error += ": No Exif data found in the file"; -#if EXIV2_TEST_VERSION(0,27,0) +#if EXIV2_TEST_VERSION(0,28,0) + throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, error); +#elif EXIV2_TEST_VERSION(0,27,0) throw Exiv2::Error(Exiv2::kerErrorMessage, error); #else throw Exiv2::Error(1, error); @@ -135,7 +137,7 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf) ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str()); return UFRAW_SUCCESS; - } catch (Exiv2::AnyError& e) { + } catch (Exiv2::Error& e) { std::cerr.rdbuf(savecerr); std::string s(e.what()); ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str()); @@ -155,8 +157,8 @@ static Exiv2::ExifData ufraw_prepare_exifdata(ufraw_da /* Reset orientation tag since UFRaw already rotates the image */ if ((pos = exifData.findKey(Exiv2::ExifKey("Exif.Image.Orientation"))) != exifData.end()) { - ufraw_message(UFRAW_SET_LOG, "Resetting %s from '%d' to '1'\n", - pos->key().c_str(), pos->value().toLong()); + ufraw_message(UFRAW_SET_LOG, "Resetting %s from '%ld' to '1'\n", + pos->key().c_str(), static_cast<long int>(pos->value().toInt64())); pos->setValue("1"); /* 1 = Normal orientation */ } } @@ -327,7 +329,7 @@ extern "C" int ufraw_exif_prepare_output(ufraw_data *u ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str()); return UFRAW_SUCCESS; - } catch (Exiv2::AnyError& e) { + } catch (Exiv2::Error& e) { std::cerr.rdbuf(savecerr); std::string s(e.what()); ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str()); @@ -347,7 +349,7 @@ extern "C" int ufraw_exif_write(ufraw_data *uf) char *filename = uf_win32_locale_filename_from_utf8(uf->conf->outputFilename); - Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename); + Exiv2::Image::UniquePtr image { Exiv2::ImageFactory::open(filename) }; uf_win32_locale_filename_free(filename); assert(image.get() != 0); @@ -367,7 +369,7 @@ extern "C" int ufraw_exif_write(ufraw_data *uf) ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str()); return UFRAW_SUCCESS; - } catch (Exiv2::AnyError& e) { + } catch (Exiv2::Error& e) { std::cerr.rdbuf(savecerr); std::string s(e.what()); ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str());
