[arch-commits] Commit in geeqie/trunk (PKGBUILD gcc10.patch)

[Evangelos Foutras]

    Date: Sunday, August 30, 2020 @ 10:20:56
  Author: foutrelis
Revision: 394925

upgpkg: geeqie 1.5.1-3: rebuild bisson's pkgs

Added:
  geeqie/trunk/gcc10.patch
Modified:
  geeqie/trunk/PKGBUILD

-------------+
 PKGBUILD    |    5 ++++-
 gcc10.patch |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-30 10:20:54 UTC (rev 394924)
+++ PKGBUILD	2020-08-30 10:20:56 UTC (rev 394925)
@@ -3,7 +3,7 @@
 
 pkgname=geeqie
 pkgver=1.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight image viewer'
 arch=('x86_64')
 url="http://www.geeqie.org/"
@@ -14,15 +14,18 @@
             'fbida: for jpeg rotation')
 validpgpkeys=('85D4CA42952C949B175362B379D0B06F4E20AF1C')
 source=("http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz"{,.asc}
+        'gcc10.patch'
         'yelp-build.patch'
         'geeqie-no-changelog.patch')
 sha256sums=('4854d5d323c31f8f4068fd73ab2c454ff91e826c4ca4d37b22c246ad14dea10a'
             'SKIP'
+            '9589e10d88e3e8d9d0ada45d595fc95b75eead6a99b2e5932955198f74368e0a'
             '511d12cbf24ddc5fa8bea0809dc0fbe9587555545d1edd88034a4a72bd972d67'
             'f6eb2725a47fc750d95455d4bbf4be5a0ae45307d3ada571937212a25b2b4301')
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../gcc10.patch
 	patch -p1 -i ../yelp-build.patch
 	patch -p1 -i ../geeqie-no-changelog.patch # Workaround missing changelog (Fedora)
 	NOCONFIGURE=1 ./autogen.sh

Added: gcc10.patch
===================================================================
--- gcc10.patch	                        (rev 0)
+++ gcc10.patch	2020-08-30 10:20:56 UTC (rev 394925)
@@ -0,0 +1,55 @@
+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);