Merge branch 'master' of git://git.pld-linux.org/packages/gtk-webkit3

[packages/gtk-webkit3.git] / gtk-webkit3.spec

diff --git a/gtk-webkit3.spec b/gtk-webkit3.spec
index b2707f0312f8082bc6c3ebd7976f7b67ef681814..bbce94cc16c07638cdaca96ad183c2a47b159be6 100644 (file)
--- a/gtk-webkit3.spec
+++ b/gtk-webkit3.spec
@@ -1,21 +1,22 @@
 # TODO: review configure options:
-# - gamepad, web-audio
+# - gamepad
 # - battery-status (BR: upower-devel)
 #
 # Conditional build:
 %bcond_without introspection   # disable introspection
+%bcond_without wayland         # Wayland target
 #
 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.2.1
-Release:       4
+Version:       2.4.0
+Release:       1
 License:       BSD-like
 Group:         X11/Libraries
 Source0:       http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
-# Source0-md5: f5decdd76b2c08ab6e01ac47342f680e
-Patch0:                sync-builtins.patch
+# Source0-md5: c759bf11fe4cadd1268630f16a97f7b9
 URL:           http://webkitgtk.org/
+BuildRequires: /usr/bin/ld.gold
 BuildRequires: EGL-devel
 BuildRequires: OpenGL-GLX-devel
 BuildRequires: at-spi2-core-devel >= 2.6.0
@@ -28,7 +29,7 @@ BuildRequires:        flex >= 2.5.33
 BuildRequires: fontconfig-devel >= 2.5.0
 BuildRequires: freetype-devel >= 1:2.1.8
 BuildRequires: gcc-c++ >= 6:4.7
-BuildRequires: geoclue-devel
+BuildRequires: geoclue2-devel >= 2.1.5
 BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 1:2.36.0
 BuildRequires: glibc-misc
@@ -36,6 +37,7 @@ BuildRequires:        glibc-misc
 BuildRequires: gperf
 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
@@ -68,7 +70,6 @@ BuildRequires:        xorg-lib-libXrender-devel
 BuildRequires: xorg-lib-libXt-devel
 BuildRequires: xz
 BuildRequires: zlib-devel
-BuildRequires: /usr/bin/ld.gold
 Requires:      cairo >= 1.10
 Requires:      enchant >= 0.22
 Requires:      fontconfig-libs >= 2.5.0
@@ -86,8 +87,12 @@ Requires:    pango >= 1:1.32.0
 %{?with_introspection:Conflicts:       gir-repository < 0.6.5-7}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# __once_call, __once_called non-function symbols from libstdc++
+%define                skip_post_check_so      lib.*gtk-3.0.*
+
 %description
-gtk-webkit3 is a port of the WebKit embeddable web component to GTK+ 3.
+gtk-webkit3 is a port of the WebKit embeddable web component to GTK+
+3.
 
 %description -l pl.UTF-8
 gtk-webkit3 to port osadzalnego komponentu WWW WebKit do GTK+ 3.
@@ -113,6 +118,9 @@ Summary:    WebKit API documentation
 Summary(pl.UTF-8):     Dokumentacja API WebKita
 Group:         Documentation
 Requires:      gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description apidocs
 WebKit API documentation.
@@ -122,7 +130,6 @@ Dokumentacja API WebKita.
 
 %prep
 %setup -q -n webkitgtk-%{version}
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -137,6 +144,7 @@ Dokumentacja API WebKita.
        --enable-geolocation \
        --enable-glx \
        %{__enable_disable introspection} \
+       %{!?with_wayland:--disable-wayland-target} \
        --enable-webgl \
        --with-gtk=3.0 \
        --with-html-dir=%{_gtkdocdir}
@@ -164,6 +172,7 @@ rm -rf $RPM_BUILD_ROOT
 %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.*.*.*
@@ -176,6 +185,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
 %endif
 %dir %{_libdir}/webkit2gtk-3.0
 %dir %{_libdir}/webkit2gtk-3.0/injected-bundle
@@ -193,13 +203,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
 %endif
 %{_includedir}/webkitgtk-3.0
+%{_pkgconfigdir}/javascriptcoregtk-3.0.pc
 %{_pkgconfigdir}/webkitgtk-3.0.pc
 %{_pkgconfigdir}/webkit2gtk-3.0.pc
-%{_pkgconfigdir}/javascriptcoregtk-3.0.pc
+%{_pkgconfigdir}/webkit2gtk-web-extension-3.0.pc
 
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/webkitgtk
 %{_gtkdocdir}/webkit2gtk
+%{_gtkdocdir}/webkitdomgtk