diff options
| author | ABE Shin-ichi <shin1.abe@nifty.com> | 2021-08-04 12:53:21 +0200 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2021-08-07 10:28:42 +0700 |
| commit | fae8acef6f631d998532ccdec532896407e770ca (patch) | |
| tree | 8aca1c7077fe41842220d1f12b6382c6b7049976 /graphics | |
| parent | f15ef59048b8251ea5feb2c4adaab9e10a3c8a9c (diff) | |
graphics/gcolor2: Patch for gcc >= 10.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/gcolor2/gcolor2-0.4-fno-common.patch | 27 | ||||
| -rw-r--r-- | graphics/gcolor2/gcolor2.SlackBuild | 5 |
2 files changed, 31 insertions, 1 deletions
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 0000000000000..f30552a13e60e --- /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 e4de53657c869..d296407f448a9 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 |