From 7cb7594a8c302ae08877137b994a086b08f960f4 Mon Sep 17 00:00:00 2001 From: rsadowski Date: Sat, 7 Jan 2023 20:21:31 +0000 Subject: [PATCH] Unbreak build with LibRaw-0.21.0, patches from upstream --- graphics/gthumb/Makefile | 2 +- ...ions_raw_files_gth-metadata-provider-raw_c | 13 +++++++++++ ...ions_raw_files_gth-metadata-provider-raw_h | 18 +++++++++++++++ .../patches/patch-extensions_raw_files_main_c | 22 +++++++++++++++++++ 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_c create mode 100644 graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_h create mode 100644 graphics/gthumb/patches/patch-extensions_raw_files_main_c diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile index df713556b6b..e8ba3c2dcf3 100644 --- a/graphics/gthumb/Makefile +++ b/graphics/gthumb/Makefile @@ -2,7 +2,7 @@ COMMENT= image viewer and browser for GNOME GNOME_PROJECT= gthumb GNOME_VERSION= 3.12.2 -REVISION= 1 +REVISION= 2 CATEGORIES= graphics diff --git a/graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_c b/graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_c new file mode 100644 index 00000000000..822869ef4eb --- /dev/null +++ b/graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_c @@ -0,0 +1,13 @@ +https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec +Index: extensions/raw_files/gth-metadata-provider-raw.c +--- extensions/raw_files/gth-metadata-provider-raw.c.orig ++++ extensions/raw_files/gth-metadata-provider-raw.c +@@ -62,7 +62,7 @@ gth_metadata_provider_raw_read (GthMetadataProvider *s + 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/graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_h b/graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_h new file mode 100644 index 00000000000..d1a24558979 --- /dev/null +++ b/graphics/gthumb/patches/patch-extensions_raw_files_gth-metadata-provider-raw_h @@ -0,0 +1,18 @@ +https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec +Index: extensions/raw_files/gth-metadata-provider-raw.h +--- extensions/raw_files/gth-metadata-provider-raw.h.orig ++++ extensions/raw_files/gth-metadata-provider-raw.h +@@ -25,6 +25,13 @@ + #include + #include + #include ++#include ++ ++#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/graphics/gthumb/patches/patch-extensions_raw_files_main_c b/graphics/gthumb/patches/patch-extensions_raw_files_main_c new file mode 100644 index 00000000000..a65cd805f0c --- /dev/null +++ b/graphics/gthumb/patches/patch-extensions_raw_files_main_c @@ -0,0 +1,22 @@ +https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec +Index: extensions/raw_files/main.c +--- extensions/raw_files/main.c.orig ++++ extensions/raw_files/main.c +@@ -213,7 +213,7 @@ _cairo_image_surface_create_from_raw (GInputStream *i + 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 *i + 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; +