Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gthumb for openSUSE:Factory checked in at 2023-01-17 17:35:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gthumb (Old) and /work/SRC/openSUSE:Factory/.gthumb.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gthumb" Tue Jan 17 17:35:34 2023 rev:112 rq:1058842 version:3.12.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gthumb/gthumb.changes 2022-04-27 21:42:10.605074213 +0200 +++ /work/SRC/openSUSE:Factory/.gthumb.new.32243/gthumb.changes 2023-01-17 17:35:47.553347169 +0100 @@ -1,0 +2,5 @@ +Mon Jan 16 12:07:51 UTC 2023 - Dominique Leuenberger <dims...@opensuse.org> + +- Add da0d3f22.patch: Fix build with libraw 0.21. + +------------------------------------------------------------------- New: ---- da0d3f22.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gthumb.spec ++++++ --- /var/tmp/diff_new_pack.D9pwMC/_old 2023-01-17 17:35:48.193350778 +0100 +++ /var/tmp/diff_new_pack.D9pwMC/_new 2023-01-17 17:35:48.197350800 +0100 @@ -1,7 +1,7 @@ # # spec file for package gthumb # -# 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 @@ -25,7 +25,8 @@ Group: Productivity/Graphics/Viewers URL: https://wiki.gnome.org/Apps/gthumb Source0: https://download.gnome.org/sources/gthumb/3.12/%{name}-%{version}.tar.xz - +# PATCH-FIx-UPSTREAM da0d3f22.patch dims...@opensuse.org -- Fix build with libraw 0.21 +Patch0: https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22.patch BuildRequires: AppStream BuildRequires: bison BuildRequires: fdupes ++++++ da0d3f22.patch ++++++ >From da0d3f22a5c3a141211d943e7d963d14090011ec Mon Sep 17 00:00:00 2001 From: Paolo Bacchilega <pao...@src.gnome.org> Date: Fri, 23 Dec 2022 17:37:03 +0100 Subject: [PATCH] Fixed build with libraw 0.21 --- extensions/raw_files/gth-metadata-provider-raw.c | 2 +- extensions/raw_files/gth-metadata-provider-raw.h | 7 +++++++ extensions/raw_files/main.c | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/extensions/raw_files/gth-metadata-provider-raw.c b/extensions/raw_files/gth-metadata-provider-raw.c index 2d9f5020..1aa8a727 100644 --- a/extensions/raw_files/gth-metadata-provider-raw.c +++ b/extensions/raw_files/gth-metadata-provider-raw.c @@ -62,7 +62,7 @@ gth_metadata_provider_raw_read (GthMetadataProvider *self, if (!_g_mime_type_is_raw (gth_file_data_get_mime_type (file_data))) return; - raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK); + raw_data = libraw_init (GTH_LIBRAW_INIT_OPTIONS); if (raw_data == NULL) goto fatal_error; diff --git a/extensions/raw_files/gth-metadata-provider-raw.h b/extensions/raw_files/gth-metadata-provider-raw.h index 6406c68b..cf19434d 100644 --- a/extensions/raw_files/gth-metadata-provider-raw.h +++ b/extensions/raw_files/gth-metadata-provider-raw.h @@ -25,6 +25,13 @@ #include <glib.h> #include <glib-object.h> #include <gthumb.h> +#include <libraw.h> + +#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21) +#define GTH_LIBRAW_INIT_OPTIONS (LIBRAW_OPIONS_NO_DATAERR_CALLBACK) +#else +#define GTH_LIBRAW_INIT_OPTIONS (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK) +#endif #define GTH_TYPE_METADATA_PROVIDER_RAW (gth_metadata_provider_raw_get_type ()) #define GTH_METADATA_PROVIDER_RAW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTH_TYPE_METADATA_PROVIDER_RAW, GthMetadataProviderRaw)) diff --git a/extensions/raw_files/main.c b/extensions/raw_files/main.c index 25829c12..0673c2c7 100644 --- a/extensions/raw_files/main.c +++ b/extensions/raw_files/main.c @@ -213,7 +213,7 @@ _cairo_image_surface_create_from_raw (GInputStream *istream, size_t size; GthImage *image = NULL; - raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK); + raw_data = libraw_init (GTH_LIBRAW_INIT_OPTIONS); if (raw_data == NULL) { _libraw_set_gerror (error, errno); goto fatal_error; @@ -300,7 +300,7 @@ _cairo_image_surface_create_from_raw (GInputStream *istream, if ((original_width != NULL) && (original_height != NULL)) { libraw_close (raw_data); - raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK); + raw_data = libraw_init (GTH_LIBRAW_INIT_OPTIONS); if (raw_data == NULL) goto fatal_error; -- GitLab
