diff options
| author | rillig <rillig@pkgsrc.org> | 2007-03-08 15:01:50 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-03-08 15:01:50 +0000 |
| commit | a3685db68ed2fcadd3344c009ecfccdf92d40e2e (patch) | |
| tree | 825bbbad15f58c4708baf016d243fef114381745 /audio | |
| parent | 3be8b1b5090cd7d6a6be3b9a125c0a64540f6953 (diff) | |
| download | pkgsrc-a3685db68ed2fcadd3344c009ecfccdf92d40e2e.tar.gz | |
Fixed these gcc error messages from PR 35948:
Sun.c:8: error: static declaration of 'op' follows non-static declaration
Sun.h:40: error: previous declaration of 'op' was here
While here, also fixed the pkglint errors.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/xmms/distinfo | 5 | ||||
| -rw-r--r-- | audio/xmms/patches/patch-am | 17 | ||||
| -rw-r--r-- | audio/xmms/patches/patch-ap | 17 |
3 files changed, 21 insertions, 18 deletions
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo index 35e4abcbd75..a2d90a378bc 100644 --- a/audio/xmms/distinfo +++ b/audio/xmms/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2007/02/01 16:55:58 drochner Exp $ +$NetBSD: distinfo,v 1.30 2007/03/08 15:01:50 rillig Exp $ SHA1 (xmms-1.2.10.tar.bz2) = a3c3d3756d5263183c27b3c50a7f5404cba8bfaf RMD160 (xmms-1.2.10.tar.bz2) = 0360cbb8c326b3325bd8ebb3343c69a9788d7084 @@ -15,6 +15,7 @@ SHA1 (patch-ai) = c0bb82e63e6fb96327b1ee1e9ec5617fe9b55b44 SHA1 (patch-aj) = 67a69e2a05f343a5d7c22b3f1f1cf0c25d9aeb6d SHA1 (patch-ak) = b49316325c6f778b0d3e85007b141699cf338238 SHA1 (patch-al) = 1457ca7b5e4e1084623207d042a8ff349eb31aaa -SHA1 (patch-am) = 38e339a7f21921eedbed36ffe4c3ec0b1148c1e2 +SHA1 (patch-am) = 6474ef355b194189345008e35a4efc9648c26397 SHA1 (patch-an) = 3abc68bd37018800dc70b151a5b419211a727a02 SHA1 (patch-ao) = 2cadee08e6db7b802d1b700559705a8fe591f2dd +SHA1 (patch-ap) = 101c54e2ce0e575893b8d3880ca54a021e89a8dd diff --git a/audio/xmms/patches/patch-am b/audio/xmms/patches/patch-am index d8bd2e430a6..8182f87d86e 100644 --- a/audio/xmms/patches/patch-am +++ b/audio/xmms/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.6 2006/08/28 05:09:05 ben Exp $ +$NetBSD: patch-am,v 1.7 2007/03/08 15:01:50 rillig Exp $ --- configure.orig 2004-02-23 13:44:32.000000000 -0800 +++ configure @@ -25,18 +25,3 @@ $NetBSD: patch-am,v 1.6 2006/08/28 05:09:05 ben Exp $ ;; *) ARCH_DEFINES="-DI386_ASSEM" -@@ -19778,6 +19771,14 @@ do - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ : Avoid regenerating within pkgsrc -+ exit 0 -+ : Avoid regenerating within pkgsrc -+ exit 0 -+ : Avoid regenerating within pkgsrc -+ exit 0 -+ : Avoid regenerating within pkgsrc -+ exit 0 - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; diff --git a/audio/xmms/patches/patch-ap b/audio/xmms/patches/patch-ap new file mode 100644 index 00000000000..0ebbc2725db --- /dev/null +++ b/audio/xmms/patches/patch-ap @@ -0,0 +1,17 @@ +$NetBSD: patch-ap,v 1.3 2007/03/08 15:01:51 rillig Exp $ + +gcc 4.1.2 says: +Sun.c:8: error: static declaration of 'op' follows non-static declaration +Sun.h:40: error: previous declaration of 'op' was here + +--- Output/solaris/Sun.c.orig 2001-04-27 00:31:34.000000000 +0200 ++++ Output/solaris/Sun.c 2007-03-08 16:07:29.000000000 +0100 +@@ -5,7 +5,7 @@ + #include "config.h" + #include "xmms/i18n.h" + +-static OutputPlugin op = ++OutputPlugin op = + { + NULL, + NULL, |