diff --git a/.gitignore b/.gitignore index e9a9dc5..0da968e 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ webkit-1.3.2.tar.gz /webkit-1.8.3.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@webkit.org" + +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 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/webkitgtk.spec b/webkitgtk.spec index 61fa568..22fce92 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -22,7 +22,7 @@ %bcond_with pango Name: webkitgtk -Version: 1.10.1 +Version: 1.10.2 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -37,6 +37,9 @@ Source0: http://www.webkitgtk.org/releases/webkitgtk-%{version}.tar.xz # add support for nspluginwrapper. Patch2: webkit-1.3.10-nspluginwrapper.patch +# Explicitly link with -lrt +# https://bugs.webkit.org/show_bug.cgi?id=103194 +Patch3: webkitgtk-librt.patch BuildRequires: bison BuildRequires: chrpath @@ -103,6 +106,10 @@ This package contains developer documentation for %{name}. %prep %setup -qn "webkitgtk-%{version}" %patch2 -p1 -b .nspluginwrapper +%patch3 -p1 -b .librt + +# For patch3 +autoreconf --verbose --install -I Source/autotools %build %ifarch s390 %{arm} @@ -220,6 +227,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/gtk-doc/html/webkitgtk %changelog +* Mon Dec 10 2012 Kalev Lember 1.10.2-1 +- Update to 1.10.2 +- Add a patch to explicitly link with librt + * Sun Oct 21 2012 Kevin Fenzi 1.10.1-1 - Update to 1.10.1