Added a patch to fix gcc41 compile issues. Removed older versions.

Package-Manager: portage-2.1_pre6-r3

5 files changed, 27 insertions, 3 deletions

diff --git a/app-cdr/gcombust/files/digest-gcombust-0.1.52 b/app-cdr/gcombust/files/digest-gcombust-0.1.52
deleted file mode 100644
index 8aaaa0aadf5a..000000000000
--- a/app-cdr/gcombust/files/digest-gcombust-0.1.52
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2c2455f8fe91cddd7b87bf59916a39e8 gcombust-0.1.52.tar.gz 761347
diff --git a/app-cdr/gcombust/files/digest-gcombust-0.1.53 b/app-cdr/gcombust/files/digest-gcombust-0.1.53
deleted file mode 100644
index e6bb4d9adf58..000000000000
--- a/app-cdr/gcombust/files/digest-gcombust-0.1.53
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c27d379b53ee7d05344371481d22c65d gcombust-0.1.53.tar.gz 770451
diff --git a/app-cdr/gcombust/files/digest-gcombust-0.1.54 b/app-cdr/gcombust/files/digest-gcombust-0.1.54
deleted file mode 100644
index ab9aec231fe9..000000000000
--- a/app-cdr/gcombust/files/digest-gcombust-0.1.54
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6fbb8a6ddf9dbfcd6e78b54e0d1bd00 gcombust-0.1.54.tar.gz 786628
diff --git a/app-cdr/gcombust/files/digest-gcombust-0.1.55-r1 b/app-cdr/gcombust/files/digest-gcombust-0.1.55-r1
new file mode 100644
index 000000000000..3eba0c1279c9
--- /dev/null
+++ b/app-cdr/gcombust/files/digest-gcombust-0.1.55-r1
@@ -0,0 +1,3 @@
+MD5 25ddecef7f8556f0fac82d9d4927e8eb gcombust-0.1.55.tar.gz 819339
+RMD160 db6e77eeb9ba56af55ac6af8a279205104b325f3 gcombust-0.1.55.tar.gz 819339
+SHA256 5e6b11049c305e44f20c45a488ea704f11cf14fe59efb6c8a38021b64e595e2e gcombust-0.1.55.tar.gz 819339
diff --git a/app-cdr/gcombust/files/gcombust-0.1.55-gcc41.patch b/app-cdr/gcombust/files/gcombust-0.1.55-gcc41.patch
new file mode 100644
index 000000000000..89e78c29713a
--- /dev/null
+++ b/app-cdr/gcombust/files/gcombust-0.1.55-gcc41.patch
@@ -0,0 +1,24 @@
+diff -urN ../tmp-orig/gcombust-0.1.55/src/optimize_usage.c ./src/optimize_usage.c
+--- ../tmp-orig/gcombust-0.1.55/src/optimize_usage.c	2003-06-30 15:07:27.000000000 +0200
++++ ./src/optimize_usage.c	2004-12-20 16:29:48.012513000 +0100
+@@ -31,7 +31,7 @@
+ #include "locks.h"
+ #include "globals.h"
+ 
+-static GtkWidget *opt_try_harder;
++GtkWidget *opt_try_harder;
+ 
+ static GtkWidget *cdsize_option_menu, *cdsize_selected_label, *cdsector_selected_label;
+ static GtkWidget *used_size_label, *used_sectors_label, *wasted_size_label, *wasted_sectors_label;
+diff -urN ../tmp-orig/gcombust-0.1.55/src/rip_audio.c ./src/rip_audio.c
+--- ../tmp-orig/gcombust-0.1.55/src/rip_audio.c	2002-02-16 21:00:52.000000000 +0100
++++ ./src/rip_audio.c	2004-12-20 16:30:05.285887048 +0100
+@@ -41,7 +41,7 @@
+ char *cdda2wav_path = NULL, *cdda_device_path;
+ char *def_rip_path = NULL;
+ char *cdparanoia_path = NULL, *cdpara_device_path;
+-static GtkWidget *rip_path_entry;
++GtkWidget *rip_path_entry;
+ 
+ static GtkWidget *rip_win = NULL, *p_win;
+ static GtkWidget *autoscroll_cdda2wav_text, *cdda2wav_text, *cdda2wav_text_scrollbar;