Author: qboosh Date: Mon Jan 23 16:00:53 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- new, patched to support libpng 1.5.x
---- Files affected:
packages/ewebkit:
ewebkit-libpng.patch (NONE -> 1.1) (NEW), ewebkit.spec (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/ewebkit/ewebkit-libpng.patch
diff -u /dev/null packages/ewebkit/ewebkit-libpng.patch:1.1
--- /dev/null Mon Jan 23 17:00:53 2012
+++ packages/ewebkit/ewebkit-libpng.patch Mon Jan 23 17:00:48 2012
@@ -0,0 +1,46 @@
+---
webkit-efl-svn-r71637/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp.orig
2010-11-09 18:43:06.000000000 +0100
++++
webkit-efl-svn-r71637/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
2012-01-22 16:10:58.100594266 +0100
+@@ -225,7 +225,7 @@
+ #ifdef PNG_iCCP_SUPPORTED
+ char* profileName;
+ int compressionType;
+- char* profile;
++ png_bytep profile;
+ png_uint_32 profileLength;
+ if (png_get_iCCP(png, info, &profileName, &compressionType, &profile,
&profileLength)) {
+ ColorProfile colorProfile;
+@@ -240,11 +240,11 @@
+ {
+ 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;
+ }
+@@ -318,8 +318,8 @@
+
+ if (m_reader->decodingSizeOnly()) {
+ // If we only needed the size, halt the reader.
+- m_reader->setReadOffset(m_reader->currentBufferSize() -
png->buffer_size);
+- png->buffer_size = 0;
++ m_reader->setReadOffset(m_reader->currentBufferSize() -
png_get_compression_buffer_size(png));
++ png_set_compression_buffer_size(png, 0);
+ }
+ }
+
+@@ -342,7 +342,7 @@
+ // For PNGs, the frame always fills the entire image.
+ buffer.setRect(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());
+ }
+
================================================================
Index: packages/ewebkit/ewebkit.spec
diff -u /dev/null packages/ewebkit/ewebkit.spec:1.1
--- /dev/null Mon Jan 23 17:00:54 2012
+++ packages/ewebkit/ewebkit.spec Mon Jan 23 17:00:48 2012
@@ -0,0 +1,119 @@
+# $Revision$, $Date$
+Summary: WebKit-EFL - Web content engine for EFL applications
+Summary(pl.UTF-8): WebKit-EFL - silnik WWW dla aplikacji EFL
+Name: ewebkit
+Version: 0
+%define subver r71637
+Release: 0.%{subver}.1
+License: BSD
+Group: Libraries
+Source0:
http://download.enlightenment.org/snapshots/2010-11-12/webkit-efl-svn-%{subver}.tar.bz2
+# Source0-md5: afbbb30d9150dc7cc24f7253d6cb64c9
+Patch0: %{name}-libpng.patch
+URL: http://trac.enlightenment.org/e/wiki/EWebKit
+BuildRequires: bison
+BuildRequires: cairo-devel >= 1.6
+BuildRequires: cmake
+BuildRequires: ecore-devel >= 1.0.0
+BuildRequires: ecore-evas-devel >= 1.0.0
+BuildRequires: ecore-file-devel >= 1.0.0
+BuildRequires: ecore-x-devel >= 1.0.0
+BuildRequires: edje >= 1.0.0
+BuildRequires: edje-devel >= 1.0.0
+BuildRequires: eina-devel >= 1.0.0
+BuildRequires: evas-devel >= 1.0.0
+BuildRequires: flex
+BuildRequires: fontconfig-devel >= 2.8.0
+BuildRequires: freetype-devel >= 2.1.0
+BuildRequires: glib2-devel >= 2.0
+BuildRequires: gperf
+BuildRequires: gstreamer-devel >= 0.10
+BuildRequires: gstreamer-plugins-base-devel >= 0.10
+BuildRequires: gtk+2-devel >= 2:2.10
+BuildRequires: libicu-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libsoup-devel
+BuildRequires: libxml2-devel >= 1:2.6
+BuildRequires: libxslt-devel >= 1.1.7
+BuildRequires: pango-devel
+BuildRequires: perl-base
+BuildRequires: python
+BuildRequires: sqlite3-devel
+Requires: cairo >= 1.6
+Requires: ecore >= 1.0.0
+Requires: ecore-evas >= 1.0.0
+Requires: ecore-file >= 1.0.0
+Requires: ecore-x >= 1.0.0
+Requires: edje-libs >= 1.0.0
+Requires: eina >= 1.0.0
+Requires: evas >= 1.0.0
+Requires: fontconfig-libs >= 2.8.0
+Requires: freetype >= 2.1.0
+Requires: gperf
+Requires: gtk+2 >= 2:2.10
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+WebKit-EFL - Web content engine for EFL applications.
+
+%description -l pl.UTF-8
+WebKit-EFL - silnik WWW dla aplikacji EFL.
+
+%package devel
+Summary: Header files for WebKit-EFL library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki WebKit-EFL
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: cairo-devel >= 1.6
+Requires: ecore-devel >= 1.0.0
+Requires: evas-devel >= 1.0.0
+
+%description devel
+Header files for WebKit-EFL library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki WebKit-EFL.
+
+%prep
+%setup -q -n webkit-efl-svn-%{subver}
+%patch0 -p1
+
+%build
+%cmake . \
+ -DPORT=Efl
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc ChangeLog WebKit/LICENSE
+%attr(755,root,root) %{_libdir}/libewebkit.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libewebkit.so.0
+%{_datadir}/ewebkit-0
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libewebkit.so
+%{_includedir}/ewebkit-0
+%{_pkgconfigdir}/ewebkit.pc
+
+%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <[email protected]>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+Revision 1.1 2012/01/23 16:00:48 qboosh
+- new, patched to support libpng 1.5.x
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
