Update to 1.8.0
This commit is contained in:
Kevin Fenzi
parent
8b138add6f
commit
b69195f758
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,3 +14,4 @@ webkit-1.3.2.tar.gz
|
||||
/webkit-1.4.3.tar.gz
|
||||
/webkit-1.6.1.tar.gz
|
||||
/webkit-1.6.3.tar.xz
|
||||
/webkitgtk-1.8.0-1.fc18.src.rpm
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
c476d9335419df061510d31e21175df1 webkit-1.6.3.tar.xz
|
||||
3af724c1d18d69ee6479f63232331304 webkitgtk-1.8.0-1.fc18.src.rpm
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Nur webkit-1.3.12.orig/Source/JavaScriptCore/wtf/Platform.h webkit-1.3.12/Source/JavaScriptCore/wtf/Platform.h
|
||||
--- webkit-1.3.12.orig/Source/JavaScriptCore/wtf/Platform.h 2011-02-22 04:11:16.000000000 -0700
|
||||
+++ webkit-1.3.12/Source/JavaScriptCore/wtf/Platform.h 2011-02-23 22:59:16.603860759 -0700
|
||||
@@ -1069,7 +1069,7 @@
|
||||
#endif
|
||||
/* Setting this flag prevents the assembler from using RWX memory; this may improve
|
||||
security but currectly comes at a significant performance cost. */
|
||||
-#if PLATFORM(IOS)
|
||||
+#if PLATFORM(IOS) || PLATFORM(X86) || PLATFORM(X86_64)
|
||||
#define ENABLE_ASSEMBLER_WX_EXCLUSIVE 1
|
||||
#endif
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h.dtoa webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h
|
||||
--- webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h.dtoa 2011-10-12 15:28:33.000000000 +0200
|
||||
+++ webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h 2011-10-12 15:28:52.000000000 +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)
|
||||
+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X)
|
||||
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
|
||||
#elif defined(_M_IX86) || defined(__i386__)
|
||||
#if defined(_WIN32)
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up webkit-1.6.1/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.jx webkit-1.6.1/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
|
||||
--- webkit-1.6.1/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.jx 2011-09-26 16:54:57.000000000 -0400
|
||||
+++ webkit-1.6.1/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2011-12-05 20:39:25.098997211 -0500
|
||||
@@ -52,7 +52,7 @@ typedef struct _GFile GFile;
|
||||
typedef struct _GHashTable GHashTable;
|
||||
typedef struct _GInputStream GInputStream;
|
||||
typedef struct _GList GList;
|
||||
-typedef struct _GMutex GMutex;
|
||||
+typedef union _GMutex GMutex;
|
||||
typedef struct _GPatternSpec GPatternSpec;
|
||||
typedef struct _GPollableOutputStream GPollableOutputStream;
|
||||
typedef struct _GSocketClient GSocketClient;
|
||||
@ -1,19 +0,0 @@
|
||||
diff -Nur webkit-1.6.1.orig/Source/WebCore/plugins/gtk/PluginViewGtk.cpp webkit-1.6.1/Source/WebCore/plugins/gtk/PluginViewGtk.cpp
|
||||
--- webkit-1.6.1.orig/Source/WebCore/plugins/gtk/PluginViewGtk.cpp 2011-09-26 14:55:00.000000000 -0600
|
||||
+++ webkit-1.6.1/Source/WebCore/plugins/gtk/PluginViewGtk.cpp 2012-01-20 22:12:46.198961426 -0700
|
||||
@@ -71,6 +71,7 @@
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#if defined(XP_UNIX)
|
||||
+#define String XtStringType
|
||||
#include "RefPtrCairo.h"
|
||||
#include "gtk2xtbin.h"
|
||||
#define Bool int // this got undefined somewhere
|
||||
@@ -81,6 +82,7 @@
|
||||
#elif defined(GDK_WINDOWING_WIN32)
|
||||
#include "PluginMessageThrottlerWin.h"
|
||||
#include <gdk/gdkwin32.h>
|
||||
+#undef String
|
||||
#endif
|
||||
|
||||
using JSC::ExecState;
|
||||
@ -1,11 +0,0 @@
|
||||
diff -Nur webkit-1.6.1.orig/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp webkit-1.6.1/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp
|
||||
--- webkit-1.6.1.orig/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2011-09-26 14:55:03.000000000 -0600
|
||||
+++ webkit-1.6.1/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp 2012-01-20 23:06:40.282863869 -0700
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "PluginObject.h"
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
using namespace std;
|
||||
extern NPNetscapeFuncs *browser;
|
||||
@ -34,8 +34,8 @@
|
||||
%bcond_with wml
|
||||
|
||||
Name: webkitgtk
|
||||
Version: 1.6.3
|
||||
Release: 2%{?dist}
|
||||
Version: 1.8.0
|
||||
Release: 1%{?dist}
|
||||
Summary: GTK+ Web content engine library
|
||||
|
||||
Provides: WebKit-gtk = %{version}-%{release}
|
||||
@ -45,22 +45,10 @@ Group: Development/Libraries
|
||||
License: LGPLv2+ and BSD
|
||||
URL: http://www.webkitgtk.org/
|
||||
|
||||
Source0: http://www.webkitgtk.org/webkit-%{version}.tar.xz
|
||||
Source0: http://www.webkitgtk.org/releases/webkit-%{version}.tar.xz
|
||||
|
||||
## See: https://bugzilla.redhat.com/show_bug.cgi?id=516057
|
||||
## FIXME: We forcibly disable the JIT compiler for the time being.
|
||||
## This is a temporary workaround which causes a slight performance hit on
|
||||
## 32- and 64-bit x86; but until we can fix the JIT to correctly handle WX
|
||||
## memory, at least we'll have a WebKit stack that doesn't crash due to this
|
||||
## bug. :)
|
||||
Patch1: webkit-1.3.12-no-execmem.patch
|
||||
# add support for nspluginwrapper.
|
||||
Patch2: webkit-1.3.10-nspluginwrapper.patch
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=69940
|
||||
Patch3: webkit-1.6.1-dtoa-s390.patch
|
||||
# Fix string def
|
||||
Patch5: webkit-1.6.1-stringfix.patch
|
||||
# add unistd.h include
|
||||
Patch6: webkit-1.6.1-unistd.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: chrpath
|
||||
@ -81,6 +69,7 @@ BuildRequires: pcre-devel
|
||||
BuildRequires: sqlite-devel
|
||||
BuildRequires: gobject-introspection-devel
|
||||
BuildRequires: mesa-libGL-devel
|
||||
BuildRequires: gtk-doc
|
||||
|
||||
## Conditional dependencies...
|
||||
%if %{with pango}
|
||||
@ -123,11 +112,7 @@ LICENSE, README, and AUTHORS files.
|
||||
|
||||
%prep
|
||||
%setup -qn "webkit-%{version}"
|
||||
%patch1 -p1 -b .no-execmem
|
||||
%patch2 -p1 -b .nspluginwrapper
|
||||
%patch3 -p1 -b .dtoa-s390
|
||||
%patch5 -p1 -b .stringfix
|
||||
%patch6 -p1 -b .unistd
|
||||
|
||||
%build
|
||||
%ifarch s390 %{arm}
|
||||
@ -151,9 +136,12 @@ CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGE
|
||||
mkdir -p DerivedSources/webkit
|
||||
mkdir -p DerivedSources/WebCore
|
||||
mkdir -p DerivedSources/ANGLE
|
||||
mkdir -p DerivedSources/WebKit2/webkit2gtk/webkit2
|
||||
mkdir -p DerivedSources/InjectedBundle
|
||||
|
||||
# Disabled because of https://bugs.webkit.org/show_bug.cgi?id=34846
|
||||
make V=1 %{?_smp_mflags}
|
||||
#make V=1 %{?_smp_mflags}
|
||||
make V=1
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
@ -198,26 +186,30 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
|
||||
%{_libdir}/libjavascriptcoregtk-1.0.so.*
|
||||
%{_libdir}/girepository-1.0/WebKit-1.0.typelib
|
||||
%{_libdir}/girepository-1.0/JSCore-1.0.typelib
|
||||
#{_datadir}/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml
|
||||
%{_libexecdir}/%{name}/
|
||||
%{_datadir}/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml
|
||||
%{_datadir}/webkitgtk-1.0
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/jsc-1
|
||||
%{_includedir}/webkit-1.0
|
||||
%{_includedir}/webkitgtk-1.0
|
||||
%{_libdir}/libwebkitgtk-1.0.so
|
||||
%{_libdir}/libjavascriptcoregtk-1.0.so
|
||||
%{_libdir}/pkgconfig/webkit-1.0.pc
|
||||
%{_libdir}/pkgconfig/javascriptcoregtk-1.0.pc
|
||||
%{_datadir}/gir-1.0/WebKit-1.0.gir
|
||||
%{_datadir}/gir-1.0/JSCore-1.0.gir
|
||||
%{_datadir}/gtk-doc/html/webkitgtk
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root,-)
|
||||
%{_docdir}/%{name}-%{version}/
|
||||
|
||||
%changelog
|
||||
* Tue Mar 27 2012 Kevin Fenzi <kevin@scrye.com> - 1.8.0-1
|
||||
- Update to 1.8.0
|
||||
|
||||
* Tue Feb 28 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.6.3-2
|
||||
- Add ARM to and optimise compile flags for low mem arches
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user