Update to 2.0.0

diff --git a/gtk-webkit3.spec b/gtk-webkit3.spec
index c76c67bd638f46aff676eddd64e0fdca73626115..7c759e09d191d8467fbe65973a21811353bbef54 100644 (file)
--- a/gtk-webkit3.spec
+++ b/gtk-webkit3.spec
@@ -10,46 +10,52 @@
 Summary:       Port of WebKit embeddable web component to GTK+ 3
 Summary(pl.UTF-8):     Port osadzalnego komponentu WWW WebKit do GTK+ 3
 Name:          gtk-webkit3
-Version:       1.10.1
+Version:       2.0.0
 Release:       1
 License:       BSD-like
 Group:         X11/Libraries
 Source0:       http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
-# Source0-md5: 28c930cda012391453c476cdacfaca65
+# Source0-md5: fa231ba8c9cd33575b9692614324be21
 URL:           http://webkitgtk.org/
 BuildRequires: OpenGL-GLU-devel
-BuildRequires: at-spi2-core-devel >= 2.2.1
+BuildRequires: OpenGLES-devel
+BuildRequires: at-spi2-core-devel >= 2.6.0
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
 BuildRequires: bison >= 1.875
 BuildRequires: cairo-devel >= 1.10
 BuildRequires: enchant-devel >= 0.22
 BuildRequires: flex >= 2.5.33
-BuildRequires: fontconfig-devel >= 2.4.0
+BuildRequires: fontconfig-devel >= 2.5.0
 BuildRequires: freetype-devel >= 1:2.1.8
 BuildRequires: geoclue-devel
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.32.0
+BuildRequires: glib2-devel >= 1:2.36.0
 BuildRequires: glibc-misc
-%{?with_introspection:BuildRequires:   gobject-introspection-devel >= 0.10.0}
+%{?with_introspection:BuildRequires:   gobject-introspection-devel >= 1.32.0}
 BuildRequires: gperf
-BuildRequires: gstreamer-devel >= 1.0.0
-BuildRequires: gstreamer-plugins-base-devel >= 1.0.0
-BuildRequires: gtk+3-devel >= 3.4.0
+BuildRequires: gstreamer-devel >= 1.0.3
+BuildRequires: gstreamer-plugins-base-devel >= 1.0.3
+BuildRequires: gtk+3-devel >= 3.6.0
 BuildRequires: gtk-doc >= 1.10
+BuildRequires: harfbuzz-devel >= 0.9.7
 BuildRequires: libicu-devel >= 4.2.1
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
-BuildRequires: libsoup-devel >= 2.40.0
+BuildRequires: libsecret-devel
+BuildRequires: libsoup-devel >= 2.42.0
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:1.5
+BuildRequires: libwebp-devel
 BuildRequires: libxml2-devel >= 1:2.6.30
 BuildRequires: libxslt-devel >= 1.1.7
-BuildRequires: pango-devel >= 1:1.21.0
+BuildRequires: pango-devel >= 1:1.32.0
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.592
+BuildRequires: ruby
 BuildRequires: sqlite3-devel >= 3.0
 BuildRequires: tar >= 1:1.22
+BuildRequires: udev-glib-devel
 BuildRequires: xorg-lib-libXcomposite-devel
 BuildRequires: xorg-lib-libXrender-devel
 BuildRequires: xorg-lib-libXt-devel
@@ -57,14 +63,14 @@ BuildRequires:      xz
 BuildRequires: zlib-devel
 Requires:      cairo >= 1.10
 Requires:      enchant >= 0.22
-Requires:      glib2 >= 1:2.32.0
-Requires:      gstreamer >= 1.0.0
-Requires:      gstreamer-plugins-base >= 1.0.0
-Requires:      gtk+3 >= 3.4.0
-Requires:      libsoup >= 2.40.0
+Requires:      glib2 >= 1:2.36.0
+Requires:      gstreamer >= 1.0.3
+Requires:      gstreamer-plugins-base >= 1.0.3
+Requires:      gtk+3 >= 3.6.0
+Requires:      libsoup >= 2.42.0
 Requires:      libxml2 >= 1:2.6.30
 Requires:      libxslt >= 1.1.7
-Requires:      pango >= 1:1.21.0
+Requires:      pango >= 1:1.32.0
 %{?with_introspection:Conflicts:       gir-repository < 0.6.5-7}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -79,9 +85,9 @@ Summary:      Development files for WebKit for GTK+ 3
 Summary(pl.UTF-8):     Pliki programistyczne komponentu WebKit dla GTK+ 3
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.32.0
-Requires:      gtk+3-devel >= 3.4.0
-Requires:      libsoup-devel >= 2.40.0
+Requires:      glib2-devel >= 1:2.36.0
+Requires:      gtk+3-devel >= 3.6.0
+Requires:      libsoup-devel >= 2.42.0
 
 %description devel
 Development files for WebKit for GTK+ 3.
@@ -105,24 +111,17 @@ Dokumentacja API WebKita.
 %setup -q -n webkitgtk-%{version}
 
 %build
-%{__gtkdocize}
 %{__libtoolize}
 %{__aclocal} -I Source/autotools
 %{__autoheader}
 %{__automake}
 %{__autoconf}
-# replace -g2 with -g1 to not run into 4 GB ar format limit
-# https://bugs.webkit.org/show_bug.cgi?id=91154
-# http://sourceware.org/bugzilla/show_bug.cgi?id=14625
-export CFLAGS="%(echo %{rpmcflags} | sed 's/ -g2/ -g1/g')"
-export CXXFLAGS="%(echo %{rpmcxxflags} | sed 's/ -g2/ -g1/g')"
 %configure \
        --disable-silent-rules \
        %{__enable_disable introspection} \
-       --with-gstreamer=1.0 \
        --with-gtk=3.0 \
        --enable-geolocation \
-       --enable-gtk-doc \
+       --disable-gtk-doc \
        --with-html-dir=%{_gtkdocdir}
 
 %{__make} -j1
@@ -134,8 +133,9 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/webkit2gtk-3.0/injected-bundle/*.la
 
-%find_lang webkitgtk-3.0
+%find_lang WebKitGTK-3.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -143,7 +143,7 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
-%files -f webkitgtk-3.0.lang
+%files -f WebKitGTK-3.0.lang
 %defattr(644,root,root,755)
 %doc ChangeLog NEWS
 %attr(755,root,root) %{_bindir}/jsc-3
@@ -152,13 +152,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libwebkitgtk-3.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libwebkitgtk-3.0.so.0
 %attr(755,root,root) %{_libdir}/libwebkit2gtk-3.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwebkit2gtk-3.0.so.18
+%attr(755,root,root) %ghost %{_libdir}/libwebkit2gtk-3.0.so.25
 %attr(755,root,root) %{_libdir}/libjavascriptcoregtk-3.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libjavascriptcoregtk-3.0.so.0
 %if %{with introspection}
 %{_libdir}/girepository-1.0/JSCore-3.0.typelib
 %{_libdir}/girepository-1.0/WebKit-3.0.typelib
+%{_libdir}/girepository-1.0/WebKit2-3.0.typelib
 %endif
+%dir %{_libdir}/webkit2gtk-3.0
+%dir %{_libdir}/webkit2gtk-3.0/injected-bundle
+%attr(755,root,root) %{_libdir}/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
 %dir %{_datadir}/webkitgtk-3.0
 %{_datadir}/webkitgtk-3.0/images
 %{_datadir}/webkitgtk-3.0/resources
@@ -172,6 +176,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with introspection}
 %{_datadir}/gir-1.0/JSCore-3.0.gir
 %{_datadir}/gir-1.0/WebKit-3.0.gir
+%{_datadir}/gir-1.0/WebKit2-3.0.gir
 %endif
 %{_includedir}/webkitgtk-3.0
 %{_pkgconfigdir}/webkitgtk-3.0.pc