diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2006-12-21 02:49:28 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2006-12-21 02:49:28 +0000 |
| commit | 066fd33414332c2f6ccccd381fcebe741a535d7b (patch) | |
| tree | b5fd523bbf21db27f265c8fe9bc50a832733821f /cad | |
| parent | aa82c8f7f46dd30c4e2640ca5fef81d774aeb72f (diff) | |
| download | pkgsrc-066fd33414332c2f6ccccd381fcebe741a535d7b.tar.gz | |
Fix compilation with non-gcc compilers such as the sun studio
compiler. Patch is already in the upstream sources.
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/gschem/distinfo | 4 | ||||
| -rw-r--r-- | cad/gschem/patches/patch-aa | 26 | ||||
| -rw-r--r-- | cad/gschem/patches/patch-ac | 15 |
3 files changed, 44 insertions, 1 deletions
diff --git a/cad/gschem/distinfo b/cad/gschem/distinfo index c0cc9129e3a..69be2611d3e 100644 --- a/cad/gschem/distinfo +++ b/cad/gschem/distinfo @@ -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 --git a/cad/gschem/patches/patch-aa b/cad/gschem/patches/patch-aa new file mode 100644 index 00000000000..3977e8b200e --- /dev/null +++ b/cad/gschem/patches/patch-aa @@ -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 --git a/cad/gschem/patches/patch-ac b/cad/gschem/patches/patch-ac new file mode 100644 index 00000000000..206273a16f5 --- /dev/null +++ b/cad/gschem/patches/patch-ac @@ -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); + } |