svn commit: r547510 - in head/graphics/gcolor2: . files
Alexey Dokuchaev
danfe at FreeBSD.org
Fri Sep 4 04:32:15 UTC 2020
Author: danfe
Date: Fri Sep 4 04:32:14 2020
New Revision: 547510
URL: https://svnweb.freebsd.org/changeset/ports/547510
Log:
- Unbreak the build with -fno-common (e.g. Clang 11, GCC 10)
- Do not needlessly modify CPPFLAGS and LDFLAGS: correct paths are
obtained via pkgconf(1); define LICENSE (GPLv2) while here
Reported by: pkg-fallout
Added:
head/graphics/gcolor2/files/patch-src_callbacks.h (contents, props changed)
Modified:
head/graphics/gcolor2/Makefile
head/graphics/gcolor2/files/patch-src_main.c
Modified: head/graphics/gcolor2/Makefile
==============================================================================
--- head/graphics/gcolor2/Makefile Fri Sep 4 04:31:22 2020 (r547509)
+++ head/graphics/gcolor2/Makefile Fri Sep 4 04:32:14 2020 (r547510)
@@ -10,11 +10,11 @@ MASTER_SITES= SF
MAINTAINER= ps.ports at smyrak.com
COMMENT= Simple GTK+ 2.0 color selector
+LICENSE= GPLv2
+
USES= gnome pkgconfig
USE_GNOME= gtk20 gnomeprefix intltool
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
SUB_FILES= gcolor2.desktop
Added: head/graphics/gcolor2/files/patch-src_callbacks.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gcolor2/files/patch-src_callbacks.h Fri Sep 4 04:32:14 2020 (r547510)
@@ -0,0 +1,15 @@
+--- src/callbacks.h.orig 2005-07-11 23:18:59 UTC
++++ 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
+ {
Modified: head/graphics/gcolor2/files/patch-src_main.c
==============================================================================
--- head/graphics/gcolor2/files/patch-src_main.c Fri Sep 4 04:31:22 2020 (r547509)
+++ head/graphics/gcolor2/files/patch-src_main.c Fri Sep 4 04:32:14 2020 (r547510)
@@ -1,6 +1,6 @@
---- src/main.c.orig 2010-06-21 22:38:34.000000000 +0200
-+++ src/main.c 2010-06-21 22:36:23.000000000 +0200
-@@ -9,6 +9,11 @@
+--- src/main.c.orig 2005-07-11 14:55:49 UTC
++++ src/main.c
+@@ -9,11 +9,19 @@
#include "support.h"
#include "callbacks.h"
@@ -12,8 +12,16 @@
GtkListStore *liststore;
GdkWindow *gdkwin;
gchar *user_filename;
-@@ -48,8 +53,6 @@
+ gchar *sys_filename;
++GtkWidget *gcolor2;
++GtkWidget *menu;
++GdkColor colorvalue;
+
+ void set_user_file ()
+ {
+@@ -48,8 +56,6 @@
+
void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color)
{
- GdkPixmap *pixmap;
@@ -21,7 +29,7 @@
GdkPixbuf *buf;
GtkTreeIter iter;
-@@ -103,7 +106,7 @@
+@@ -103,7 +109,7 @@
gchar *name;
gchar buffer[512];
gchar spec[8];
@@ -30,7 +38,7 @@
fp = fopen (filename, "r");
if (!fp)
-@@ -140,7 +143,6 @@
+@@ -140,7 +146,6 @@
GtkTreeViewColumn *column;
GtkWidget *treeview;
GtkTreeSelection *select;
More information about the svn-ports-all
mailing list