- updated to r127150

- removed obsolete libpng patch

diff --git a/ewebkit-libpng.patch b/ewebkit-libpng.patch
deleted file mode 100644 (file)
index 0545a86..0000000
--- a/ewebkit-libpng.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- 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());
-     }
- 

diff --git a/ewebkit.spec b/ewebkit.spec
index d9d3241db4bee75c4261b925a3b547bd3437acba..eed840b1df6368fe3fa64a9fd9cfc156303953d0 100644 (file)
--- a/ewebkit.spec
+++ b/ewebkit.spec
@@ -2,55 +2,66 @@ 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
+%define        subver  r127150
 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
+Source0:       http://packages.profusion.mobi/webkit-efl/webkit-efl-svn-%{subver}.tar.bz2
+# Source0-md5: 54332bd571a23d44e32837f4fa3a1c76
 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: cairo-devel >= 1.10
+BuildRequires: cmake >= 2.8.3
+BuildRequires: dbus-devel
+BuildRequires: e_dbus-devel >= 1.1.0
+BuildRequires: ecore-devel >= 1.2.0
+BuildRequires: ecore-evas-devel >= 1.2.0
+BuildRequires: ecore-file-devel >= 1.2.0
+BuildRequires: ecore-x-devel >= 1.2.0
 BuildRequires: edje >= 1.0.0
 BuildRequires: edje-devel >= 1.0.0
-BuildRequires: eina-devel >= 1.0.0
+BuildRequires: eeze-devel >= 1.3.0
+BuildRequires: efreet-devel >= 1.0.0
+BuildRequires: eina-devel >= 1.2.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: glib2-devel >= 1:2.31.8
 BuildRequires: gperf
 BuildRequires: gstreamer-devel >= 0.10
 BuildRequires: gstreamer-plugins-base-devel >= 0.10
 BuildRequires: gtk+2-devel >= 2:2.10
+BuildRequires: harfbuzz-devel >= 0.9.0
 BuildRequires: libicu-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
-BuildRequires: libsoup-devel
+BuildRequires: libsoup-devel >= 2.39.4.1
 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
+BuildRequires: zlib-devel
+Requires:      cairo >= 1.10
+Requires:      e_dbus >= 1.1.0
+Requires:      ecore >= 1.2.0
+Requires:      ecore-evas >= 1.2.0
+Requires:      ecore-file >= 1.2.0
+Requires:      ecore-x >= 1.2.0
 Requires:      edje-libs >= 1.0.0
-Requires:      eina >= 1.0.0
+Requires:      efreet >= 1.0.0
+Requires:      eeze >= 1.3.0
+Requires:      eina >= 1.2.0
 Requires:      evas >= 1.0.0
 Requires:      fontconfig-libs >= 2.8.0
 Requires:      freetype >= 2.1.0
-Requires:      gperf
+Requires:      glib2 >= 1:2.31.8
 Requires:      gtk+2 >= 2:2.10
+Requires:      harfbuzz >= 0.9.0
+Requires:      libxml2 >= 1:2.6
+Requires:      libxslt >= 1.1.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -64,9 +75,11 @@ 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:      cairo-devel >= 1.10
+Requires:      ecore-devel >= 1.2.0
+Requires:      ecore-input-devel >= 1.2.0
 Requires:      evas-devel >= 1.0.0
+Requires:      libsoup-devel >= 2.39.4.1
 
 %description devel
 Header files for WebKit-EFL library.
@@ -76,7 +89,6 @@ Pliki nagłówkowe biblioteki WebKit-EFL.
 
 %prep
 %setup -q -n webkit-efl-svn-%{subver}
-%patch0 -p1
 
 %build
 %cmake . \
@@ -97,7 +109,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog WebKit/LICENSE
+%doc ChangeLog Source/WebKit/LICENSE
 %attr(755,root,root) %{_libdir}/libewebkit.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libewebkit.so.0
 %{_datadir}/ewebkit-0