- initial work on webkitgtk 2.6.x (new library names, webkitgtk is gone; parallel...

diff --git a/gtk-webkit3.spec b/gtk-webkit4.spec
similarity index 55%
rename from gtk-webkit3.spec
rename to gtk-webkit4.spec
index ed0b46cc1279f959ae4bdf94146483fb7a918602..f431c798699c80ad0c572762754b263f34f91244 100644 (file)
--- a/gtk-webkit3.spec
+++ b/gtk-webkit4.spec
@@ -1,47 +1,50 @@
 # TODO: review configure options:
-# - gamepad
-# - battery-status (BR: upower-devel)
+# - GAMEPAD
+# - BATTERY_STATUS (BR: upower-devel)
+# - FTL_JIT (BR: llvm, libcxxabi?)
 #
 # Conditional build:
 %bcond_without introspection   # disable introspection
-%bcond_without wayland         # Wayland target
+%bcond_with    seccomp         # seccomp filters (broken as of 2.6.5)
+%bcond_with    wayland         # Wayland target (broken as of 2.6.[0-5])
 #
 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:       2.4.4
-Release:       2
+Name:          gtk-webkit4
+Version:       2.6.5
+Release:       0.1
 License:       BSD-like
 Group:         X11/Libraries
 Source0:       http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
-# Source0-md5: 79edd28d32172abc17a8861622cc274f
+# Source0-md5: 44addb5ccdace97642cb7656382293bb
 Patch0:                atomic-ops.patch
 URL:           http://webkitgtk.org/
 BuildRequires: /usr/bin/ld.gold
 BuildRequires: EGL-devel
 BuildRequires: OpenGL-GLX-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: atk-devel
+BuildRequires: bison >= 2.3
+BuildRequires: cairo-devel >= 1.10.2
+BuildRequires: cmake >= 2.8.8
 BuildRequires: enchant-devel >= 0.22
-BuildRequires: flex >= 2.5.33
-BuildRequires: fontconfig-devel >= 2.5.0
-BuildRequires: freetype-devel >= 1:2.1.8
+BuildRequires: flex >= 2.5.34
+BuildRequires: fontconfig-devel >= 2.8.0
+BuildRequires: freetype-devel >= 1:2.4.2
 BuildRequires: gcc-c++ >= 6:4.7
 BuildRequires: geoclue2-devel >= 2.1.5
-BuildRequires: gettext-tools
+BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 1:2.36.0
 BuildRequires: glibc-misc
+BuildRequires: gnutls-devel >= 3.0.0
 %{?with_introspection:BuildRequires:   gobject-introspection-devel >= 1.32.0}
-BuildRequires: gperf
+BuildRequires: gperf >= 3.0.1
 BuildRequires: gstreamer-devel >= 1.0.3
 BuildRequires: gstreamer-plugins-base-devel >= 1.0.3
 BuildRequires: libstdc++-devel >= 6:4.7
 # GTK+ 2.x for webkit2 plugin process; GTK+ 3 for base GUI
 BuildRequires: gtk+2-devel >= 2:2.24.10
-BuildRequires: gtk+3-devel >= 3.10.0
+BuildRequires: gtk+3-devel >= 3.12.0
 BuildRequires: gtk-doc >= 1.10
 BuildRequires: harfbuzz-devel >= 0.9.7
 BuildRequires: harfbuzz-icu-devel >= 0.9.7
@@ -54,38 +57,36 @@ BuildRequires:      libpng-devel
 BuildRequires: libsecret-devel
 BuildRequires: libsoup-devel >= 2.42.0
 BuildRequires: libstdc++-devel
-# libtool with -fuse-ld= gcc option support
-BuildRequires: libtool >= 2:2.4.2-13
 BuildRequires: libwebp-devel
-BuildRequires: libxml2-devel >= 1:2.6.30
+BuildRequires: libxml2-devel >= 1:2.8.0
 BuildRequires: libxslt-devel >= 1.1.7
 BuildRequires: pango-devel >= 1:1.32.0
-BuildRequires: perl-base
+BuildRequires: perl-base >= 1:5.10.0
 BuildRequires: pkgconfig
-BuildRequires: python
+BuildRequires: python >= 1:2.6.0
 BuildRequires: rpmbuild(macros) >= 1.592
-BuildRequires: ruby
+BuildRequires: ruby >= 1.8.7
 BuildRequires: sqlite3-devel >= 3
 BuildRequires: tar >= 1:1.22
-BuildRequires: udev-glib-devel
+#BuildRequires:        udev-glib-devel
 BuildRequires: xorg-lib-libXcomposite-devel
 BuildRequires: xorg-lib-libXdamage-devel
 BuildRequires: xorg-lib-libXrender-devel
 BuildRequires: xorg-lib-libXt-devel
 BuildRequires: xz
 BuildRequires: zlib-devel
-Requires:      cairo >= 1.10
+Requires:      cairo >= 1.10.2
 Requires:      enchant >= 0.22
-Requires:      fontconfig-libs >= 2.5.0
-Requires:      freetype >= 1:2.1.8
+Requires:      fontconfig-libs >= 2.8.0
+Requires:      freetype >= 1:2.4.2
 Requires:      glib2 >= 1:2.36.0
 Requires:      gstreamer >= 1.0.3
 Requires:      gstreamer-plugins-base >= 1.0.3
 Requires:      gtk+2 >= 2:2.24.10
-Requires:      gtk+3 >= 3.10.0
+Requires:      gtk+3 >= 3.12.0
 Requires:      harfbuzz >= 0.9.7
 Requires:      libsoup >= 2.42.0
-Requires:      libxml2 >= 1:2.6.30
+Requires:      libxml2 >= 1:2.8.0
 Requires:      libxslt >= 1.1.7
 Requires:      pango >= 1:1.32.0
 %{?with_introspection:Conflicts:       gir-repository < 0.6.5-7}
@@ -107,7 +108,7 @@ Summary(pl.UTF-8):  Pliki programistyczne komponentu WebKit dla GTK+ 3
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      glib2-devel >= 1:2.36.0
-Requires:      gtk+3-devel >= 3.10.0
+Requires:      gtk+3-devel >= 3.12.0
 Requires:      libsoup-devel >= 2.42.0
 Requires:      libstdc++-devel
 
@@ -139,35 +140,41 @@ Dokumentacja API WebKita.
 %endif
 
 %build
-%{__libtoolize}
-%{__aclocal} -I Source/autotools
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       LDFLAGS="%{rpmldflags} -fuse-ld=gold" \
-       --disable-gtk-doc \
-       --disable-silent-rules \
-       --enable-geolocation \
-       --enable-glx \
-       %{__enable_disable introspection} \
-       %{!?with_wayland:--disable-wayland-target} \
-       --enable-webgl \
-       --with-gtk=3.0 \
-       --with-html-dir=%{_gtkdocdir}
-
-%{__make} -j1
+install -d build
+cd build
+%cmake .. \
+       -DENABLE_CREDENTIAL_STORAGE=ON \
+       -DENABLE_GEOLOCATION=ON \
+       -DENABLE_GTKDOC=ON \
+       %{?with_seccomp:-DENABLE_SECCOMP_FILTERS=ON} \
+       %{?with_wayland:-DENABLE_WAYLAND_TARGET=ON} \
+       -DENABLE_VIDEO=ON \
+       -DENABLE_WEB_AUDIO=ON \
+       -DENABLE_WEBGL=ON \
+       -DPORT=GTK \
+       -DSHOULD_INSTALL_JS_SHELL=ON
+
+#configure \
+#      LDFLAGS="%{rpmldflags} -fuse-ld=gold" \
+#      --disable-gtk-doc \
+#      --disable-silent-rules \
+#      --enable-geolocation \
+#      --enable-glx \
+#      %{__enable_disable introspection} \
+#      %{!?with_wayland:--disable-wayland-target} \
+#      --enable-webgl \
+#      --with-gtk=3.0 \
+#      --with-html-dir=%{_gtkdocdir}
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
        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-4.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -175,51 +182,45 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
-%files -f WebKitGTK-3.0.lang
+%files -f WebKitGTK-4.0.lang
 %defattr(644,root,root,755)
-%doc ChangeLog NEWS
-%attr(755,root,root) %{_bindir}/jsc-3
-%attr(755,root,root) %{_libexecdir}/WebKitNetworkProcess
-%attr(755,root,root) %{_libexecdir}/WebKitPluginProcess
-%attr(755,root,root) %{_libexecdir}/WebKitWebProcess
-%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.25
-%attr(755,root,root) %{_libdir}/libjavascriptcoregtk-3.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libjavascriptcoregtk-3.0.so.0
+%doc NEWS
+%attr(755,root,root) %{_bindir}/jsc
+%attr(755,root,root) %{_libdir}/libwebkit2gtk-4.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwebkit2gtk-4.0.so.37
+%attr(755,root,root) %{_libdir}/libjavascriptcoregtk-4.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libjavascriptcoregtk-4.0.so.18
 %if %{with introspection}
-%{_libdir}/girepository-1.0/JavaScriptCore-3.0.typelib
-%{_libdir}/girepository-1.0/WebKit-3.0.typelib
-%{_libdir}/girepository-1.0/WebKit2-3.0.typelib
-%{_libdir}/girepository-1.0/WebKit2WebExtension-3.0.typelib
+%{_libdir}/girepository-1.0/JavaScriptCore-4.0.typelib
+%{_libdir}/girepository-1.0/WebKit2-4.0.typelib
+%{_libdir}/girepository-1.0/WebKit2WebExtension-4.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 %{_libdir}/webkit2gtk-4.0
+%attr(755,root,root) %{_libdir}/webkit2gtk-4.0/WebKitNetworkProcess
+%attr(755,root,root) %{_libdir}/webkit2gtk-4.0/WebKitPluginProcess
+%attr(755,root,root) %{_libdir}/webkit2gtk-4.0/WebKitPluginProcess2
+%attr(755,root,root) %{_libdir}/webkit2gtk-4.0/WebKitWebProcess
+%dir %{_libdir}/webkit2gtk-4.0/injected-bundle
+%attr(755,root,root) %{_libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
 %dir %{_datadir}/webkitgtk-3.0
 %{_datadir}/webkitgtk-3.0/images
 %{_datadir}/webkitgtk-3.0/resources
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwebkitgtk-3.0.so
-%attr(755,root,root) %{_libdir}/libwebkit2gtk-3.0.so
-%attr(755,root,root) %{_libdir}/libjavascriptcoregtk-3.0.so
+%attr(755,root,root) %{_libdir}/libwebkit2gtk-4.0.so
+%attr(755,root,root) %{_libdir}/libjavascriptcoregtk-4.0.so
 %if %{with introspection}
-%{_datadir}/gir-1.0/JavaScriptCore-3.0.gir
-%{_datadir}/gir-1.0/WebKit-3.0.gir
-%{_datadir}/gir-1.0/WebKit2-3.0.gir
-%{_datadir}/gir-1.0/WebKit2WebExtension-3.0.gir
+%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
+%{_datadir}/gir-1.0/WebKit2-4.0.gir
+%{_datadir}/gir-1.0/WebKit2WebExtension-4.0.gir
 %endif
-%{_includedir}/webkitgtk-3.0
-%{_pkgconfigdir}/javascriptcoregtk-3.0.pc
-%{_pkgconfigdir}/webkitgtk-3.0.pc
-%{_pkgconfigdir}/webkit2gtk-3.0.pc
-%{_pkgconfigdir}/webkit2gtk-web-extension-3.0.pc
+%{_includedir}/webkitgtk-4.0
+%{_pkgconfigdir}/javascriptcoregtk-4.0.pc
+%{_pkgconfigdir}/webkit2gtk-4.0.pc
+%{_pkgconfigdir}/webkit2gtk-web-extension-4.0.pc
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/webkitgtk
-%{_gtkdocdir}/webkit2gtk
-%{_gtkdocdir}/webkitdomgtk
+%{_gtkdocdir}/webkit2gtk-4.0
+%{_gtkdocdir}/webkitdomgtk-4.0