- fix overloaded 'abs(gdouble)' is ambiguous error

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

diff --git a/gtk-webkit3.spec b/gtk-webkit3.spec
index 3048b9375099ffd2e82ce5f83845ce887a0eda4a..7de581aee3027ea2d7be62fddce6450e4878f32f 100644 (file)
--- a/gtk-webkit3.spec
+++ b/gtk-webkit3.spec
@@ -9,13 +9,18 @@
 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.0
-Release:       1
+# note: for 2.6.x series see gtk-webkit4
+Version:       2.4.11
+Release:       3
 License:       BSD-like
 Group:         X11/Libraries
 Source0:       http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
-# Source0-md5: c759bf11fe4cadd1268630f16a97f7b9
+# Source0-md5: 24a25ccc30a7914ae50922aedf24b7bc
+Patch0:                atomic-ops.patch
+Patch1:                x32.patch
+Patch2:                abs.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
@@ -29,19 +34,23 @@ 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}
 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
 BuildRequires: gtk-doc >= 1.10
 BuildRequires: harfbuzz-devel >= 0.9.7
 BuildRequires: harfbuzz-icu-devel >= 0.9.7
+%ifarch i386 i486
+BuildRequires: libatomic-devel
+%endif
 BuildRequires: libicu-devel >= 4.2.1
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -68,7 +77,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
@@ -117,6 +125,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.
@@ -126,6 +137,11 @@ Dokumentacja API WebKita.
 
 %prep
 %setup -q -n webkitgtk-%{version}
+%ifarch i386 i486
+%patch0 -p1
+%endif
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -134,7 +150,11 @@ Dokumentacja API WebKita.
 %{__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 \
        --enable-geolocation \