Various GCC4 fixes; Resolves Bug #141292; Thanks to Christian 'Opfer' Faulhammer.

(Portage version: 2.1.1_pre3-r3)

8 files changed, 121 insertions, 0 deletions

diff --git a/app-editors/qemacs/files/digest-qemacs-0.3.1 b/app-editors/qemacs/files/digest-qemacs-0.3.1
index 86ccf24a3138..52039e47f4ea 100644
--- a/app-editors/qemacs/files/digest-qemacs-0.3.1
+++ b/app-editors/qemacs/files/digest-qemacs-0.3.1
@@ -1 +1,3 @@
 MD5 74d85dee9861d494bf1f9c53bbc85298 qemacs-0.3.1.tar.gz 809124
+RMD160 05eaddf872cbf6c187a63c80ed1eb02a23a1a13d qemacs-0.3.1.tar.gz 809124
+SHA256 a3db57e09729d8c83be5ff9ab028ece173d8f5f10aaf61ca41f88aecb64996c7 qemacs-0.3.1.tar.gz 809124
diff --git a/app-editors/qemacs/files/digest-qemacs-0.3.1-r1 b/app-editors/qemacs/files/digest-qemacs-0.3.1-r1
index 86ccf24a3138..52039e47f4ea 100644
--- a/app-editors/qemacs/files/digest-qemacs-0.3.1-r1
+++ b/app-editors/qemacs/files/digest-qemacs-0.3.1-r1
@@ -1 +1,3 @@
 MD5 74d85dee9861d494bf1f9c53bbc85298 qemacs-0.3.1.tar.gz 809124
+RMD160 05eaddf872cbf6c187a63c80ed1eb02a23a1a13d qemacs-0.3.1.tar.gz 809124
+SHA256 a3db57e09729d8c83be5ff9ab028ece173d8f5f10aaf61ca41f88aecb64996c7 qemacs-0.3.1.tar.gz 809124
diff --git a/app-editors/qemacs/files/digest-qemacs-0.3.1-r2 b/app-editors/qemacs/files/digest-qemacs-0.3.1-r2
index 86ccf24a3138..52039e47f4ea 100644
--- a/app-editors/qemacs/files/digest-qemacs-0.3.1-r2
+++ b/app-editors/qemacs/files/digest-qemacs-0.3.1-r2
@@ -1 +1,3 @@
 MD5 74d85dee9861d494bf1f9c53bbc85298 qemacs-0.3.1.tar.gz 809124
+RMD160 05eaddf872cbf6c187a63c80ed1eb02a23a1a13d qemacs-0.3.1.tar.gz 809124
+SHA256 a3db57e09729d8c83be5ff9ab028ece173d8f5f10aaf61ca41f88aecb64996c7 qemacs-0.3.1.tar.gz 809124
diff --git a/app-editors/qemacs/files/digest-qemacs-0.3.1-r3 b/app-editors/qemacs/files/digest-qemacs-0.3.1-r3
new file mode 100644
index 000000000000..52039e47f4ea
--- /dev/null
+++ b/app-editors/qemacs/files/digest-qemacs-0.3.1-r3
@@ -0,0 +1,3 @@
+MD5 74d85dee9861d494bf1f9c53bbc85298 qemacs-0.3.1.tar.gz 809124
+RMD160 05eaddf872cbf6c187a63c80ed1eb02a23a1a13d qemacs-0.3.1.tar.gz 809124
+SHA256 a3db57e09729d8c83be5ff9ab028ece173d8f5f10aaf61ca41f88aecb64996c7 qemacs-0.3.1.tar.gz 809124
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-gcc4_charset_c.patch b/app-editors/qemacs/files/qemacs-0.3.1-gcc4_charset_c.patch
new file mode 100644
index 000000000000..5c8942bc2318
--- /dev/null
+++ b/app-editors/qemacs/files/qemacs-0.3.1-gcc4_charset_c.patch
@@ -0,0 +1,14 @@
+# This patch has been taken from the Debian bug tracker found at
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=288175
+# resolving compile problems with GCC 4, see bug #141292
+--- /tmp/charset.c	2006-07-25 09:30:28.000000000 +0200
++++ charset.c	2006-07-25 09:31:18.000000000 +0200
+@@ -20,7 +20,7 @@
+ 
+ QECharset *first_charset = NULL;
+ 
+-extern QECharset charset_7bit;
++static QECharset charset_7bit;
+ 
+ /* specific tables */
+ static unsigned short table_idem[256];
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-gcc4_tty_c.patch b/app-editors/qemacs/files/qemacs-0.3.1-gcc4_tty_c.patch
new file mode 100644
index 000000000000..f7fe13f7d1bb
--- /dev/null
+++ b/app-editors/qemacs/files/qemacs-0.3.1-gcc4_tty_c.patch
@@ -0,0 +1,14 @@
+# This patch has been taken from the Debian bug tracker found at
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=288175
+# resolving compile problems with GCC 4, see bug #141292
+--- /tmp/tty.c	2006-07-25 09:26:08.000000000 +0200
++++ tty.c	2006-07-25 09:26:28.000000000 +0200
+@@ -69,7 +69,7 @@
+     return 1;
+ }
+ 
+-extern QEDisplay tty_dpy;
++static QEDisplay tty_dpy;
+ 
+ static int term_init(QEditScreen *s, int w, int h)
+ {
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-gcc4_x11_c.patch b/app-editors/qemacs/files/qemacs-0.3.1-gcc4_x11_c.patch
new file mode 100644
index 000000000000..9dc8b011c306
--- /dev/null
+++ b/app-editors/qemacs/files/qemacs-0.3.1-gcc4_x11_c.patch
@@ -0,0 +1,11 @@
+--- /tmp/x11.c	2006-07-25 09:30:34.000000000 +0200
++++ x11.c	2006-07-25 09:31:13.000000000 +0200
+@@ -76,7 +76,7 @@
+ static CSSRect update_rects[UPDATE_MAX_REGIONS];
+ #endif
+ 
+-extern QEDisplay x11_dpy;
++static QEDisplay x11_dpy;
+ static int visual_depth;
+ 
+ static int force_tty = 0;
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-libpng-1_2.patch b/app-editors/qemacs/files/qemacs-0.3.1-libpng-1_2.patch
new file mode 100644
index 000000000000..566677375d3f
--- /dev/null
+++ b/app-editors/qemacs/files/qemacs-0.3.1-libpng-1_2.patch
@@ -0,0 +1,73 @@
+# This patch has been taken from the openSUSE bug tracker found at
+# http://lists.opensuse.org/archive/opensuse-commit/2006-Jun/0984.html,
+# fixing the use of outdated functions of libpng, see bug #141566
+--- /tmp/html2png.c	2006-07-25 09:53:14.000000000 +0200
++++ html2png.c	2006-07-25 09:56:30.000000000 +0200
+@@ -186,13 +186,12 @@
+ }
+ 
+ #ifdef CONFIG_PNG_OUTPUT
+-extern void png_write_init();
+ 
+ int png_save(QEditScreen *s, const char *filename)
+ {
+     CFBContext *cfb = s->private;
+-    png_struct * volatile png_ptr = NULL;
+-    png_info * volatile info_ptr = NULL;
++    png_structp png_ptr = NULL;
++    png_infop info_ptr = NULL;
+     png_byte *row_ptr, *row_pointers[1], *row = NULL;
+     int w, h, x, y;
+     unsigned int r, g, b, v;
+@@ -202,32 +201,30 @@
+     row = malloc(3 * s->width);
+     if (!row)
+         goto fail;
+-    png_ptr = malloc(sizeof (png_struct));
++    png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+     if (!png_ptr)
+         goto fail;
+-    info_ptr = malloc(sizeof (png_info));
+-    if (!info_ptr)
+-        goto fail;
++    info_ptr = png_create_info_struct (png_ptr);
++    if (!info_ptr) {
++	png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
++         goto fail;
++    }
+     
+     f = fopen(filename, "w");
+     if (!f) 
+         goto fail;
+ 
+     if (setjmp(png_ptr->jmpbuf)) {
+-        png_write_destroy(png_ptr);
++      png_destroy_write_struct(&png_ptr, &info_ptr);
+     fail:
+         /* free pointers before returning.  Make sure you clean up
+            anything else you've done. */
+-        free(png_ptr);
+-        free(info_ptr);
+         free(row);
+         if (f)
+             fclose(f);
+         return -1;
+     }
+ 
+-    png_info_init(info_ptr);
+-    png_write_init(png_ptr);
+     png_init_io(png_ptr, f);
+     
+     data = (unsigned int *)cfb->base;
+@@ -259,10 +256,8 @@
+         data = (void *)((char *)data + cfb->wrap);
+     }
+     png_write_end(png_ptr, info_ptr);
+-    png_write_destroy(png_ptr);
++    png_destroy_write_struct (&png_ptr, &info_ptr);
+ 
+-    free(png_ptr);
+-    free(info_ptr);
+     free(row);
+     fclose(f);
+     return 0;