pool/geeqie
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1141705 from home:tux93:branches:GNOME:Apps

Browse Source 
- Update to version 2.2:
- Remove exiv_0-28.patch, it's part of the release

OBS-URL: https://build.opensuse.org/request/show/1141705
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/geeqie?expand=0&rev=55
This commit is contained in:
Dominique Leuenberger 2024-01-29 12:04:43 +00:00 committed by Git OBS Bridge
parent fbd3119de9
commit 64cfca7beb
7 changed files with 44 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
exiv_0-28.patch
View File

@ -1,151 +0,0 @@
From c45cca777aa3477eaf297db99f337e18d9683c61 Mon Sep 17 00:00:00 2001
From: Kevin Backhouse <kevinbackhouse@github.com>
Date: Wed, 21 Jun 2023 12:23:33 +0100
Subject: [PATCH] Add ExifData as extra argument to
exif_item_get_data_as_text().
---
src/advanced-exif.cc | 2 +-
src/exif-common.cc | 2 +-
src/exif.cc | 8 ++++----
src/exif.h | 2 +-
src/exiv2.cc | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc
index 79a54b12..e3d3067a 100644
--- a/src/advanced-exif.cc
+++ b/src/advanced-exif.cc
@@ -120,7 +120,7 @@ static void advanced_exif_update(ExifWin *ew)
tag = g_strdup_printf("0x%04x", exif_item_get_tag_id(item));
tag_name = exif_item_get_tag_name(item);
format = exif_item_get_format_name(item, TRUE);
- text = exif_item_get_data_as_text(item);
+ text = exif_item_get_data_as_text(item, exif);
utf8_text = utf8_validate_or_convert(text);
g_free(text);
elements = g_strdup_printf("%d", exif_item_get_elements(item));
diff --git a/src/exif-common.cc b/src/exif-common.cc
index 6a4c9740..b6f07ca6 100644
--- a/src/exif-common.cc
+++ b/src/exif-common.cc
@@ -995,7 +995,7 @@ gchar *exif_get_data_as_text(ExifData *exif, const gchar *key)
if (key_valid) return text;
item = exif_get_item(exif, key);
- if (item) return exif_item_get_data_as_text(item);
+ if (item) return exif_item_get_data_as_text(item, exif);
return nullptr;
}
diff --git a/src/exif.cc b/src/exif.cc
index 8708ff53..cda2cb1a 100644
--- a/src/exif.cc
+++ b/src/exif.cc
@@ -1454,7 +1454,7 @@ gchar *exif_item_get_string(ExifItem *item, gint UNUSED(idx))
return exif_item_get_data_as_text_full(item, METADATA_PLAIN);
}
-gchar *exif_item_get_data_as_text(ExifItem *item)
+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif)
{
return exif_item_get_data_as_text_full(item, METADATA_FORMATTED);
}
@@ -1527,11 +1527,11 @@ gchar *exif_get_tag_description_by_key(const gchar *key)
return NULL;
}
-static void exif_write_item(FILE *f, ExifItem *item)
+static void exif_write_item(FILE *f, ExifItem *item, ExifData *exif)
{
gchar *text;
- text = exif_item_get_data_as_text(item);
+ text = exif_item_get_data_as_text(item, exif);
if (text)
{
gchar *tag = exif_item_get_tag_name(item);
@@ -1578,7 +1578,7 @@ void exif_write_data_list(ExifData *exif, FILE *f, gint human_readable_list)
item = (ExifItem*)(work->data);
work = work->next;
- exif_write_item(f, item);
+ exif_write_item(f, item, exif);
}
}
g_fprintf(f, "----------------------------------------------------\n");
diff --git a/src/exif.h b/src/exif.h
index fcc7d8f5..4b03c201 100644
--- a/src/exif.h
+++ b/src/exif.h
@@ -136,7 +136,7 @@ gchar *exif_item_get_data(ExifItem *item, guint *data_len);
gchar *exif_item_get_description(ExifItem *item);
guint exif_item_get_format_id(ExifItem *item);
const gchar *exif_item_get_format_name(ExifItem *item, gboolean brief);
-gchar *exif_item_get_data_as_text(ExifItem *item);
+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif);
gint exif_item_get_integer(ExifItem *item, gint *value);
ExifRational *exif_item_get_rational(ExifItem *item, gint *sign, guint n);
diff --git a/src/exiv2.cc b/src/exiv2.cc
index 33b779e7..dc62e8e0 100644
--- a/src/exiv2.cc
+++ b/src/exiv2.cc
@@ -778,13 +778,13 @@ const char *exif_item_get_format_name(ExifItem *item, gboolean UNUSED(brief))
}
-gchar *exif_item_get_data_as_text(ExifItem *item)
+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif)
{
try {
if (!item) return nullptr;
auto metadatum = reinterpret_cast<Exiv2::Metadatum *>(item);
#if EXIV2_TEST_VERSION(0,17,0)
- return utf8_validate_or_convert(metadatum->print().c_str());
+ return utf8_validate_or_convert(metadatum->print(&exif->exifData()).c_str());
#else
std::stringstream str;
Exiv2::Exifdatum *exifdatum;
From b04f7cd0546976dc4f7ea440648ac0eedd8df3ce Mon Sep 17 00:00:00 2001
From: Colin Clark <colin.clark@cclark.uk>
Date: Wed, 21 Jun 2023 14:24:41 +0100
Subject: [PATCH] Remove exiv2 0.28.0 restriction
https://github.com/BestImageViewer/geeqie/pull/1119
The bug was fixed in the above commit.
---
meson.build | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/meson.build b/meson.build
index a4cab49c..412399fe 100644
--- a/meson.build
+++ b/meson.build
@@ -280,15 +280,7 @@ else
endif
exiv2_dep = []
-# See https://github.com/BestImageViewer/geeqie/issues/1090
-# for the reason for 0.28.0 exclusion
-req_version = ['>=0.11', '!=0.28.0']
-
-req_version_str = ''
-foreach req_version_str_ : req_version
- req_version_str += req_version_str_
-endforeach
-
+req_version = '>=0.11'
option = get_option('exiv2')
if not option.disabled()
exiv2_dep = dependency('exiv2', version : req_version, required : get_option('exiv2'))
@@ -296,7 +288,7 @@ if not option.disabled()
conf_data.set('HAVE_EXIV2', 1)
summary({'exiv2' : ['image metadata processed by exiv2:', true]}, section : 'Configuration', bool_yn : true)
else
- summary({'exiv2' : ['exiv2 ' + req_version_str + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
+ summary({'exiv2' : ['exiv2 ' + req_version + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
endif
else
summary({'exiv2' : ['disabled - image data processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)

3
geeqie-2.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d0511b7840169d37e457880d1ab2a787c52b609a0ab8fa1a8a391e841fdd2dde
size 1800612

16
geeqie-2.1.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEkexAAiYgEnbirc7H0NpvRMk20doFAmSNo6gACgkQ0NpvRMk2
0dqVYBAAjXiZKkjTuuyHBkNe6/Aa6R+7B/6hOU2QiT+R3lp0gFhfQj/bl2tUcwHZ
ZdszCHeKWaeNAysRRmSGE2BKtAgxQ0HdC9eGil/9/aKQsiZp1zgS31imY7n08og0
Bw9jYnISwdmJrx7886PsxNDHt0SbcVO3vlSgMnceR/pxf+lNEYmW6nTLxKU4sXB6
V/EEtaAT5shivkEGqLagTfCN9cEIHoY7XyJiAWiqHDcX0npp5YGxsBcqfPHuPChG
ZUX7c29hW0V6qUmy511ivj3qfHRZ6uOMMCfL4qdQt6148df4bVTXPxjF7Gyw0uVL
lnBhwYKEYgfdcYqyrccQB8uKl4zxNfSkBIgHuwEdneFVqO0aKPOiZxgqH87uIXd7
AL+WG6lV/ftoELlNBd0sRraNTtF8SLsuit5s9whRuANGnbjylgcw8SMH94g6ooec
EbgS12Yb3ggujEkMBfCkxw7ohbfvGIuWkEBkbh+9PvzUDHKKhFwiIHCqanN9+QPk
9R8Hk6pc4njmulvDr5sP5EI+yg1a0EsqiqeFPLZGXCVaQfE5e+YlRqfCBCKfRbrA
y7affhC4GkEiArhA5fplYetVq+etorFK9apt1sGWIMdN61uefPA16T3lk9RxuRHm
9PAYtZvkR2jKBqE8wDkRq8VsQij6kYFFDOv6MeSkClRzxA3/2yE=
=WWHe
-----END PGP SIGNATURE-----

3
geeqie-2.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:899ac33b801e0e83380f79e9094bc2615234730ccf6a02d93fd6da3e6f8cfe94
size 2169096

16
geeqie-2.2.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEkexAAiYgEnbirc7H0NpvRMk20doFAmWyPHUACgkQ0NpvRMk2
0drW1RAApsl53/LyYgzsthXIHYnVGJ3WXbxssLnGIssMZRJOP2qNh0dVhs57bh4F
OC3ITgHa4DaExtNJIfcO1+wZIrpnekv2dSnEthLNwzzlDtD+zPGTsAyPImnaunmv
BUNY3Q/qR0KTkMzzbMQuOaBulMtgoAB+Sg/BV7bp/GVDvN1MOZN1/C1NQs7QNeun
jWohbLLoYog4rQmAwFKjqTbOfeyV8iQSq/Yji7P7gxgshdT7owKJGOXdD7Lbugql
TGRbRSHRk64EDXTqAK4o31KKrgWtLKvlTapA+R3tlmVotyTW1n7qG/5lq9Azrxf/
BgraK/FllRZWVQWxyhVGXiScDeDGSZ9PvqHT4RBAakthRPaUDSeccmbHsWkj3tLD
V8LeZIarFTi/YWAqPqVi7ZtY4QRvSfccZ3UMFRRi5QknRe8jtbyYeZfUMlNvOjKe
W9fN53aL9x9RQNkWb6ESo1zeyAJPv/mjIosZ/B86tFr6Tp+P3TJoNLeFymGkrhPT
eaEwifGz2jKrSLLUcywEwubErdh5fi1M/HmKhl1pxGX0LSfO88W356KFOM8l5VD6
+A2cMxSm58gEP93Yc8fJBOYiBK3TEnezR8U6h/hnB4B7XRlJUFiR8e2nep+R7kF+
aux8g2VH0GF3O58E+G0RZBiu+MDIU7+OGtnOCjdJvVBz1av+Qkc=
=jyQf
-----END PGP SIGNATURE-----

20
geeqie.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Fri Jan 26 09:42:15 UTC 2024 - Marcel Kuehlhorn <tux93@opensuse.org>
- Update to version 2.2:
+ Enhanced debug output with -Ddevel=enabled option
+ Modify Collections user interface
+ Remote keyboard actions
+ Allow .desktop files to be linked to programmable mouse buttons
+ Option to show-hide selectable bars
+ On exit additional check for multiple windows open
+ Plugin to resize an image
+ Include a separator as a toolbar option
+ Change all .desktop files to RDNS style
+ GTK "Open With" feature menu option
+ Reduce the height of toolbars
+ Option to select "hamburger" menu style
+ More progress in GTK4 migration
+ Many bug fixes
- Remove exiv_0-28.patch, it's part of the release
-------------------------------------------------------------------
Wed Jul 5 15:21:33 UTC 2023 - Marcel Kuehlhorn <tux93@opensuse.org>

12
geeqie.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package geeqie
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: geeqie
Version: 2.1
Version: 2.2
Release: 0
Summary: Lightweight Gtk+ based image viewer
License: GPL-2.0-or-later
@ -26,8 +26,6 @@ URL: http://www.geeqie.org
Source0: https://github.com/BestImageViewer/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
Source1: https://github.com/BestImageViewer/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc
Source2: geeqie.keyring
# PATCH-FIX-UPSTREAM exiv_0-28.patch Fix an Issue with exiv2 0.28
Patch0: exiv_0-28.patch
BuildRequires: c++_compiler
BuildRequires: docbook_4
BuildRequires: doxygen
@ -59,7 +57,7 @@ BuildRequires: pkgconfig(libwebp) >= 0.6.1
BuildRequires: pkgconfig(lua5.3)
BuildRequires: pkgconfig(poppler-glib) >= 0.62
Requires(post): update-desktop-files
Requires(postun):update-desktop-files
Requires(postun): update-desktop-files
%description
Geeqie is a lightweight image viewer for Linux, BSDs and compatibles.
@ -79,7 +77,7 @@ Geeqie is a lightweight image viewer for Linux, BSDs and compatibles.
%install
%meson_install
%find_lang %{name} %{?no_lang_C}
%suse_update_desktop_file %{name}
%suse_update_desktop_file org.geeqie.Geeqie
%fdupes %{buildroot}/%{_prefix}
# Already in the license directory
@ -90,7 +88,7 @@ rm %{buildroot}%{_docdir}/%{name}/COPYING
%doc NEWS TODO README.md
%doc %{_docdir}/%{name}/html
%{_bindir}/geeqie
%{_datadir}/applications/geeqie.desktop
%{_datadir}/applications/org.geeqie.Geeqie.desktop
%{_datadir}/icons/hicolor/scalable/apps/geeqie.svg
%{_datadir}/geeqie/
%{_datadir}/pixmaps/geeqie.png