Unbreak build with LibRaw-0.21.0, patches from upstream
This commit is contained in:
parent
560240df93
commit
7cb7594a8c
|
@ -2,7 +2,7 @@ COMMENT= image viewer and browser for GNOME
|
||||||
|
|
||||||
GNOME_PROJECT= gthumb
|
GNOME_PROJECT= gthumb
|
||||||
GNOME_VERSION= 3.12.2
|
GNOME_VERSION= 3.12.2
|
||||||
REVISION= 1
|
REVISION= 2
|
||||||
|
|
||||||
CATEGORIES= graphics
|
CATEGORIES= graphics
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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 <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))
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue