- updated to 2.4.11 (Security fixes: CVE-2015-1120, CVE-2015-1076, CVE-2015-1071,

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

diff --git a/gtk-webkit.spec b/gtk-webkit.spec
index c4e607bfa56e0dff3b3e8c7022da4c2ab0ee7b69..16201f036e5570fc4d7f4c48ddcb2a88df820f46 100644 (file)
--- a/gtk-webkit.spec
+++ b/gtk-webkit.spec
@@ -2,19 +2,19 @@
 # Conditional build:
 %bcond_without introspection   # disable introspection
 #
-Summary:       Port of WebKit embeddable web component to GTK+
-Summary(pl.UTF-8):     Port osadzalnego komponentu WWW WebKit do GTK+
+Summary:       Port of WebKit embeddable web component to GTK+ 2
+Summary(pl.UTF-8):     Port osadzalnego komponentu WWW WebKit do GTK+ 2
 Name:          gtk-webkit
-Version:       2.0.3
-Release:       2
+# note: 2.4.x is the last series with webkitgtk-1 API and GTK+ 2.x support
+Version:       2.4.11
+Release:       1
 License:       BSD-like
 Group:         X11/Libraries
 Source0:       http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
-# Source0-md5: 9eca9eec4595b66b72a1ac7ceaef08ba
-Patch0:                %{name}-sync-builtins.patch
-Patch1:                %{name}-sh.patch
-Patch2:                %{name}-pl.po.patch
+# Source0-md5: 24a25ccc30a7914ae50922aedf24b7bc
+Patch0:                x32.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
@@ -27,14 +27,15 @@ 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: gettext-devel
+BuildRequires: geoclue2-devel >= 2.1.5
+BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 1:2.36.0
 BuildRequires: glibc-misc
 %{?with_introspection:BuildRequires:   gobject-introspection-devel >= 1.32.0}
 BuildRequires: gperf
 BuildRequires: gstreamer-devel >= 1.0.3
 BuildRequires: gstreamer-plugins-base-devel >= 1.0.3
+BuildRequires: libstdc++-devel >= 6:4.7
 BuildRequires: gtk+2-devel >= 2:2.24.10
 BuildRequires: gtk-doc >= 1.10
 BuildRequires: harfbuzz-devel >= 0.9.7
@@ -45,7 +46,8 @@ BuildRequires:        libpng-devel
 BuildRequires: libsecret-devel
 BuildRequires: libsoup-devel >= 2.42.0
 BuildRequires: libstdc++-devel
-BuildRequires: libtool >= 2:1.5
+# 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: libxslt-devel >= 1.1.7
@@ -80,11 +82,14 @@ 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-1.0.*
+
 %description
-webkit is a port of the WebKit embeddable web component to GTK+.
+gtk-webkit is a port of the WebKit embeddable web component to GTK+ 2.
 
 %description -l pl.UTF-8
-webkit to port osadzalnego komponentu WWW WebKit do GTK+.
+gtk-webkit to port osadzalnego komponentu WWW WebKit do GTK+ 2.
 
 %package devel
 Summary:       Development files for WebKit for GTK+ 2
@@ -105,8 +110,6 @@ Pliki programistyczne komponentu WebKit dla GTK+ 2.
 %prep
 %setup -q -n webkitgtk-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -115,6 +118,11 @@ Pliki programistyczne komponentu WebKit dla GTK+ 2.
 %{__autoheader}
 %{__automake}
 %configure \
+%ifarch %{x8664}
+       LDFLAGS="%{rpmldflags} -fuse-ld=gold" \
+%else
+       LDFLAGS="%{rpmldflags} -fuse-ld=bfd -Wl,--no-keep-memory" \
+%endif
        --disable-gtk-doc \
        --disable-silent-rules \
        --disable-webkit2 \
@@ -123,8 +131,7 @@ Pliki programistyczne komponentu WebKit dla GTK+ 2.
        %{__enable_disable introspection} \
        --enable-webgl \
        --with-gtk=2.0 \
-       --with-html-dir=%{_gtkdocdir} \
-       DFLAGS="%{rpmldflags} -fuse-ld=gold"
+       --with-html-dir=%{_gtkdocdir}
 
 %{__make} -j1
 
@@ -137,7 +144,7 @@ rm -rf $RPM_BUILD_ROOT
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*-1.0.la
 # packaged in gtk-webkit3
-%{__rm} -r $RPM_BUILD_ROOT%{_gtkdocdir}/webkitgtk
+%{__rm} -r $RPM_BUILD_ROOT%{_gtkdocdir}/{webkitgtk,webkitdomgtk}
 
 %find_lang WebKitGTK-2.0
 
@@ -156,20 +163,19 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libjavascriptcoregtk-1.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libjavascriptcoregtk-1.0.so.0
 %if %{with introspection}
-%{_libdir}/girepository-1.0/JSCore-1.0.typelib
+%{_libdir}/girepository-1.0/JavaScriptCore-1.0.typelib
 %{_libdir}/girepository-1.0/WebKit-1.0.typelib
 %endif
 %dir %{_datadir}/webkitgtk-1.0
 %{_datadir}/webkitgtk-1.0/images
 %{_datadir}/webkitgtk-1.0/resources
-%{_datadir}/webkitgtk-1.0/webinspector
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libjavascriptcoregtk-1.0.so
 %attr(755,root,root) %{_libdir}/libwebkitgtk-1.0.so
 %if %{with introspection}
-%{_datadir}/gir-1.0/JSCore-1.0.gir
+%{_datadir}/gir-1.0/JavaScriptCore-1.0.gir
 %{_datadir}/gir-1.0/WebKit-1.0.gir
 %endif
 %{_includedir}/webkitgtk-1.0