From 830d31c0807933b0d6489e3d645ea3fb9f07b5588c1e15d32604e1c86bffba9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 5 Jun 2020 15:18:00 +0000 Subject: [PATCH] Accepting request 811562 from home:iznogood:branches:GNOME:Apps - Add geeqie-gcc10-buildfix.patch: Fix build with gcc 10. - Drop no longer needed desktop_database_post(un) calls from post(un), and various other spec modernizations. OBS-URL: https://build.opensuse.org/request/show/811562 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/geeqie?expand=0&rev=31 --- geeqie-gcc10-buildfix.patch | 56 +++++++++++++++++++++++++++++++++++++ geeqie.changes | 7 +++++ geeqie.spec | 30 ++++++++------------ 3 files changed, 75 insertions(+), 18 deletions(-) create mode 100644 geeqie-gcc10-buildfix.patch diff --git a/geeqie-gcc10-buildfix.patch b/geeqie-gcc10-buildfix.patch new file mode 100644 index 0000000..0387ca1 --- /dev/null +++ b/geeqie-gcc10-buildfix.patch @@ -0,0 +1,56 @@ +From 3ea5fa39d37e56443907255fbc81cb1b83dc9978 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <> +Date: Sun, 26 Jan 2020 11:05:18 +0000 +Subject: [PATCH] Fix #746: src/options: fix build failure against gcc-10 + +https://github.com/BestImageViewer/geeqie/pull/746 +--- + src/bar_exif.h | 3 --- + src/options.c | 3 +++ + src/options.h | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/bar_exif.h b/src/bar_exif.h +index 63c30d4b..1395e842 100644 +--- a/src/bar_exif.h ++++ b/src/bar_exif.h +@@ -28,9 +28,6 @@ void bar_pane_exif_update_from_config(GtkWidget *pane, const gchar **attribute_n + void bar_pane_exif_entry_add_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values); + + /* these are exposed for when duplication of the exif bar's text is needed */ +- +-const gchar **bar_exif_key_list; +-const gint bar_exif_key_count; + GList *bar_pane_exif_list(); + + #endif +diff --git a/src/options.c b/src/options.c +index 99459381..bab26acb 100644 +--- a/src/options.c ++++ b/src/options.c +@@ -32,6 +32,9 @@ + #include "ui_fileops.h" + #include "window.h" + ++ConfOptions *options; ++CommandLine *command_line; ++ + ConfOptions *init_options(ConfOptions *options) + { + gint i; +diff --git a/src/options.h b/src/options.h +index fcfe961a..02ff8fac 100644 +--- a/src/options.h ++++ b/src/options.h +@@ -329,8 +329,8 @@ struct _ConfOptions + GList *disabled_plugins; + }; + +-ConfOptions *options; +-CommandLine *command_line; ++extern ConfOptions *options; ++extern CommandLine *command_line; + + ConfOptions *init_options(ConfOptions *options); + void setup_default_options(ConfOptions *options); + diff --git a/geeqie.changes b/geeqie.changes index 9087e91..1416113 100644 --- a/geeqie.changes +++ b/geeqie.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jun 4 16:18:51 UTC 2020 - Bjørn Lie + +- Add geeqie-gcc10-buildfix.patch: Fix build with gcc 10. +- Drop no longer needed desktop_database_post(un) calls from + post(un), and various other spec modernizations. + ------------------------------------------------------------------- Thu Jan 30 11:10:00 UTC 2020 - Dominique Leuenberger diff --git a/geeqie.spec b/geeqie.spec index 0217a95..0fadd05 100644 --- a/geeqie.spec +++ b/geeqie.spec @@ -1,7 +1,7 @@ # # spec file for package geeqie # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,12 +22,15 @@ Release: 0 Summary: Lightweight Gtk+ based image viewer License: GPL-2.0-or-later Group: Productivity/Graphics/Viewers -URL: http://www.geeqie.org/ -Source0: http://www.geeqie.org/%{name}-%{version}.tar.xz -Source1: http://www.geeqie.org/%{name}-%{version}.tar.xz.asc +URL: http://www.geeqie.org +Source0: %{url}/%{name}-%{version}.tar.xz +Source1: %{url}/%{name}-%{version}.tar.xz.asc Source2: geeqie.keyring +# PATCH-FIX-UPSTREAM geeqie-gcc10-buildfix.patch -- Fix build with gcc 10 +Patch0: geeqie-gcc10-buildfix.patch + +BuildRequires: c++_compiler BuildRequires: fdupes -BuildRequires: gcc-c++ BuildRequires: intltool BuildRequires: libjpeg-devel BuildRequires: libtiff-devel @@ -43,11 +46,9 @@ BuildRequires: pkgconfig(clutter-gtk-1.0) >= 1.0 BuildRequires: pkgconfig(exiv2) >= 0.11 BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(lua5.1) Requires(post): update-desktop-files Requires(postun): update-desktop-files -%if 0%{?suse_version} >= 1330 -BuildRequires: pkgconfig(lua5.1) -%endif %description Geeqie is a lightweight image viewer for Linux, BSDs and compatibles. @@ -55,7 +56,7 @@ Geeqie is a lightweight image viewer for Linux, BSDs and compatibles. %lang_package %prep -%setup -q +%autosetup -p1 %build # Needed to bootstrap @@ -66,25 +67,18 @@ autoreconf -fvi --with-readmedir=%{_defaultdocdir}/%{name} \ --enable-map \ %{nil} -make %{?_smp_mflags} CFLAGS="-Wno-deprecated-declarations" +%make_build CFLAGS="-Wno-deprecated-declarations" %install %make_install %find_lang %{name} %{?no_lang_C} %suse_update_desktop_file %{name} -%fdupes %{buildroot} +%fdupes %{buildroot}/%{_prefix} # Already in the license directory rm %{buildroot}%{_docdir}/%{name}/COPYING -%post -%desktop_database_post - -%postun -%desktop_database_postun - %files -%defattr(-,root,root) %license COPYING %doc AUTHORS ChangeLog ChangeLog.html NEWS TODO README.md README.lirc %{_bindir}/geeqie