rpms/webkitgtk
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 2.4.5

Browse Source
This commit is contained in:
Tomas Popela 2014-08-26 13:15:04 +02:00
parent eb720d74ad
commit b461f2e8d1
5 changed files with 21 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources
View File

@ -1 +1 @@
79edd28d32172abc17a8861622cc274f webkitgtk-2.4.4.tar.xz c2e1687bb0314a0948fbf78e2d1e931f webkitgtk-2.4.5.tar.xz

69
webkitgtk-2.4.2-ppc64le.patch
View File

@ -1,69 +0,0 @@
diff -up webkitgtk-2.4.2/Source/WTF/wtf/dtoa/utils.h.ppc64le webkitgtk-2.4.2/Source/WTF/wtf/dtoa/utils.h
--- webkitgtk-2.4.2/Source/WTF/wtf/dtoa/utils.h.ppc64le 2014-05-14 15:37:26.360159487 +0200
+++ webkitgtk-2.4.2/Source/WTF/wtf/dtoa/utils.h 2014-05-14 15:38:46.938315499 +0200
@@ -49,7 +49,7 @@
defined(__ARMEL__) || \
defined(_MIPS_ARCH_MIPS32R2)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__)
#if defined(_WIN32)
diff -up webkitgtk-2.4.2/Source/WTF/wtf/Platform.h.ppc64le webkitgtk-2.4.2/Source/WTF/wtf/Platform.h
--- webkitgtk-2.4.2/Source/WTF/wtf/Platform.h.ppc64le 2014-05-12 08:03:53.000000000 +0200
+++ webkitgtk-2.4.2/Source/WTF/wtf/Platform.h 2014-05-14 15:39:08.402622454 +0200
@@ -101,24 +101,38 @@
#endif /* MIPS */
/* CPU(PPC) - PowerPC 32-bit */
-#if defined(__ppc__) \
+#if ( defined(__ppc__) \
|| defined(__PPC__) \
|| defined(__powerpc__) \
|| defined(__powerpc) \
|| defined(__POWERPC__) \
|| defined(_M_PPC) \
- || defined(__PPC)
+ || defined(__PPC)) \
+ && defined(__BYTE_ORDER__) \
+ && (__BYTE_ORDER__==__ORDER_BIG_ENDIAN__)
#define WTF_CPU_PPC 1
#define WTF_CPU_BIG_ENDIAN 1
#endif
-/* CPU(PPC64) - PowerPC 64-bit */
-#if defined(__ppc64__) \
- || defined(__PPC64__)
+/* CPU(PPC64) - PowerPC 64-bit Big Endian */
+#if ( defined(__ppc64__) \
+ || defined(__PPC64__)) \
+ && defined(__BYTE_ORDER__) \
+ && (__BYTE_ORDER__==__ORDER_BIG_ENDIAN__)
#define WTF_CPU_PPC64 1
#define WTF_CPU_BIG_ENDIAN 1
#endif
+/* CPU(PPC64) - PowerPC 64-bit Little Endian */
+#if ( defined(__ppc64__) \
+ || defined(__PPC64__) \
+ || defined(__ppc64le__) \
+ || defined(__PPC64LE__)) \
+ && defined(__BYTE_ORDER__) \
+ && (__BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__)
+#define WTF_CPU_PPC64LE 1
+#endif
+
/* CPU(SH4) - SuperH SH-4 */
#if defined(__SH4__)
#define WTF_CPU_SH4 1
@@ -641,7 +655,8 @@
|| CPU(ALPHA) \
|| CPU(ARM64) \
|| CPU(S390X) \
- || CPU(PPC64)
+ || CPU(PPC64) \
+ || CPU(PPC64LE)
#define WTF_USE_JSVALUE64 1
#else
#define WTF_USE_JSVALUE32_64 1

13
webkitgtk-2.4.3-angle_symbol_table.patch
View File

@ -1,13 +0,0 @@
--- a/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp
+++ b/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp
@@ -171,7 +171,8 @@ TFunction::~TFunction()
TSymbolTableLevel::~TSymbolTableLevel()
{
for (tLevel::iterator it = level.begin(); it != level.end(); ++it)
- delete (*it).second;
+ if ((*it).first == (*it).second->getMangledName())
+ delete (*it).second;
}
//

12
webkit-2.1.90-double2intsPPC32.patch → webkitgtk-2.4.5-cloop_fix_32.patch
View File

@ -1,6 +1,6 @@
diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm diff -up webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_32 webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
--- webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 2013-08-28 21:06:29.000000000 +0200 --- webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_32 2013-08-28 21:06:29.000000000 +0200
+++ webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-09-12 15:32:34.000000000 +0200 +++ webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-09-12 15:32:34.000000000 +0200
@@ -1679,7 +1679,7 @@ _llint_op_next_pname: @@ -1679,7 +1679,7 @@ _llint_op_next_pname:
loadi 20[PC], t2 loadi 20[PC], t2
loadi PayloadOffset[cfr, t2, 8], t2 loadi PayloadOffset[cfr, t2, 8], t2
@ -10,9 +10,9 @@ diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64
addi 1, t0 addi 1, t0
storei t0, PayloadOffset[cfr, t1, 8] storei t0, PayloadOffset[cfr, t1, 8]
loadi 4[PC], t1 loadi 4[PC], t1
diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm diff -up webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_32 webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
--- webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 2013-08-28 21:06:29.000000000 +0200 --- webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_32 2013-08-28 21:06:29.000000000 +0200
+++ webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-09-12 15:32:34.000000000 +0200 +++ webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-09-12 15:32:34.000000000 +0200
@@ -276,13 +276,13 @@ macro assertNotConstant(index) @@ -276,13 +276,13 @@ macro assertNotConstant(index)
end end

30
webkitgtk.spec
View File

@ -9,8 +9,8 @@
cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
Name: webkitgtk Name: webkitgtk
Version: 2.4.4 Version: 2.4.5
Release: 4%{?dist} Release: 1%{?dist}
Summary: GTK+ Web content engine library Summary: GTK+ Web content engine library
Group: Development/Libraries Group: Development/Libraries
@ -21,12 +21,10 @@ Source0: http://www.webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
# add support for nspluginwrapper. # add support for nspluginwrapper.
Patch0: webkit-1.3.10-nspluginwrapper.patch Patch0: webkit-1.3.10-nspluginwrapper.patch
# https://bugs.webkit.org/show_bug.cgi?id=103128 Patch1: webkitgtk-aarch64.patch
Patch4: webkit-2.1.90-double2intsPPC32.patch Patch2: webkitgtk-2.4.1-cloop_fix.patch
Patch5: webkitgtk-aarch64.patch Patch3: webkitgtk-2.4.5-cloop_fix_32.patch
Patch6: webkitgtk-2.4.1-cloop_fix.patch Patch4: webkitgtk-2.4.1-ppc64_align.patch
Patch7: webkitgtk-2.4.1-ppc64_align.patch
Patch8: webkitgtk-2.4.2-ppc64le.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: chrpath BuildRequires: chrpath
@ -90,19 +88,16 @@ This package contains developer documentation for %{name}.
%prep %prep
%setup -qn "webkitgtk-%{version}" %setup -qn "webkitgtk-%{version}"
%patch0 -p1 -b .nspluginwrapper %patch0 -p1 -b .nspluginwrapper
%patch6 -p1 -b .cloop_fix %patch2 -p1 -b .cloop_fix
# required for 32-bit big-endians # required for 32-bit big-endians
%ifarch ppc s390 %ifarch ppc s390
%patch4 -p1 -b .double2intsPPC32 %patch3 -p1 -b .cloop_fix_32
%endif %endif
%ifarch aarch64 %ifarch aarch64
%patch5 -p1 -b .aarch64 %patch1 -p1 -b .aarch64
%endif %endif
%ifarch %{power64} aarch64 ppc %ifarch %{power64} aarch64 ppc
%patch7 -p1 -b .ppc64_align %patch4 -p1 -b .ppc64_align
%endif
%ifarch %{power64}
%patch8 -p1 -b .ppc64le
%endif %endif
%build %build
@ -212,11 +207,14 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_datadir}/gtk-doc/html/webkitgtk %{_datadir}/gtk-doc/html/webkitgtk
%changelog %changelog
* Tue Aug 26 2014 Tomas Popela <tpopela@redhat.com> - 2.4.5-1
- Update to 2.4.5
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.4-4 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Wed Jul 23 2014 Tomas Popela <tpopela@redhat.com> - 2.4.4-3 * Wed Jul 23 2014 Tomas Popela <tpopela@redhat.com> - 2.4.4-3
* Remove geoclue-devel from BR - Remove geoclue-devel from BR
* Wed Jul 23 2014 Tomas Popela <tpopela@redhat.com> - 2.4.4-2 * Wed Jul 23 2014 Tomas Popela <tpopela@redhat.com> - 2.4.4-2
- Fix CLoop on ppc32 and s390 - Fix CLoop on ppc32 and s390