Hello community, here is the log from the commit of package qemacs for openSUSE:Factory checked in at 2012-01-09 15:20:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qemacs (Old) and /work/SRC/openSUSE:Factory/.qemacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemacs", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/qemacs/qemacs.changes 2011-09-23 12:43:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qemacs.new/qemacs.changes 2012-01-09 15:21:00.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 5 14:28:33 UTC 2012 - [email protected] + +- build also with libpng15 + * libpng15.patch + +------------------------------------------------------------------- New: ---- qemacs-libpng15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qemacs.spec ++++++ --- /var/tmp/diff_new_pack.I2oGAr/_old 2012-01-09 15:21:00.000000000 +0100 +++ /var/tmp/diff_new_pack.I2oGAr/_new 2012-01-09 15:21:00.000000000 +0100 @@ -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 @@ Patch3: includes.patch Patch4: initcall.patch Patch5: qemacs-libpng.patch +# PATCH-FIX-UPSTREAM pngtoico-libpng15.patch -- [email protected]; build with libpng15; sent today to [email protected] +# 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 @@ %patch3 %patch4 %patch5 +%patch6 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ qemacs-libpng15.patch ++++++ 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); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
