From 87444eae56dfe0499b80e5b5ff7bd2932ef54d5f Mon Sep 17 00:00:00 2001
From: kristerw <kristerw@pkgsrc.org>
Date: Sat, 19 Nov 2005 01:04:19 +0000
Subject: Fix some static/non-static conflicts that prevented this from
 building with gcc 4.

---
 sysutils/gcombust/distinfo         |  4 +++-
 sysutils/gcombust/patches/patch-ac | 12 ++++++++++++
 sysutils/gcombust/patches/patch-ad |  9 +++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 sysutils/gcombust/patches/patch-ac
 create mode 100644 sysutils/gcombust/patches/patch-ad

(limited to 'sysutils')

diff --git a/sysutils/gcombust/distinfo b/sysutils/gcombust/distinfo
index e6e7f5b50ca..43208575ac9 100644
--- a/sysutils/gcombust/distinfo
+++ b/sysutils/gcombust/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 13:40:53 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/11/19 01:04:19 kristerw Exp $
 
 SHA1 (gcombust-0.1.54.tar.gz) = 768dbc5e8d88eb2d106e1c19b1012f94a89816d3
 RMD160 (gcombust-0.1.54.tar.gz) = 34529bda20c80b31edd16c6fa5905e9f69aef64a
 Size (gcombust-0.1.54.tar.gz) = 786628 bytes
 SHA1 (patch-ab) = 437e15e09601345b75afac2f9d6b3e755e4c936d
+SHA1 (patch-ac) = ba8e524f669f8637321ebbabc226f99b53c2c1a9
+SHA1 (patch-ad) = 320a0f1fc7bf1e4b6b4a97f39b60f3911cf6f269
diff --git a/sysutils/gcombust/patches/patch-ac b/sysutils/gcombust/patches/patch-ac
new file mode 100644
index 00000000000..83fc4e87e79
--- /dev/null
+++ b/sysutils/gcombust/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2005/11/19 01:04:19 kristerw Exp $
+
+--- src/optimize_usage.h.orig	2005-11-18 23:38:44.000000000 +0100
++++ src/optimize_usage.h	2005-11-18 23:39:00.000000000 +0100
+@@ -16,7 +16,6 @@
+ ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+ 
+-extern GtkWidget *opt_try_harder;
+ extern long int opt_cdsize;
+ 
+ void open_optimize_size_win(GtkWidget *, gpointer);
diff --git a/sysutils/gcombust/patches/patch-ad b/sysutils/gcombust/patches/patch-ad
new file mode 100644
index 00000000000..10ca27c4fa5
--- /dev/null
+++ b/sysutils/gcombust/patches/patch-ad
@@ -0,0 +1,9 @@
+$NetBSD: patch-ad,v 1.1 2005/11/19 01:04:19 kristerw Exp $
+
+--- src/rip_audio.h.orig	2005-11-18 23:40:43.000000000 +0100
++++ src/rip_audio.h	2005-11-18 23:40:56.000000000 +0100
+@@ -20,4 +20,3 @@
+ 
+ extern char *cdda2wav_path, *cdda_device_path, *cdparanoia_path;
+ extern char *def_rip_path;
+-extern GtkWidget *rip_path_entry;
-- 
cgit v1.2.3