From fae8acef6f631d998532ccdec532896407e770ca Mon Sep 17 00:00:00 2001
From: ABE Shin-ichi
Date: Wed, 4 Aug 2021 12:53:21 +0200
Subject: graphics/gcolor2: Patch for gcc >= 10.x.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 graphics/gcolor2/gcolor2-0.4-fno-common.patch | 27 +++++++++++++++++++++++++++
 graphics/gcolor2/gcolor2.SlackBuild           |  5 ++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 graphics/gcolor2/gcolor2-0.4-fno-common.patch

(limited to 'graphics')

diff --git a/graphics/gcolor2/gcolor2-0.4-fno-common.patch b/graphics/gcolor2/gcolor2-0.4-fno-common.patch
new file mode 100644
index 0000000000..f30552a13e
--- /dev/null
+++ b/graphics/gcolor2/gcolor2-0.4-fno-common.patch
@@ -0,0 +1,27 @@
+--- a/src/callbacks.c
++++ b/src/callbacks.c
+@@ -13,6 +13,9 @@
+ #include "support.h"
+ 
+ 
++GtkWidget        *gcolor2;
++GtkWidget        *menu;
++GdkColor          colorvalue;
+ GtkWidget        *savedialog;
+ gchar            *colorname;
+ static GtkWidget *aboutdialog = NULL;
+--- a/src/callbacks.h
++++ b/src/callbacks.h
+@@ -42,9 +42,9 @@
+                            "\302\267 Usability / user interface enhancements\n" \
+                            "\302\267 Code cleanup"
+ 
+-GtkWidget *gcolor2;
+-GtkWidget *menu;
+-GdkColor   colorvalue;
++extern GtkWidget *gcolor2;
++extern GtkWidget *menu;
++extern GdkColor   colorvalue;
+ 
+ enum
+ {
diff --git a/graphics/gcolor2/gcolor2.SlackBuild b/graphics/gcolor2/gcolor2.SlackBuild
index e4de53657c..d296407f44 100644
--- a/graphics/gcolor2/gcolor2.SlackBuild
+++ b/graphics/gcolor2/gcolor2.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gcolor2
 VERSION=${VERSION:-0.4}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -84,6 +84,9 @@ find -L . \
 patch -p1 < $CWD/color_definition_path.patch
 # fix segfaults on x86_64 and remove some compilation warnings:
 patch -p1 < $CWD/amd64_segfault.patch
+# fix callbacks related error on main.o (Thanks to Gentoo):
+patch -p1 < $CWD/gcolor2-0.4-fno-common.patch
+
 # correct character class definition in configure script:
 sed -i '/gentoo_ltmain_version/s/\[:space:\]/[&]/g' configure
 
-- 
cgit v1.2.3