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

Accepting request 1034570 from GNOME:Apps

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1034570
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/geeqie?expand=0&rev=28
This commit is contained in:
Dominique Leuenberger
2022-11-09 11:57:21 +00:00
committed by Git OBS Bridge
parent ef26aeddb1 ac52204b8e
commit c724b5f2dc
8 changed files with 128 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
6c4226ff.patch Normal file
View File

@@ -0,0 +1,28 @@
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 Normal file
View File

@@ -0,0 +1,69 @@
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 Normal file
View File

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

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

@@ -0,0 +1,16 @@
-----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.0.tar.xz
View File

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

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

@@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEkexAAiYgEnbirc7H0NpvRMk20doFAmLxHDYACgkQ0NpvRMk2
0dp87A/+NVhtAWnMJtfO5R0XIlv390ruqD50JQsoGIHHgTzcSD1sxH/Kx38us38r
CAGr1LG7Q6vQr3gKEQKA8SPjI3oLpbwOYZfjppXehpo88ua05L7ZOsoSAH3Qkb7G
HNNK55rlL9mU/bOuLEYgv9Qj3lOq5jx6pX2zXQUBt90CaUROjx9/eomSnCcmI3eF
/UZP7hIk0XuvAmd4r4DDPTAfcqkrgQ2czZgL5kIFRwL2RqrGClUgK1degq9AN88X
H6YyPRZsXnh/aJDIoOYvR/1gV4KBnTjT6+R+Vt9gm075vWGnDRtObmkEcaHKbQ2f
rlgN7uSC1KDkbdRbI6bNS67nO0BsHW9qLqVSp11zDTSmjLawadfk15lrg+dHJQyp
1i1HeHB1OygPPU1ZC2+3L42NUwb+JdGa7uibcueiafXxWaYGdO0cNIaHlH1la+JT
3s7XwTBI0Lxl6FP88DrF8AKlCzHfPI0/0nD4sFTkMY7viU8+4U25t2WsRjNEpBv8
TkWU28LoMsWgWdGwdyTkQnWTbip2l1a+AdrPVRV39hQ+uglJyW1lihH2vyG1KtD5
vuReR9M6jMtY88urFtcDYR7DgNUBhfBsL7M7hsE8fCgcyvNYBBNO4xp1Q/pOqn/Y
ewIutLLvOtfnShBvUe7mma8LvDzy+ay/zSAJQxzoRdZXqdhLcB8=
=fsqA
-----END PGP SIGNATURE-----

8
geeqie.changes
View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Nov 8 14:19:08 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 2.0.1:
+ Exclude build directories from release tar.
- Add eb9d0e10.patch: Fix appdata and icon installation.
- Add 6c4226ff.patch: Fix appstream validation.
-------------------------------------------------------------------
Thu Sep 1 15:17:41 UTC 2022 - Marcel Kuehlhorn <tux93@opensuse.org>

6
geeqie.spec
View File

@@ -17,7 +17,7 @@
Name: geeqie
Version: 2.0
Version: 2.0.1
Release: 0
Summary: Lightweight Gtk+ based image viewer
License: GPL-2.0-or-later
@@ -26,7 +26,8 @@ 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
@@ -92,6 +93,7 @@ rm %{buildroot}%{_docdir}/%{name}/COPYING
%doc %{_docdir}/%{name}/html
%{_bindir}/geeqie
%{_datadir}/applications/geeqie.desktop
%{_datadir}/icons/hicolor/scalable/apps/geeqie.svg
%{_datadir}/geeqie/
%{_datadir}/pixmaps/geeqie.png
%{_datadir}/metainfo/org.geeqie.Geeqie.appdata.xml