Hello community, here is the log from the commit of package libwebkit for openSUSE:Factory checked in at 2012-12-09 14:09:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libwebkit (Old) and /work/SRC/openSUSE:Factory/.libwebkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libwebkit", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libwebkit/libwebkit.changes 2012-10-19 13:33:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libwebkit.new/libwebkit.changes 2012-12-09 14:10:00.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Dec 5 09:22:32 UTC 2012 - [email protected] + +- Add webkit-shm_unlink-moved-to-librt.patch: shm_unlink moved to + librt with glibc 2.17. +- Add libtool BuildRequires and call to autoreconf, as above patch + touches the build system. + +------------------------------------------------------------------- libwebkit3.changes: same change New: ---- webkit-shm_unlink-moved-to-librt.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwebkit.spec ++++++ --- /var/tmp/diff_new_pack.MRgPKj/_old 2012-12-09 14:10:02.000000000 +0100 +++ /var/tmp/diff_new_pack.MRgPKj/_new 2012-12-09 14:10:02.000000000 +0100 @@ -58,6 +58,8 @@ Patch0: webkit-gir-fixup.patch # PATCH-FIX-OPENSUSE webkit-ld-optimization.patch [email protected] -- Add ld options to use less memory when linking, should help building on OBS, but this will be slower Patch2: webkit-ld-optimization.patch +# PATCH-FIX-UPSTREAM webkit-shm_unlink-moved-to-librt.patch webkit#104118 [email protected] -- shm_unlink moved to librt with glibc 2.17 +Patch3: webkit-shm_unlink-moved-to-librt.patch BuildRequires: Mesa-devel BuildRequires: bison BuildRequires: flex @@ -67,6 +69,8 @@ BuildRequires: gtk-doc BuildRequires: libicu-devel BuildRequires: libjpeg-devel +# Needed for patch3 +BuildRequires: libtool BuildRequires: perl BuildRequires: python BuildRequires: ruby @@ -251,6 +255,7 @@ %setup -q -n webkitgtk-%{version} %patch0 -p1 %patch2 +%patch3 -p1 # FIXME: workaround needed in > 1.7.90 to fix build mkdir DerivedSources/ANGLE mkdir DerivedSources/InjectedBundle @@ -273,6 +278,8 @@ # No debug builds.... We run out of about everything with -O2 -g (the .ar becomes > 4.3GB) export CFLAGS=" $RPM_OPT_FLAGS -g0" export CXXFLAGS=" $RPM_OPT_FLAGS -g0" +# Needed by patch3 +autoreconf --verbose --install -I Source/autotools %configure \ --with-gtk=%{_gtkver} \ --enable-geolocation \ libwebkit3.spec: same change ++++++ webkit-shm_unlink-moved-to-librt.patch ++++++ diff -ur webkitgtk-1.10.1/configure.ac webkitgtk-1.10.1.patched/configure.ac --- webkitgtk-1.10.1/configure.ac 2012-10-17 00:03:04.000000000 +0200 +++ webkitgtk-1.10.1.patched/configure.ac 2012-12-05 09:48:21.122459760 +0100 @@ -206,6 +206,11 @@ AC_MSG_WARN([pthread rwlock support is not available])) fi +# shm_unlink is moved to librt in newer versions of glibc (>= 2.17) +AC_CHECK_LIB([rt], [shm_unlink], + [RT_LIBS="-lrt"]) +AC_SUBST(RT_LIBS) + # check for libjpeg the way Gtk does it. AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, jpeg_ok=yes, jpeg_ok=no diff -ur webkitgtk-1.10.1/Source/WebKit2/GNUmakefile.am webkitgtk-1.10.1.patched/Source/WebKit2/GNUmakefile.am --- webkitgtk-1.10.1/Source/WebKit2/GNUmakefile.am 2012-10-16 20:27:14.000000000 +0200 +++ webkitgtk-1.10.1.patched/Source/WebKit2/GNUmakefile.am 2012-12-05 14:18:25.184395655 +0100 @@ -492,6 +492,7 @@ $(OPENGL_LIBS) \ $(PANGO_LIBS) \ $(PNG_LIBS) \ + $(RT_LIBS) \ $(SHLWAPI_LIBS) \ $(SQLITE3_LIBS) \ $(UNICODE_LIBS) \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
