[packages/gtk-webkit3: 1/2] - updated to 2.4.0 - removed outdated sync-builtins patch

Fri Apr 4 20:40:23 CEST 2014

commit b19bf66fd77b7a79bfb07430ea859b2cc129ca02
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Apr 4 20:41:10 2014 +0200

    - updated to 2.4.0
    - removed outdated sync-builtins patch

 gtk-webkit3.spec    | 23 ++++++++++++++++-------
 sync-builtins.patch | 49 -------------------------------------------------
 2 files changed, 16 insertions(+), 56 deletions(-)
---

diff --git a/gtk-webkit3.spec b/gtk-webkit3.spec
index 8a4a97c..3048b93 100644
--- a/gtk-webkit3.spec
+++ b/gtk-webkit3.spec
@@ -4,17 +4,17 @@
 #
 # 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.4
+Version:	2.4.0
 Release:	1
 License:	BSD-like
 Group:		X11/Libraries
 Source0:	http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
-# Source0-md5:	d2af0d2d75f18cac33bd82ee63e22571
-Patch0:		sync-builtins.patch
+# Source0-md5:	c759bf11fe4cadd1268630f16a97f7b9
 URL:		http://webkitgtk.org/
 BuildRequires:	EGL-devel
 BuildRequires:	OpenGL-GLX-devel
@@ -28,7 +28,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
@@ -86,8 +86,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.
@@ -122,7 +126,6 @@ Dokumentacja API WebKita.
 
 %prep
 %setup -q -n webkitgtk-%{version}
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -137,6 +140,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 +168,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 +181,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 +199,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
diff --git a/sync-builtins.patch b/sync-builtins.patch
deleted file mode 100644
index 3d94d37..0000000
--- a/sync-builtins.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- webkitgtk-2.0.0/configure.ac.orig	2013-04-12 08:25:14.896829422 +0200
-+++ webkitgtk-2.0.0/configure.ac	2013-04-12 08:27:21.244776999 +0200
-@@ -32,6 +32,18 @@
- AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz no-dist-gzip tar-ustar])
- m4_include([Source/autotools/SetupAutomake.m4])
- 
-+dnl Check whether the target supports 64-bit __sync_*_compare_and_swap.
-+AC_TRY_LINK([#include <stdint.h>],
-+    [uint64_t foo, bar;
-+     bar = __sync_val_compare_and_swap(&foo, 0, 1);],
-+     wtf_cv_have_64bit_sync_builtins=yes,
-+     wtf_cv_have_64bit_sync_builtins=no)
-+
-+if test $wtf_cv_have_64bit_sync_builtins = yes; then
-+    AC_DEFINE(HAVE_64BIT_SYNC_BUILTINS, 1,
-+              [Define to 1 if the target supports 64-bit __sync_*_compare_and_swap])
-+fi
-+
- ######################################################################################
- # Processing of configuration files
- ######################################################################################
---- webkitgtk-2.0.0/Source/WTF/wtf/Atomics.h~	2013-04-12 08:05:55.951740895 +0200
-+++ webkitgtk-2.0.0/Source/WTF/wtf/Atomics.h	2013-04-12 08:22:46.701992338 +0200
-@@ -70,6 +70,9 @@
- #elif OS(ANDROID)
- #include <sys/atomics.h>
- #endif
-+#ifndef HAVE_64BIT_SYNC_BUILTINS
-+#include <pthread.h>
-+#endif
- 
- namespace WTF {
- 
-@@ -113,8 +113,15 @@
- inline int atomicIncrement(int volatile* addend) { return __sync_add_and_fetch(addend, 1); }
- inline int atomicDecrement(int volatile* addend) { return __sync_sub_and_fetch(addend, 1); }
- 
-+#ifdef HAVE_64BIT_SYNC_BUILTINS
- inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_add_and_fetch(addend, 1); }
- inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_sub_and_fetch(addend, 1); }
-+#else
-+static pthread_mutex_t global_wtf_lock = PTHREAD_MUTEX_INITIALIZER;
-+
-+inline int64_t atomicIncrement(int64_t volatile* addend) { pthread_mutex_lock(&global_wtf_lock); int64_t v = (*addend)++; pthread_mutex_unlock(&global_wtf_lock); return v; }
-+inline int64_t atomicDecrement(int64_t volatile* addend) { pthread_mutex_lock(&global_wtf_lock); int64_t v = (*addend)--; pthread_mutex_unlock(&global_wtf_lock); return v; }
-+#endif
- 
- #endif
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit3.git/commitdiff/5006703c2577eb72f2380c616ea1607b1bfa85cf

