removed the wrong patch, so now doing the right one, plus restoring the needed

(Portage version: 2.1.3.9)

3 files changed, 21 insertions, 74 deletions

diff --git a/app-editors/qemacs/ChangeLog b/app-editors/qemacs/ChangeLog
index 967abb7db286..85b64ecd53ba 100644
--- a/app-editors/qemacs/ChangeLog
+++ b/app-editors/qemacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/qemacs
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.33 2007/09/22 16:23:00 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.34 2007/09/23 07:00:23 opfer Exp $
+
+  23 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
+  -files/qemacs-0.3.1-libpng-1_2.patch,
+  +files/qemacs-0.3.1-manpage-ref-fix.patch:
+  removed the wrong patch, so now doing the right one, plus restoring the needed
 
   22 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
   -files/qemacs-0.3.1-Makefile-gentoo.patch,
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
deleted file mode 100644
index 566677375d3f..000000000000
--- a/app-editors/qemacs/files/qemacs-0.3.1-libpng-1_2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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;
diff --git a/app-editors/qemacs/files/qemacs-0.3.1-manpage-ref-fix.patch b/app-editors/qemacs/files/qemacs-0.3.1-manpage-ref-fix.patch
new file mode 100644
index 000000000000..0dca195bd2eb
--- /dev/null
+++ b/app-editors/qemacs/files/qemacs-0.3.1-manpage-ref-fix.patch
@@ -0,0 +1,15 @@
+--- qemacs-0.3.1/qe.1	2005-02-03 03:47:34.000000000 +0000
++++ qemacs-0.3.1/qe.1	2005-02-03 03:47:34.000000000 +0000
+@@ -1,10 +1,10 @@
+ .\"                                      Hey, EMACS: -*- nroff -*-
+-.TH QE 1 "October 21, 2001"
++.TH QEMACS 1 "October 21, 2001"
+ .\" Please adjust this date whenever revising the manpage.
+ .SH NAME
+ QEmacs \- tiny full-screen editor
+ .SH SYNOPSIS
+-.B qe
++.B qemacs
+ .RB [options]
+ .RI file...
+ .SH DESCRIPTION