From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 16 19:10:08 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 590E11065672 for ; Fri, 16 Jul 2010 19:10:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0498B8FC2F for ; Fri, 16 Jul 2010 19:10:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o6GJA732048997 for ; Fri, 16 Jul 2010 19:10:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o6GJA7j1048996; Fri, 16 Jul 2010 19:10:07 GMT (envelope-from gnats) Resent-Date: Fri, 16 Jul 2010 19:10:07 GMT Resent-Message-Id: <201007161910.o6GJA7j1048996@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Piotr Smyrak Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1CAF51065677 for ; Fri, 16 Jul 2010 19:01:08 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id E73978FC24 for ; Fri, 16 Jul 2010 19:01:07 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o6GJ17uu016672 for ; Fri, 16 Jul 2010 19:01:07 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o6GJ17Ic016671; Fri, 16 Jul 2010 19:01:07 GMT (envelope-from nobody) Message-Id: <201007161901.o6GJ17Ic016671@www.freebsd.org> Date: Fri, 16 Jul 2010 19:01:07 GMT From: Piotr Smyrak To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/148690: [patch] fix for running on amd64 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2010 19:10:08 -0000 >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@dsk.smyrak.com:/usr/obj/amd64/usr/src/sys/SMYRU amd64 >Description: Winston Weinert 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 ++#include + + 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 ++#include ++#include ++ + 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: