pool/geeqie
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

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

Browse Source 
- Update to version 2.1
- Disable LUA to work around gh#BestImageViewer/geeqie#1117

OBS-URL: https://build.opensuse.org/request/show/1094400
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/geeqie?expand=0&rev=51
This commit is contained in:
Luciano Santos
2023-06-28 03:39:40 +00:00
committed by Git OBS Bridge
parent 14f04afbe7
commit 108730a671
8 changed files with 39 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
6c4226ff.patch
View File

@@ -1,28 +0,0 @@
From 6c4226fff6864eb527a5602bdda0b15ae840f6fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20R=C3=B6nnquist?= <gusnan@librem.one>
Date: Sun, 11 Sep 2022 17:12:07 +0200
Subject: [PATCH] Fix appstream validation
---
org.geeqie.Geeqie.appdata.xml.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/org.geeqie.Geeqie.appdata.xml.in b/org.geeqie.Geeqie.appdata.xml.in
index e52a1986..a91678e6 100644
--- a/org.geeqie.Geeqie.appdata.xml.in
+++ b/org.geeqie.Geeqie.appdata.xml.in
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<component>
- <id type="desktop">geeqie.desktop</id>
+ <id>org.geeqie.Geeqie</id>
<metadata_license>CC-BY-SA-4.0</metadata_license>
<content_rating type="oars-1.1" />
<project_license>GPL-3.0+</project_license>
- <_name>Geeqie</_name>
- <_summary>A lightweight image viewer</_summary>
+ <name>Geeqie</name>
+ <summary>A lightweight image viewer</summary>
<description>
<p>
Geeqie is a lightweight image viewer for Linux, BSDs and compatibles.

69
eb9d0e10.patch
View File

@@ -1,69 +0,0 @@
From eb9d0e103f92ddec1bf9b113f7d6a91321a19130 Mon Sep 17 00:00:00 2001
From: Julian Hofer <julianhofer@gnome.org>
Date: Sat, 13 Aug 2022 20:56:58 +0200
Subject: [PATCH] Fix appdata and icon installation
- Appdata used invalid tags
- Icon was not installed
---
org.geeqie.Geeqie.appdata.xml.in | 9 ++++-----
src/icons/meson.build | 2 ++
src/icons/svg/{gqview_icon.svg => geeqie.svg} | 0
src/icons/svg/meson.build | 7 +++++++
4 files changed, 13 insertions(+), 5 deletions(-)
rename src/icons/svg/{gqview_icon.svg => geeqie.svg} (100%)
create mode 100644 src/icons/svg/meson.build
diff --git a/org.geeqie.Geeqie.appdata.xml.in b/org.geeqie.Geeqie.appdata.xml.in
index 2c8dbdd5..e52a1986 100644
--- a/org.geeqie.Geeqie.appdata.xml.in
+++ b/org.geeqie.Geeqie.appdata.xml.in
@@ -7,12 +7,12 @@
<_name>Geeqie</_name>
<_summary>A lightweight image viewer</_summary>
<description>
- <_p>
+ <p>
Geeqie is a lightweight image viewer for Linux, BSDs and compatibles.
- </_p>
- <_p>
+ </p>
+ <p>
It can be used as a simple, fast, database-free image viewer, but equally it can be used to manage large collections of images.
- </_p>
+ </p>
</description>
<screenshots>
<screenshot type="default">
@@ -35,4 +35,3 @@
<update_contact>geeqie@freelists.org</update_contact>
<translation type="gettext">geeqie</translation>
</component>
-
diff --git a/src/icons/meson.build b/src/icons/meson.build
index ee55ab3a..55d76268 100644
--- a/src/icons/meson.build
+++ b/src/icons/meson.build
@@ -67,3 +67,5 @@ icons_inline_h = custom_target('icons_inline', output : 'icons_inline.h',
capture : true)
project_sources += icons_inline_h
+
+subdir('svg')
diff --git a/src/icons/svg/gqview_icon.svg b/src/icons/svg/geeqie.svg
similarity index 100%
rename from src/icons/svg/gqview_icon.svg
rename to src/icons/svg/geeqie.svg
diff --git a/src/icons/svg/meson.build b/src/icons/svg/meson.build
new file mode 100644
index 00000000..12c771eb
--- /dev/null
+++ b/src/icons/svg/meson.build
@@ -0,0 +1,7 @@
+datadir = prefix / get_option('datadir')
+iconsdir = datadir / 'icons'
+
+install_data(
+ 'geeqie.svg',
+ install_dir: iconsdir / 'hicolor' / 'scalable' / 'apps',
+)

3
geeqie-2.0.1.tar.xz
View File

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

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

@@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEkexAAiYgEnbirc7H0NpvRMk20doFAmL2HzUACgkQ0NpvRMk2
0drfFxAAu6efDHWKURRjLL6bzQ50TXLAdbWOckTqC4miNhtgZ8Ohr60fOaRqMCSP
DPmbY3f1SCzzjK+3ZCxmZFJ7fQkftCbV1RjxT2G030yhkEs+8Paf2cLADTH+vuag
owKPaAQmvNMKTutqWV83frNNU4CPVsoKf8RMq4XzmHumWUlxMwjJKf4t924yEWOn
NZGmyilqaC8mBYiAwQAzfDq5R+3uHbedK+yEX7h9gXRG19g2+eJcXp1BAAnbOG58
dKXkwm0o4+heL1W9ohtRts9QSwcAsM42ZJunNgOg7HC0r5Z0sBluKXq/+kL7sgvR
45YSAxvP/PDnNhHFGscLgAlv2pkoBaX0w5Ngs/clLnpUg6ZW7PSRqs8S/P/cfPPR
74M+XpUJvx4mHJmd4w3KHYBgJwFUIgdBIHWP7j6AJQv1OCjYFoqPOWcRZ7akHgGo
bvZ7Yz/NJT/vm/Sv4DVSwqSt8EoYt583aXJRlkcbjWnwYVU/4aj2BWFV6N/UONRp
YM1KXVTKROr1gVHjJODey8d9c39VLIo3Qi3JRiEIR0SoLWoGmbwFEl9BIu9zlkaA
dStcwY95w8JU9jb/0h/9ql8WqAwpBrNjFf1ZzN6Mb1Y5aENoDyijWfsYufZ4o9RY
LOKFPDdrs+LVRqrcqzEBDVphZS+RWTiFExrV7OjQ2o59PJBDjMM=
=uCtA
-----END PGP SIGNATURE-----

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

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

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

@@ -0,0 +1,16 @@
-----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-----

15
geeqie.changes
View File

@@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Jun 21 16:05:29 UTC 2023 - Marcel Kuehlhorn <tux93@opensuse.org>
- Update to version 2.1:
+ Additional --selection remote commands
+ Split view additional 3-image layout
+ Many bug fixes
+ Some progress in GTK4 migration
+ Change source code from c to c++
+ Much progress in making source code warning-free
+ Updated language support
- Remove 6c4226ff.patch and eb9d0e10.patch
they are part of the release
- Disable LUA to work around gh#BestImageViewer/geeqie#1117
-------------------------------------------------------------------
Tue May 9 17:05:21 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>

11
geeqie.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package geeqie
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 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.0.1
Version: 2.1
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
Patch0: https://github.com/BestImageViewer/geeqie/commit/eb9d0e10.patch
Patch1: https://github.com/BestImageViewer/geeqie/commit/6c4226ff.patch
BuildRequires: c++_compiler
BuildRequires: docbook_4
BuildRequires: doxygen
@@ -72,7 +70,8 @@ Geeqie is a lightweight image viewer for Linux, BSDs and compatibles.
%build
%meson \
-Dgq_helpdir=%{_docdir}/%{name} \
-Dgq_htmldir=%{_docdir}/%{name}
-Dgq_htmldir=%{_docdir}/%{name} \
-Dlua=disabled
%meson_build
%install
@@ -86,7 +85,7 @@ rm %{buildroot}%{_docdir}/%{name}/COPYING
%files
%license COPYING
%doc AUTHORS NEWS TODO README.md
%doc NEWS TODO README.md
%doc %{_docdir}/%{name}/html
%{_bindir}/geeqie
%{_datadir}/applications/geeqie.desktop