[PR PATCH] gthumb: update to 3.12.3.

[PR PATCH] gthumb: update to 3.12.3.

[Bnyro]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

There is a new pull request by Bnyro against master on the void-packages repository

https://github.com/Bnyro/void-packages gthumb
https://github.com/void-linux/void-packages/pull/45971

gthumb: update to 3.12.3.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc



A patch file from https://github.com/void-linux/void-packages/pull/45971.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gthumb-45971.patch --]
[-- Type: text/x-diff, Size: 4398 bytes --]

From 838bb78ddd65acce693c5a0636294cd85e7e5b42 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 8 Sep 2023 13:37:54 +0200
Subject: [PATCH] gthumb: update to 3.12.3.

---
 srcpkgs/gthumb/patches/libraw-0.21.patch | 67 ------------------------
 srcpkgs/gthumb/template                  |  6 +--
 2 files changed, 3 insertions(+), 70 deletions(-)
 delete mode 100644 srcpkgs/gthumb/patches/libraw-0.21.patch

diff --git a/srcpkgs/gthumb/patches/libraw-0.21.patch b/srcpkgs/gthumb/patches/libraw-0.21.patch
deleted file mode 100644
index ee1faf6b07cf7..0000000000000
--- a/srcpkgs/gthumb/patches/libraw-0.21.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From da0d3f22a5c3a141211d943e7d963d14090011ec Mon Sep 17 00:00:00 2001
-From: Paolo Bacchilega <paobac@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 2d9f5020c..1aa8a727e 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 6406c68bf..cf19434df 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 25829c120..0673c2c75 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
-
diff --git a/srcpkgs/gthumb/template b/srcpkgs/gthumb/template
index 7e8de5b6817a8..c8e19f0dedb61 100644
--- a/srcpkgs/gthumb/template
+++ b/srcpkgs/gthumb/template
@@ -1,7 +1,7 @@
 # Template file for 'gthumb'
 pkgname=gthumb
-version=3.12.2
-revision=3
+version=3.12.3
+revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel"
 makedepends="webkit2gtk-devel json-glib-devel libsecret-devel librsvg-devel
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/Gthumb"
 changelog="https://gitlab.gnome.org/GNOME/gthumb/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gthumb/${version%.*}/gthumb-${version}.tar.xz"
-checksum=97f8afe522535216541ebbf1e3b546d12a6beb38a8f0eb85f26e676934aad425
+checksum=93db35d71402c48a082d50cf4085bb6b80e4bd5c8b9b161a1f7b51841b100711
 
 LDFLAGS="-fPIC"
 

Re: [PR PATCH] [Merged]: gthumb: update to 3.12.3.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

There's a merged pull request on the void-packages repository

gthumb: update to 3.12.3.
https://github.com/void-linux/void-packages/pull/45971

Description:

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc