[pkgsrc/trunk]: pkgsrc/cad/gschem Fix compilation with non-gcc compilers such...

[dmcmahill <dmcmahill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/036d01ff4e40
branches:  trunk
changeset: 522787:036d01ff4e40
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Thu Dec 21 02:49:28 2006 +0000

description:
Fix compilation with non-gcc compilers such as the sun studio
compiler.  Patch is already in the upstream sources.

diffstat:

 cad/gschem/distinfo         |   4 +++-
 cad/gschem/patches/patch-aa |  26 ++++++++++++++++++++++++++
 cad/gschem/patches/patch-ac |  15 +++++++++++++++
 3 files changed, 44 insertions(+), 1 deletions(-)

diffs (62 lines):

diff -r f6fffe4bb07f -r 036d01ff4e40 cad/gschem/distinfo
--- a/cad/gschem/distinfo       Thu Dec 21 00:19:54 2006 +0000
+++ b/cad/gschem/distinfo       Thu Dec 21 02:49:28 2006 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.21 2006/10/23 09:43:12 dmcmahill Exp $
+$NetBSD: distinfo,v 1.22 2006/12/21 02:49:28 dmcmahill Exp $
 
 SHA1 (geda/geda-gschem-20061020.tar.gz) = 828bc6517fefc3a5f36c7e5a57752e0315eb2c6e
 RMD160 (geda/geda-gschem-20061020.tar.gz) = 83166aae8be23d7a21ebf82d82a5b4cae97f1350
 Size (geda/geda-gschem-20061020.tar.gz) = 943519 bytes
+SHA1 (patch-aa) = 3f95395d0b9563422401b04e929ee1ef406f5313
 SHA1 (patch-ab) = cea6b45ebd34dd846bcef6a0967b4644e077cc7e
+SHA1 (patch-ac) = 9a6333933bdd272706968e09a88f5906b3642a03
diff -r f6fffe4bb07f -r 036d01ff4e40 cad/gschem/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/gschem/patches/patch-aa       Thu Dec 21 02:49:28 2006 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-aa,v 1.13 2006/12/21 02:49:28 dmcmahill Exp $
+
+Make this work with non-gcc.  Patch in upstream sources already.
+
+--- include/globals.h.orig     2006-09-30 13:03:21.000000000 -0400
++++ include/globals.h
+@@ -97,5 +97,19 @@ extern SCM new_page_hook;
+ # define N_(String) (String)
+ #endif
+ 
++/*
++ * __attribute__((unused)) is a gcc extension so define
++ * a portable macro, ATTRIBUTE_UNUSED, to use instead
++ */
++#ifndef GCC_VERSION
++#define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
++#endif /* GCC_VERSION */
++
++#if GCC_VERSION > 2007
++#define ATTRIBUTE_UNUSED __attribute__((unused))
++#else
++#define ATTRIBUTE_UNUSED
++#endif
++
+ /*EK* used by prototype.h */
+ #include "../include/x_states.h"
diff -r f6fffe4bb07f -r 036d01ff4e40 cad/gschem/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/gschem/patches/patch-ac       Thu Dec 21 02:49:28 2006 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.5 2006/12/21 02:49:28 dmcmahill Exp $
+
+Make this work with non-gcc.  Patch in upstream sources already.
+
+---src/x_menus.c.orig  2006-08-06 12:45:29.000000000 -0400
++++src/x_menus.c
+@@ -239,7 +239,7 @@ void get_main_menu(TOPLEVEL * w_current,
+  *
+  */
+ static gchar* gettext_fn(const gchar *path,
+-                       gpointer func_data __attribute__((unused)))
++                       gpointer func_data ATTRIBUTE_UNUSED)
+ {
+       return gettext(path);
+ }