From edca0c7e67b3d0a9b241d321639beb6def291c59 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Mar 23 2016 20:27:56 +0000 Subject: Merge branch 'master' into f23 --- diff --git a/.gitignore b/.gitignore index 9c50a5f..ab2cdc8 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,12 @@ /webkitgtk-2.10.7.tar.xz /webkitgtk-2.10.8.tar.xz /webkitgtk-2.10.9.tar.xz +/webkitgtk-2.11.1.tar.xz +/webkitgtk-2.11.2.tar.xz +/webkitgtk-2.11.3.tar.xz +/webkitgtk-2.11.4.tar.xz +/webkitgtk-2.11.5.tar.xz +/webkitgtk-2.11.90.tar.xz +/webkitgtk-2.11.91.tar.xz +/webkitgtk-2.11.92.tar.xz +/webkitgtk-2.12.0.tar.xz diff --git a/sources b/sources index bd7a17f..1859270 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -910749295bd17738469ae19ec9dded24 webkitgtk-2.10.9.tar.xz +d233b5594c37a961308c230207d8b64f webkitgtk-2.12.0.tar.xz diff --git a/webkitgtk-2.11.5-youtube.patch b/webkitgtk-2.11.5-youtube.patch new file mode 100644 index 0000000..e5a43a3 --- /dev/null +++ b/webkitgtk-2.11.5-youtube.patch @@ -0,0 +1,34 @@ +diff -up webkitgtk-2.11.5/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp.orig webkitgtk-2.11.5/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp +--- webkitgtk-2.11.5/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp.orig 2016-02-09 10:04:54.898217667 +0100 ++++ webkitgtk-2.11.5/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2016-02-09 10:13:35.080875509 +0100 +@@ -1734,7 +1734,7 @@ static HashSet error; ++ GUniqueOutPtr stdout_to_discard; ++ GUniqueOutPtr stderr_to_discard; ++ gboolean success = g_spawn_command_line_sync( ++ "rpm -qi gstreamer1-libav", ++ &stdout_to_discard.outPtr(), ++ &stderr_to_discard.outPtr(), ++ &exit_status, ++ &error.outPtr()); ++ if (success && !error && !exit_status) ++ set.add(String::fromUTF8("video/mp4")); ++ + return set; + }(); + return cache; diff --git a/webkitgtk-2.5.90-cloop_fix.patch b/webkitgtk-2.5.90-cloop_fix.patch deleted file mode 100644 index c033641..0000000 --- a/webkitgtk-2.5.90-cloop_fix.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -up webkitgtk-2.5.90/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix webkitgtk-2.5.90/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm ---- webkitgtk-2.5.90/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix 2014-09-22 01:22:29.943407090 -0600 -+++ webkitgtk-2.5.90/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-09-22 01:20:25.463025643 -0600 -@@ -2094,7 +2094,7 @@ macro loadWithStructureCheck(operand, sl - end - - macro getProperty() -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - loadPropertyAtVariableOffset(t1, t0, t2) - valueProfile(t2, 7, t0) - loadisFromInstruction(1, t0) -@@ -2111,7 +2111,7 @@ end - - macro getClosureVar() - loadp JSEnvironmentRecord::m_registers[t0], t0 -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - loadq [t0, t1, 8], t0 - valueProfile(t0, 7, t1) - loadisFromInstruction(1, t1) -@@ -2168,7 +2168,7 @@ _llint_op_get_from_scope: - macro putProperty() - loadisFromInstruction(3, t1) - loadConstantOrVariable(t1, t2) -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - storePropertyAtVariableOffset(t1, t0, t2) - end - -@@ -2185,7 +2185,7 @@ macro putClosureVar() - loadisFromInstruction(3, t1) - loadConstantOrVariable(t1, t2) - loadp JSEnvironmentRecord::m_registers[t0], t0 -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - storeq t2, [t0, t1, 8] - end - -diff -up webkitgtk-2.5.90/Source/JavaScriptCore/bytecode/CodeBlock.cpp.cloop_fix webkitgtk-2.5.90/Source/JavaScriptCore/bytecode/CodeBlock.cpp ---- webkitgtk-2.5.90/Source/JavaScriptCore/bytecode/CodeBlock.cpp.cloop_fix 2014-09-17 06:31:08.000000000 -0600 -+++ webkitgtk-2.5.90/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-09-24 06:00:21.573643180 -0600 -@@ -1519,13 +1519,13 @@ void CodeBlock::dumpBytecode( - int id0 = (++it)->u.operand; - ResolveModeAndType modeAndType = ResolveModeAndType((++it)->u.operand); - ++it; // Structure -- int operand = (++it)->u.operand; // Operand -+ void *operand = (++it)->u.pointer; // Operand - ++it; // Skip value profile. - printLocationAndOp(out, exec, location, it, "get_from_scope"); -- out.printf("%s, %s, %s, %u<%s|%s>, , %d", -+ out.printf("%s, %s, %s, %u<%s|%s>, , %lu", - registerName(r0).data(), registerName(r1).data(), idName(id0, identifier(id0)).data(), - modeAndType.operand(), resolveModeName(modeAndType.mode()), resolveTypeName(modeAndType.type()), -- operand); -+ reinterpret_cast(operand)); - break; - } - case op_put_to_scope: { -@@ -1534,12 +1534,12 @@ void CodeBlock::dumpBytecode( - int r1 = (++it)->u.operand; - ResolveModeAndType modeAndType = ResolveModeAndType((++it)->u.operand); - ++it; // Structure -- int operand = (++it)->u.operand; // Operand -+ void *operand = (++it)->u.pointer; // Operand - printLocationAndOp(out, exec, location, it, "put_to_scope"); -- out.printf("%s, %s, %s, %u<%s|%s>, , %d", -+ out.printf("%s, %s, %s, %u<%s|%s>, , %lu", - registerName(r0).data(), idName(id0, identifier(id0)).data(), registerName(r1).data(), - modeAndType.operand(), resolveModeName(modeAndType.mode()), resolveTypeName(modeAndType.type()), -- operand); -+ reinterpret_cast(operand)); - break; - } - default: -diff -up webkitgtk-2.5.90/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix webkitgtk-2.5.90/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp ---- webkitgtk-2.5.90/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix 2014-09-22 01:23:26.643580502 -0600 -+++ webkitgtk-2.5.90/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-09-24 06:02:36.574037807 -0600 -@@ -1392,7 +1396,7 @@ LLINT_SLOW_PATH_DECL(slow_path_get_from_ - { - ConcurrentJITLocker locker(codeBlock->m_lock); - pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), structure); -- pc[6].u.operand = slot.cachedOffset(); -+ pc[6].u.pointer = reinterpret_cast(slot.cachedOffset()); - } - structure->startWatchingPropertyForReplacements(vm, slot.cachedOffset()); - } -diff -up webkitgtk-2.5.90/Source/JavaScriptCore/runtime/CommonSlowPaths.h.cloop_fix webkitgtk-2.5.90/Source/JavaScriptCore/runtime/CommonSlowPaths.h ---- webkitgtk-2.5.90/Source/JavaScriptCore/runtime/CommonSlowPaths.h.cloop_fix 2014-09-22 01:25:13.843908763 -0600 -+++ webkitgtk-2.5.90/Source/JavaScriptCore/runtime/CommonSlowPaths.h 2014-09-24 06:03:23.834201352 -0600 -@@ -115,7 +116,7 @@ inline void tryCachePutToScopeGlobal( - - ConcurrentJITLocker locker(codeBlock->m_lock); - pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure()); -- pc[6].u.operand = slot.cachedOffset(); -+ pc[6].u.pointer = reinterpret_cast(slot.cachedOffset()); - } - - } // namespace CommonSlowPaths diff --git a/webkitgtk-2.8.0-s390_fixes.patch b/webkitgtk-2.8.0-s390_fixes.patch deleted file mode 100644 index a73290b..0000000 --- a/webkitgtk-2.8.0-s390_fixes.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up webkitgtk-2.8.0/Source/bmalloc/bmalloc/Algorithm.h.s390_fixes webkitgtk-2.8.0/Source/bmalloc/bmalloc/Algorithm.h ---- webkitgtk-2.8.0/Source/bmalloc/bmalloc/Algorithm.h.s390_fixes 2015-03-04 15:25:17.000000000 +0100 -+++ webkitgtk-2.8.0/Source/bmalloc/bmalloc/Algorithm.h 2015-03-27 10:59:40.245010499 +0100 -@@ -66,7 +66,7 @@ inline constexpr bool isPowerOfTwo(size_ - template inline T roundUpToMultipleOf(size_t divisor, T x) - { - BASSERT(isPowerOfTwo(divisor)); -- return reinterpret_cast((reinterpret_cast(x) + (divisor - 1)) & ~(divisor - 1)); -+ return reinterpret_cast((reinterpret_cast(x) + (divisor - 1)) & ~(divisor - 1)); - } - - template inline constexpr T roundUpToMultipleOf(T x) -diff -up webkitgtk-2.8.0/Source/bmalloc/bmalloc/Sizes.h.s390_fixes webkitgtk-2.8.0/Source/bmalloc/bmalloc/Sizes.h ---- webkitgtk-2.8.0/Source/bmalloc/bmalloc/Sizes.h.s390_fixes 2015-03-04 15:25:17.000000000 +0100 -+++ webkitgtk-2.8.0/Source/bmalloc/bmalloc/Sizes.h 2015-03-27 10:59:40.245010499 +0100 -@@ -99,7 +99,7 @@ namespace Sizes { - inline size_t sizeClass(size_t size) - { - static const size_t sizeClassMask = (mediumMax / alignment) - 1; -- return mask((size - 1) / alignment, sizeClassMask); -+ return mask(static_cast((size - 1) / alignment), sizeClassMask); - } - - inline size_t objectSize(size_t sizeClass) diff --git a/webkitgtk-2.9.4-youtube.patch b/webkitgtk-2.9.4-youtube.patch deleted file mode 100644 index 2d74ab7..0000000 --- a/webkitgtk-2.9.4-youtube.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp -index 8929f2e..419330d 100644 ---- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp -+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp -@@ -1767,7 +1767,7 @@ static HashSet mimeTypeCache() - "video/flv", - "video/mj2", - "video/mp2t", -- "video/mp4", -+// "video/mp4", - "video/mpeg", - "video/mpegts", - "video/ogg", -@@ -1794,6 +1794,20 @@ static HashSet mimeTypeCache() - for (unsigned i = 0; i < (sizeof(mimeTypes) / sizeof(*mimeTypes)); ++i) - cache.add(String(mimeTypes[i])); - -+ // Hack to make YouTube work, https://bugs.webkit.org/show_bug.cgi?id=135972 -+ gint exit_status = 1; -+ GUniqueOutPtr error; -+ GUniqueOutPtr stdout_to_discard; -+ GUniqueOutPtr stderr_to_discard; -+ gboolean success = g_spawn_command_line_sync( -+ "rpm -qi gstreamer1-libav", -+ &stdout_to_discard.outPtr(), -+ &stderr_to_discard.outPtr(), -+ &exit_status, -+ &error.outPtr()); -+ if (success && !error && !exit_status) -+ cache.add(String::fromUTF8("video/mp4")); -+ - typeListInitialized = true; - return cache; - } diff --git a/webkitgtk4.spec b/webkitgtk4.spec index 19536c0..49bc8c3 100644 --- a/webkitgtk4.spec +++ b/webkitgtk4.spec @@ -5,10 +5,8 @@ mkdir -p _license_files ; \ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') -%global _hardened_build 1 - Name: webkitgtk4 -Version: 2.10.9 +Version: 2.12.0 Release: 1%{?dist} Summary: GTK+ Web content engine library @@ -16,15 +14,10 @@ License: LGPLv2 URL: http://www.webkitgtk.org/ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz -Patch0: webkitgtk-2.10.4-nspluginwrapper.patch # https://bugs.webkit.org/show_bug.cgi?id=142074 -Patch1: webkitgtk-2.7.90-user-agent-branding.patch -# CLoop fixes (applied just on secondary arches) -Patch2: webkitgtk-2.5.90-cloop_fix.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1206161 -Patch4: webkitgtk-2.8.0-s390_fixes.patch +Patch0: webkitgtk-2.7.90-user-agent-branding.patch # https://bugs.webkit.org/show_bug.cgi?id=135972 -Patch6: webkitgtk-2.9.4-youtube.patch +Patch1: webkitgtk-2.11.5-youtube.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -60,18 +53,29 @@ BuildRequires: libwayland-server-devel BuildRequires: mesa-libGL-devel BuildRequires: pcre-devel BuildRequires: perl-Switch -BuildRequires: ruby +BuildRequires: ruby rubypick rubygems BuildRequires: sqlite-devel BuildRequires: hyphen-devel %ifarch ppc BuildRequires: libatomic %endif + Requires: geoclue2 # Obsolete libwebkit2gtk from the webkitgtk3 package Obsoletes: libwebkit2gtk < 2.5.0 Provides: libwebkit2gtk = %{version}-%{release} +# We're supposed to specify a version here, but this is pointless because ANGLE +# doesn't do normal releases. WebKit uses git snapshots. +Provides: bundled(angle) + +# Require the jsc subpackage +Requires: %{name}-jsc%{?_isa} = %{version}-%{release} + +# Recommend the support for the GTK+ 2 based NPAPI plugins +Recommends: %{name}-plugin-process-gtk2%{?_isa} = %{version}-%{release} + # Filter out provides for private libraries %global __provides_exclude_from ^%{_libdir}/webkit2gtk-4\\.0/.*\\.so$ @@ -84,6 +88,7 @@ This package contains WebKitGTK+ for GTK+ 3. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-jsc-devel%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries, build data, and header @@ -97,22 +102,30 @@ Requires: %{name} = %{version}-%{release} %description doc This package contains developer documentation for %{name}. +%package jsc +Summary: JavaScript engine from %{name} + +%description jsc +This package contains JavaScript engine from %{name}. + +%package jsc-devel +Summary: Development files for JavaScript engine from %{name} +Requires: %{name}-jsc%{?_isa} = %{version}-%{release} + +%description jsc-devel +The %{name}-jsc-devel package contains libraries, build data, and header +files for developing applications that use JavaScript engine from %{name}. + +%package plugin-process-gtk2 +Summary: GTK+ 2 based NPAPI plugins support for %{name} + +%description plugin-process-gtk2 +Support for the GTK+ 2 based NPAPI plugins (such as Adobe Flash) for %{name}. + %prep -%setup -q -n webkitgtk-%{version} -%patch0 -p1 -b .nspluginwrapper -%patch1 -p1 -b .user_agent -#%ifarch s390 s390x %{arm} ppc %{power64} -# FIXME Temporarily disabled due to https://bugzilla.redhat.com/show_bug.cgi?id=1167004 -# Enabled just on secondary arches where we use CLoop -#%patch2 -p1 -b .cloop_fix -#%endif -%ifarch s390 -%patch4 -p1 -b .s390_fixes -%endif -%patch6 -p1 -b .youtube +%autosetup -p1 -n webkitgtk-%{version} # Remove bundled libraries -rm -rf Source/ThirdParty/leveldb/ rm -rf Source/ThirdParty/gtest/ rm -rf Source/ThirdParty/qunit/ @@ -125,7 +138,7 @@ rm -rf Source/ThirdParty/qunit/ # Decrease debuginfo even on ix86 because of: # https://bugs.webkit.org/show_bug.cgi?id=140176 -%ifarch s390 s390x %{arm} %{ix86} ppc %{power64} +%ifarch s390 s390x %{arm} %{ix86} ppc %{power64} %{mips} # Decrease debuginfo verbosity to reduce memory consumption even more %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif @@ -135,11 +148,6 @@ rm -rf Source/ThirdParty/qunit/ %global optflags %{optflags} -Wl,-relax -latomic %endif -%ifarch s390 s390x %{arm} ppc %{power64} -# Turn off bmalloc on secondary arches (as it is not ready for them) -%global optflags %{optflags} -DUSE_BMALLOC=0 -%endif - %if 0%{?fedora} %global optflags %{optflags} -DUSER_AGENT_GTK_DISTRIBUTOR_NAME=\'\\"Fedora\\"\' %endif @@ -156,9 +164,12 @@ pushd %{_target_platform} %ifarch s390 aarch64 -DUSE_LD_GOLD=OFF \ %endif -%ifarch s390 s390x ppc %{power64} aarch64 +%ifarch s390 s390x ppc %{power64} aarch64 %{mips} -DENABLE_JIT=OFF \ %endif +%ifarch s390 s390x %{arm} ppc %{power64} %{mips} + -DUSE_SYSTEM_MALLOC=ON \ +%endif .. popd @@ -187,30 +198,48 @@ make %{?_smp_mflags} -C %{_target_platform} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%post jsc -p /sbin/ldconfig +%postun jsc -p /sbin/ldconfig %files -f WebKit2GTK-4.0.lang -%license _license_files/* -%{_libdir}/libjavascriptcoregtk-4.0.so.* +%license _license_files/*ThirdParty* +%license _license_files/*WebCore* +%license _license_files/*WebInspectorUI* +%license _license_files/*WTF* %{_libdir}/libwebkit2gtk-4.0.so.* -%{_libdir}/girepository-1.0/JavaScriptCore-4.0.typelib %{_libdir}/girepository-1.0/WebKit2-4.0.typelib %{_libdir}/girepository-1.0/WebKit2WebExtension-4.0.typelib %{_libdir}/webkit2gtk-4.0/ %{_libexecdir}/webkit2gtk-4.0/ +%exclude %{_libexecdir}/webkit2gtk-4.0/WebKitPluginProcess2 %files devel -%{_bindir}/jsc %{_bindir}/MiniBrowser %{_includedir}/webkitgtk-4.0/ -%{_libdir}/libjavascriptcoregtk-4.0.so +%exclude %{_includedir}/webkitgtk-4.0/JavaScriptCore %{_libdir}/libwebkit2gtk-4.0.so -%{_libdir}/pkgconfig/javascriptcoregtk-4.0.pc %{_libdir}/pkgconfig/webkit2gtk-4.0.pc %{_libdir}/pkgconfig/webkit2gtk-web-extension-4.0.pc -%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir %{_datadir}/gir-1.0/WebKit2-4.0.gir %{_datadir}/gir-1.0/WebKit2WebExtension-4.0.gir +%files jsc +%license _license_files/*JavaScriptCore* +%{_libdir}/libjavascriptcoregtk-4.0.so.* +%{_libdir}/girepository-1.0/JavaScriptCore-4.0.typelib + +%files jsc-devel +%{_bindir}/jsc +%dir %{_includedir}/webkitgtk-4.0 +%{_includedir}/webkitgtk-4.0/JavaScriptCore/ +%{_libdir}/libjavascriptcoregtk-4.0.so +%{_libdir}/pkgconfig/javascriptcoregtk-4.0.pc +%{_libdir}/girepository-1.0/JavaScriptCore-4.0.typelib +%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir + +%files plugin-process-gtk2 +%{_libexecdir}/webkit2gtk-4.0/WebKitPluginProcess2 + %files doc %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html @@ -218,6 +247,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Wed Mar 23 2016 Michael Catanzaro - 2.12.0-1 +- Update to 2.12.0 + * Thu Mar 17 2016 Tomas Popela - 2.10.9-1 - Update to 2.10.9