[webkitgtk3/f18] Update to 1.10.2
Kalev Lember
kalev at fedoraproject.org
Mon Dec 10 21:30:03 UTC 2012
commit 4b733316ea1aadaa2859d356d7b764deeff3544f
Author: Kalev Lember <kalevlember at gmail.com>
Date: Mon Dec 10 16:30:58 2012 +0100
Update to 1.10.2
- Add a patch to explicitly link with librt
.gitignore | 1 +
sources | 2 +-
webkitgtk-librt.patch | 62 +++++++++++++++++++++++++++++++++++++++++++++++++
webkitgtk3.spec | 15 +++++++++++-
4 files changed, 78 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ffcc1e9..c42cc6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ webkit-1.3.3.tar.gz
/webkit-1.9.92.tar.xz
/webkitgtk-1.10.0.tar.xz
/webkitgtk-1.10.1.tar.xz
+/webkitgtk-1.10.2.tar.xz
diff --git a/sources b/sources
index 968b8be..9c1ffda 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28c930cda012391453c476cdacfaca65 webkitgtk-1.10.1.tar.xz
+7b1a652af1eb11bee5bf7209e9ff67e6 webkitgtk-1.10.2.tar.xz
diff --git a/webkitgtk-librt.patch b/webkitgtk-librt.patch
new file mode 100644
index 0000000..1876e90
--- /dev/null
+++ b/webkitgtk-librt.patch
@@ -0,0 +1,62 @@
+From 35b1ae6cdb8af8c3b3283e84c0f55ca03f1a2e85 Mon Sep 17 00:00:00 2001
+From: "mrobinson at webkit.org"
+ <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Mon, 26 Nov 2012 22:00:15 +0000
+Subject: [PATCH] [GTK] Explicitly link against librt
+ https://bugs.webkit.org/show_bug.cgi?id=103194
+
+Patch by Kalev Lember <kalevlember at gmail.com> on 2012-11-26
+Reviewed by Martin Robinson.
+
+Fixes broken build with undefined references to shm_open / shm_unlink
+symbols. SharedMemoryUnix.cpp uses these so we need to link with -lrt.
+
+.:
+
+* configure.ac:
+
+Source/WebKit2:
+
+* GNUmakefile.am:
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@135761 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ ChangeLog | 12 ++++++++++++
+ Source/WebKit2/ChangeLog | 12 ++++++++++++
+ Source/WebKit2/GNUmakefile.am | 1 +
+ configure.ac | 7 +++++++
+ 4 files changed, 32 insertions(+)
+
+diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am
+index 097cdc1..ff5ff1f 100644
+--- a/Source/WebKit2/GNUmakefile.am
++++ b/Source/WebKit2/GNUmakefile.am
+@@ -566,6 +566,7 @@ Programs_WebKitPluginProcess_LDADD += \
+ $(PANGO_LIBS) \
+ $(PNG_LIBS) \
+ $(SHLWAPI_LIBS) \
++ $(SHM_LIBS) \
+ $(SQLITE3_LIBS) \
+ $(UNICODE_LIBS) \
+ $(XRENDER_LIBS) \
+diff --git a/configure.ac b/configure.ac
+index 4e1f0e8..97980e4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1118,6 +1118,13 @@ if test "$enable_webkit2" = "yes"; then
+ if test "$have_gtk_unix_printing" = "yes"; then
+ AC_DEFINE([HAVE_GTK_UNIX_PRINTING], [1], [Define if GTK+ UNIX Printing is available])
+ fi
++
++ # On some Linux/Unix platforms, shm_* may only be available if linking
++ # against librt
++ if test "$os_win32" = "no"; then
++ AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"])
++ AC_SUBST(SHM_LIBS)
++ fi
+ fi
+
+ # Plugin Process
+--
+1.8.0.1
+
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index 2a9a3ba..9983657 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -6,7 +6,7 @@
cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g')
Name: webkitgtk3
-Version: 1.10.1
+Version: 1.10.2
Release: 1%{?dist}
Summary: GTK+ Web content engine library
@@ -18,6 +18,9 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
Patch1: webkit-1.3.4-no-execmem.patch
Patch2: webkit-1.1.14-nspluginwrapper.patch
+# Explicitly link with -lrt
+# https://bugs.webkit.org/show_bug.cgi?id=103194
+Patch3: webkitgtk-librt.patch
BuildRequires: bison
BuildRequires: chrpath
@@ -84,6 +87,10 @@ This package contains developer documentation for %{name}.
# tbzatek - doesn't apply, is this fixed?
# %patch1 -p1 -b .no-execmem
%patch2 -p1 -b .nspluginwrapper
+%patch3 -p1 -b .librt
+
+# For patch3
+autoreconf --verbose --install -I Source/autotools
%build
%ifarch s390 %{arm} ppc
@@ -169,6 +176,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_libdir}/libwebkit2gtk-3.0.so.*
%{_libdir}/libjavascriptcoregtk-3.0.so.*
%{_libdir}/girepository-1.0/WebKit-3.0.typelib
+%{_libdir}/girepository-1.0/WebKit2-3.0.typelib
%{_libdir}/girepository-1.0/JSCore-3.0.typelib
%{_libexecdir}/%{name}/
%{_libexecdir}/WebKitPluginProcess
@@ -185,6 +193,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_libdir}/pkgconfig/webkit2gtk-3.0.pc
%{_libdir}/pkgconfig/javascriptcoregtk-3.0.pc
%{_datadir}/gir-1.0/WebKit-3.0.gir
+%{_datadir}/gir-1.0/WebKit2-3.0.gir
%{_datadir}/gir-1.0/JSCore-3.0.gir
%files doc
@@ -195,6 +204,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%changelog
+* Mon Dec 10 2012 Kalev Lember <kalevlember at gmail.com> - 1.10.2-1
+- Update to 1.10.2
+- Add a patch to explicitly link with librt
+
* Wed Oct 17 2012 Kalev Lember <kalevlember at gmail.com> - 1.10.1-1
- Update to 1.10.1
- Enable the parallel build
More information about the scm-commits
mailing list