[webkitgtk3] Update to 1.11.2

Kalev Lember kalev at fedoraproject.org
Sun Nov 25 04:04:19 UTC 2012


commit 7c2f3ef72001f656dfc56275f843214f67b324ea
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sat Nov 24 23:02:50 2012 +0100

    Update to 1.11.2
    
    - Add a patch to explicitly link with librt

 .gitignore            |    1 +
 sources               |    2 +-
 webkitgtk-librt.patch |   32 ++++++++++++++++++++++++++++++++
 webkitgtk3.spec       |   16 +++++++++++++++-
 4 files changed, 49 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ffcc1e9..ca68e09 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.11.2.tar.xz
diff --git a/sources b/sources
index 968b8be..d83e5a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28c930cda012391453c476cdacfaca65  webkitgtk-1.10.1.tar.xz
+5db53912982617b952bd2722d56ba74f  webkitgtk-1.11.2.tar.xz
diff --git a/webkitgtk-librt.patch b/webkitgtk-librt.patch
new file mode 100644
index 0000000..22d1c1e
--- /dev/null
+++ b/webkitgtk-librt.patch
@@ -0,0 +1,32 @@
+diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am
+index 9a02bbd..c775990 100644
+--- a/Source/WebKit2/GNUmakefile.am
++++ b/Source/WebKit2/GNUmakefile.am
+@@ -572,6 +572,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..1fa99f0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1118,6 +1118,15 @@ 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
++       save_LIBS="$LIBS"
++       AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"])
++       AC_SUBST(SHM_LIBS)
++       LIBS="$save_LIBS"
++   fi
+ fi
+ 
+ # Plugin Process
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index 2a9a3ba..76d7b1b 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.11.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
@@ -35,6 +38,7 @@ BuildRequires:  libsoup-devel >= 2.37.2.1
 BuildRequires:  libicu-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
+BuildRequires:  libsecret-devel
 BuildRequires:  libxslt-devel
 BuildRequires:  libXt-devel
 BuildRequires:  pcre-devel
@@ -84,6 +88,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 +177,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 +194,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 +205,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 
 %changelog
+* Sat Nov 24 2012 Kalev Lember <kalevlember at gmail.com> - 1.11.2-1
+- Update to 1.11.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