[PR PATCH] geeqie: update to 2.2.

[PR PATCH] geeqie: update to 2.2.

[icp1994]

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

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

https://github.com/icp1994/void-packages geeqie
https://github.com/void-linux/void-packages/pull/48463

geeqie: update to 2.2.
#### 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**

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

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

From 7268e306fa6b93b3ff28ae5a7eaa62efbc30f724 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 26 Jan 2024 13:10:17 +0530
Subject: [PATCH] geeqie: update to 2.2.

---
 .../geeqie/patches/exiv-fix-double-free.patch | 14 ------------
 srcpkgs/geeqie/patches/fix-musl.patch         | 22 -------------------
 srcpkgs/geeqie/template                       |  6 ++---
 3 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/geeqie/patches/exiv-fix-double-free.patch
 delete mode 100644 srcpkgs/geeqie/patches/fix-musl.patch

diff --git a/srcpkgs/geeqie/patches/exiv-fix-double-free.patch b/srcpkgs/geeqie/patches/exiv-fix-double-free.patch
deleted file mode 100644
index c38aa63268bf0..0000000000000
--- a/srcpkgs/geeqie/patches/exiv-fix-double-free.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/exiv2.cc b/src/exiv2.cc
-index a8ff73da..c26ba206 100644
---- a/src/exiv2.cc
-+++ b/src/exiv2.cc
-@@ -1223,7 +1223,8 @@ guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width,
- 
- #if EXIV2_TEST_VERSION(0,28,0)
-                        *data_len = buf.size();
--                       auto b = buf.data();
-+                       Exiv2::byte* b = new Exiv2::byte[*data_len];
-+                       std::copy(buf.cbegin(), buf.cend(), b);
-                        buf.reset();
-                        return b;
- #else
diff --git a/srcpkgs/geeqie/patches/fix-musl.patch b/srcpkgs/geeqie/patches/fix-musl.patch
deleted file mode 100644
index 9a21dd6334f6e..0000000000000
--- a/srcpkgs/geeqie/patches/fix-musl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 01d8762d45a2f3871cfd09176edbccdbe73a6767 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <wiz@gatalith.at>
-Date: Sat, 17 Jun 2023 18:47:28 +0200
-Subject: [PATCH] Add missing header for setlocale().
-
----
- src/misc.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/misc.cc b/src/misc.cc
-index 9942605c..a2ad3eb6 100644
---- a/src/misc.cc
-+++ b/src/misc.cc
-@@ -18,6 +18,8 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#include <locale.h>
-+
- #include "main.h"
- #include "misc.h"
- 
diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 6be74fd8724d3..7ce0381d35065 100644
--- a/srcpkgs/geeqie/template
+++ b/srcpkgs/geeqie/template
@@ -1,7 +1,7 @@
 # Template file for 'geeqie'
 pkgname=geeqie
-version=2.1
-revision=3
+version=2.2
+revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext xxd gdk-pixbuf-devel glib-devel"
 makedepends="gtk+3-devel glib-devel lcms2-devel exiv2-devel libheif-devel
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.geeqie.org"
 changelog="https://raw.githubusercontent.com/BestImageViewer/geeqie/master/NEWS"
 distfiles="https://github.com/BestImageViewer/geeqie/archive/refs/tags/v${version}.tar.gz"
-checksum=61edff10540bcee01af7ff0dbc3658c99c2e27854a7dc2915b44624ec39b8744
+checksum=f1b04622f9730eaff588f2751e34b75869453f1e3ab8e3b48cb70813312816ce

Re: [PR PATCH] [Merged]: geeqie: update to 2.2.

[classabbyamp]

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

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

geeqie: update to 2.2.
https://github.com/void-linux/void-packages/pull/48463

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**