ports/148690: [patch] fix for running on amd64

[Piotr Smyrak]

>Number:         148690
>Category:       ports
>Synopsis:       [patch] fix for running on amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 16 19:10:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Piotr Smyrak
>Release:        FreeBSD 8.0-STABLE amd64
>Organization:
>Environment:
FreeBSD dsk.smyrak.com 8.0-STABLE FreeBSD 8.0-STABLE #0: Sun Mar 14 17:22:16 CET 2010     root at dsk.smyrak.com:/usr/obj/amd64/usr/src/sys/SMYRU  amd64
>Description:
Winston Weinert <winstonw at lavabit.com> reported that the port breaks on amd64. The attached patch modifies existing port patches by incorporating fix to the problem available in Slackware package.
>How-To-Repeat:

>Fix:
Apply the patch.

Patch attached with submission follows:

diff -Naru gcolor2.orig/files/patch-src_callbacks.c gcolor2/files/patch-src_callbacks.c
--- gcolor2.orig/files/patch-src_callbacks.c	2010-06-21 22:48:58.000000000 +0200
+++ gcolor2/files/patch-src_callbacks.c	2010-06-21 22:42:42.000000000 +0200
@@ -1,9 +1,16 @@
-
-$FreeBSD: ports/graphics/gcolor2/files/patch-src_callbacks.c,v 1.4 2007/10/24 23:35:51 marcus Exp $
-
---- src/callbacks.c.orig
-+++ src/callbacks.c
-@@ -166,9 +166,10 @@
+--- src/callbacks.c.orig	2010-06-21 22:33:40.000000000 +0200
++++ src/callbacks.c	2010-06-21 22:38:00.000000000 +0200
+@@ -9,6 +9,9 @@
+ #include "interface.h"
+ #include "support.h"
+ 
++/* missing headers on original file */
++#include <string.h>
++#include <glib/gprintf.h>
+ 
+ GtkWidget        *savedialog;
+ gchar            *colorname;
+@@ -166,9 +169,10 @@
  void on_copy_color_to_clipboard_activate (GtkMenuItem *menuitem, gpointer user_data)
  {
  	gchar* hex;
diff -Naru gcolor2.orig/files/patch-src_main.c gcolor2/files/patch-src_main.c
--- gcolor2.orig/files/patch-src_main.c	1970-01-01 01:00:00.000000000 +0100
+++ gcolor2/files/patch-src_main.c	2010-06-21 22:42:27.000000000 +0200
@@ -0,0 +1,40 @@
+--- 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 @@
+ #include "support.h"
+ #include "callbacks.h"
+ 
++/* missing headers on original file */
++#include <stdlib.h>
++#include <string.h>
++#include <glib/gprintf.h>
++
+ GtkListStore *liststore;
+ GdkWindow    *gdkwin;
+ gchar        *user_filename;
+@@ -48,8 +53,6 @@
+ 
+ void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color)
+ {
+-	GdkPixmap   *pixmap;
+-	GdkBitmap   *mask;
+ 	GdkPixbuf   *buf;
+ 	GtkTreeIter  iter;
+ 	
+@@ -103,7 +106,7 @@
+ 	gchar *name;
+ 	gchar  buffer[512];
+ 	gchar  spec[8];
+-	gint   r, g, b, lr, lg, lb;
++	gint   r, g, b, lr=0, lg=0, lb=0;
+ 	
+ 	fp = fopen (filename, "r");
+ 	if (!fp)
+@@ -140,7 +143,6 @@
+ 	GtkTreeViewColumn *column;
+ 	GtkWidget         *treeview;
+ 	GtkTreeSelection  *select;
+-	gchar             *buf;
+ 	
+ #ifdef ENABLE_NLS
+ 	bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);


>Release-Note:
>Audit-Trail:
>Unformatted: