x11/gcolor2: fix for -fno-common

adapted from https://svnweb.freebsd.org/ports?view=revision&revision=547510
This commit is contained in:
landry 2021-02-05 11:53:52 +00:00
parent 6b9109adcd
commit 0c0c3f3a71
3 changed files with 34 additions and 6 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2019/07/12 20:51:11 sthen Exp $
# $OpenBSD: Makefile,v 1.14 2021/02/05 11:53:52 landry Exp $
#
COMMENT = color selector in GTK2
DISTNAME = gcolor2-0.4
REVISION = 7
REVISION = 8
CATEGORIES = x11
HOMEPAGE = http://gcolor2.sourceforge.net/

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-src_callbacks_h,v 1.1 2021/02/05 11:53:52 landry Exp $
https://svnweb.freebsd.org/ports?view=revision&revision=547510
Index: src/callbacks.h
--- src/callbacks.h.orig
+++ src/callbacks.h
@@ -41,9 +41,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
{

View File

@ -1,6 +1,10 @@
$OpenBSD: patch-src_main_c,v 1.1.1.1 2010/10/17 21:38:05 landry Exp $
--- src/main.c.orig Sun Oct 17 00:19:56 2010
+++ src/main.c Sat Oct 16 22:57:50 2010
$OpenBSD: patch-src_main_c,v 1.2 2021/02/05 11:53:52 landry Exp $
https://svnweb.freebsd.org/ports?view=revision&revision=547510
Index: src/main.c
--- src/main.c.orig
+++ src/main.c
@@ -3,7 +3,12 @@
#endif
@ -14,9 +18,13 @@ $OpenBSD: patch-src_main_c,v 1.1.1.1 2010/10/17 21:38:05 landry Exp $
#include "interface.h"
#include "support.h"
@@ -14,6 +19,7 @@ GdkWindow *gdkwin;
@@ -13,7 +18,11 @@ GtkListStore *liststore;
GdkWindow *gdkwin;
gchar *user_filename;
gchar *sys_filename;
+GtkWidget *gcolor2;
+GtkWidget *menu;
+GdkColor colorvalue;
+#include "main.h"