Accepting request 99339 from M17N

- build also with libpng15
  * libpng15.patch (forwarded request 99176 from pgajdos)

OBS-URL: https://build.opensuse.org/request/show/99339
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qemacs?expand=0&rev=11

qemacs-libpng15.patch

@@ -0,0 +1,26 @@
+Index: qemacs-0.3.1/html2png.c
+===================================================================
+--- qemacs-0.3.1.orig/html2png.c
++++ qemacs-0.3.1/html2png.c
+@@ -213,7 +213,7 @@ int png_save(QEditScreen *s, const char
+     if (!f) 
+         goto fail;
+ 
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+         png_destroy_write_struct(&png_ptr, &info_ptr);
+     fail:
+         /* free pointers before returning.  Make sure you clean up
+@@ -230,10 +230,8 @@ int png_save(QEditScreen *s, const char
+     w = s->width;
+     h = s->height;
+ 
+-    info_ptr->width = w;
+-    info_ptr->height = h;
+-    info_ptr->bit_depth = 8;
+-    info_ptr->color_type = PNG_COLOR_TYPE_RGB;
++    png_set_IHDR(png_ptr, info_ptr, w, h, 8, PNG_COLOR_TYPE_RGB, 
++                 PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+ 
+     png_write_info(png_ptr, info_ptr);
+ 

qemacs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan  5 14:28:33 UTC 2012 - pgajdos@suse.com
+
+- build also with libpng15
+  * libpng15.patch
+
 -------------------------------------------------------------------
 Thu Jun 29 17:03:53 CEST 2006 - nadvornik@suse.cz
 

qemacs.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package qemacs (Version 0.3.1)
+# spec file for package qemacs
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,16 +15,12 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           qemacs
-BuildRequires:  libpng-devel xorg-x11-devel
-License:        LGPL-2.1+
-Group:          Productivity/Editors/Other
-AutoReqProv:    on
+BuildRequires:  libpng-devel
+BuildRequires:  xorg-x11-devel
 Version:        0.3.1
-Release:        380
+Release:        0
 Url:            http://fabrice.bellard.free.fr/qemacs/
 Source0:        http://fabrice.bellard.free.fr/qemacs/qemacs-0.3.1.tar.bz2
 Patch0:         qemacs.patch
@@ -33,8 +29,13 @@ Patch2:         gcc4.patch
 Patch3:         includes.patch
 Patch4:         initcall.patch
 Patch5:         qemacs-libpng.patch
+# PATCH-FIX-UPSTREAM pngtoico-libpng15.patch -- pgajdos@suse.com; build with libpng15; sent today to fabrice.bellard@free.fr
+# build against libpng14 should not be affected, otherwise please let me know
+Patch6:         qemacs-libpng15.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Quick Emacs is a very small but powerful editor
+License:        LGPL-2.1+
+Group:          Productivity/Editors/Other
 
 %description
 Full screen editor with an Emacs look and feel with all Emacs common
@@ -80,6 +81,7 @@ Authors:
 %patch3
 %patch4
 %patch5
+%patch6 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -105,28 +107,3 @@ chmod 644 $RPM_BUILD_ROOT/%{_mandir}/man1/*
 %doc %{_mandir}/man1/*
 
 %changelog
-* Thu Jun 29 2006 nadvornik@suse.cz
-- don't use deprecated libpng functions
-* Mon May 29 2006 schwab@suse.de
-- Don't strip binaries.
-* Wed May 24 2006 schwab@suse.de
-- Use RPM_OPT_FLAGS.
-- Don't strip binaries.
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Tue Nov 08 2005 dmueller@suse.de
-- don't build as root
-* Thu Sep 08 2005 mfabian@suse.de
-- Bugzilla #114849: man pages should not have executable
-  permissions.
-* Tue Apr 12 2005 mfabian@suse.de
-- fix to build with gcc 4.
-* Fri May 02 2003 mfabian@suse.de
-- new package: qemacs-0.3.1
-- add DESTDIR support to Makefile
-- add a qemacs man page as a .so link to the qe man page
-- avoid crash when ~/.qe/config contains errors, print error to
-  stdout instead of to the qemacs screen which doesn't yet exist.
-  when reading ~/.qe/config.
-- move welcome message after the do_refresh() to make it actually
-  visible.