Author: arekm Date: Fri Feb 10 11:36:52 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 10; png fix
---- Files affected: packages/gtk-webkit: gtk-webkit.spec (1.112 -> 1.113) , webkit-gtk-1.2.7-libpng15.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gtk-webkit/gtk-webkit.spec diff -u packages/gtk-webkit/gtk-webkit.spec:1.112 packages/gtk-webkit/gtk-webkit.spec:1.113 --- packages/gtk-webkit/gtk-webkit.spec:1.112 Tue Feb 7 23:02:16 2012 +++ packages/gtk-webkit/gtk-webkit.spec Fri Feb 10 12:36:46 2012 @@ -8,12 +8,13 @@ Summary(pl.UTF-8): Port osadzalnego komponentu WWW WebKit do GTK+ Name: gtk-webkit Version: 1.2.7 -Release: 9 +Release: 10 License: BSD-like Group: X11/Libraries Source0: http://webkitgtk.org/webkit-%{version}.tar.gz # Source0-md5: 25c7e548b65aeb6d83c0182c32ef0927 Patch0: gobject-introspection.patch +Patch1: webkit-gtk-1.2.7-libpng15.patch URL: http://webkitgtk.org/ BuildRequires: autoconf >= 2.59 BuildRequires: automake @@ -97,6 +98,7 @@ %prep %setup -q -n webkit-%{version} %patch0 -p1 +%patch1 -p0 %build %{__gtkdocize} @@ -164,6 +166,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.113 2012/02/10 11:36:46 arekm +- rel 10; png fix + Revision 1.112 2012/02/07 22:02:16 arekm - release 9 ================================================================ Index: packages/gtk-webkit/webkit-gtk-1.2.7-libpng15.patch diff -u /dev/null packages/gtk-webkit/webkit-gtk-1.2.7-libpng15.patch:1.1 --- /dev/null Fri Feb 10 12:36:52 2012 +++ packages/gtk-webkit/webkit-gtk-1.2.7-libpng15.patch Fri Feb 10 12:36:47 2012 @@ -0,0 +1,36 @@ +--- WebCore/platform/image-decoders/png/PNGImageDecoder.cpp ++++ WebCore/platform/image-decoders/png/PNGImageDecoder.cpp +@@ -242,9 +242,9 @@ + png_structp png = m_reader->pngPtr(); + png_infop info = m_reader->infoPtr(); +- png_uint_32 width = png->width; +- png_uint_32 height = png->height; ++ png_uint_32 width = png_get_image_width(png, info); ++ png_uint_32 height = png_get_image_height(png, info); + + // Protect against large images. +- if (png->width > cMaxPNGSize || png->height > cMaxPNGSize) { ++ if (width > cMaxPNGSize || height > cMaxPNGSize) { + longjmp(JMPBUF(png), 1); + return; +@@ -319,7 +319,12 @@ + + if (m_reader->decodingSizeOnly()) { +- // If we only needed the size, halt the reader. ++ // If we only needed the size, halt the reader. ++#if defined(PNG_LIBPNG_VER_MAJOR) && defined(PNG_LIBPNG_VER_MINOR) && (PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5)) ++ // '0' argument to png_process_data_pause means: Do not cache unprocessed data. ++ m_reader->setReadOffset(m_reader->currentBufferSize() - png_process_data_pause(png, 0)); ++#else + m_reader->setReadOffset(m_reader->currentBufferSize() - png->buffer_size); + png->buffer_size = 0; ++#endif + } + } +@@ -344,5 +349,5 @@ + buffer.setOriginalFrameRect(IntRect(IntPoint(), size())); + +- if (m_reader->pngPtr()->interlaced) ++ if (png_get_interlace_type(m_reader->pngPtr(), m_reader->infoPtr()) != PNG_INTERLACE_NONE) + m_reader->createInterlaceBuffer((m_reader->hasAlpha() ? 4 : 3) * size().width() * size().height()); + } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk-webkit/gtk-webkit.spec?r1=1.112&r2=1.113&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
