- 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 f5cb0c335f9e11cbf3c5ac0a88e146a5cfe82ced..16201f036e5570fc4d7f4c48ddcb2a88df820f46 100644 (file)
--- a/gtk-webkit.spec
+++ b/gtk-webkit.spec
@@ -2,15 +2,17 @@
 # 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.4.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: da2b1b0f0863f3f21bdbc0476001589f
+# Source0-md5: 24a25ccc30a7914ae50922aedf24b7bc
+Patch0:                x32.patch
 URL:           http://webkitgtk.org/
 BuildRequires: /usr/bin/ld.gold
 BuildRequires: EGL-devel
@@ -26,7 +28,7 @@ BuildRequires:        fontconfig-devel >= 2.5.0
 BuildRequires: freetype-devel >= 1:2.1.8
 BuildRequires: gcc-c++ >= 6:4.7
 BuildRequires: geoclue2-devel >= 2.1.5
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 1:2.36.0
 BuildRequires: glibc-misc
 %{?with_introspection:BuildRequires:   gobject-introspection-devel >= 1.32.0}
@@ -84,10 +86,10 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                skip_post_check_so      lib.*gtk-1.0.*
 
 %description
-gtk-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
-gtk-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
@@ -107,6 +109,7 @@ Pliki programistyczne komponentu WebKit dla GTK+ 2.
 
 %prep
 %setup -q -n webkitgtk-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -115,7 +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 \