Hello community, here is the log from the commit of package geeqie for openSUSE:Factory checked in at 2020-06-05 20:22:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geeqie (Old) and /work/SRC/openSUSE:Factory/.geeqie.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geeqie" Fri Jun 5 20:22:55 2020 rev:20 rq:811861 version:1.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/geeqie/geeqie.changes 2020-01-31 23:56:37.391630823 +0100 +++ /work/SRC/openSUSE:Factory/.geeqie.new.3606/geeqie.changes 2020-06-05 20:28:49.665280343 +0200 @@ -1,0 +2,7 @@ +Thu Jun 4 16:18:51 UTC 2020 - Bjørn Lie <[email protected]> + +- 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. + +------------------------------------------------------------------- New: ---- geeqie-gcc10-buildfix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geeqie.spec ++++++ --- /var/tmp/diff_new_pack.Aof0Ki/_old 2020-06-05 20:28:50.201281927 +0200 +++ /var/tmp/diff_new_pack.Aof0Ki/_new 2020-06-05 20:28:50.201281927 +0200 @@ -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 @@ 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(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 @@ %lang_package %prep -%setup -q +%autosetup -p1 %build # Needed to bootstrap @@ -66,25 +67,18 @@ --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 ++++++ geeqie-gcc10-buildfix.patch ++++++ >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);
