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

- Add back updated s390(x) patch

Browse Source 
Conflicts:

	webkitgtk.spec
This commit is contained in:
Dan Horák 2010-12-13 08:31:15 +01:00
parent 8fa04a27b8
commit 91a70f3e34
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
webkit-1.3.1-s390.patch → webkit-1.3.4-s390.patch
View File

@ -1,7 +1,7 @@
diff -up webkit-1.3.1/JavaScriptCore/wtf/Platform.h.s390 webkit-1.3.1/JavaScriptCore/wtf/Platform.h diff -up webkit-1.3.4/JavaScriptCore/wtf/Platform.h.orig webkit-1.3.4/JavaScriptCore/wtf/Platform.h
--- webkit-1.3.1/JavaScriptCore/wtf/Platform.h.s390 2010-05-24 15:53:11.000000000 +0200 --- webkit-1.3.4/JavaScriptCore/wtf/Platform.h.orig 2010-10-13 13:54:49.000000000 +0200
+++ webkit-1.3.1/JavaScriptCore/wtf/Platform.h 2010-06-14 15:24:18.000000000 +0200 +++ webkit-1.3.4/JavaScriptCore/wtf/Platform.h 2010-10-13 13:58:08.000000000 +0200
@@ -178,6 +178,18 @@ @@ -188,6 +188,18 @@
#define WTF_CPU_SPARC 1 #define WTF_CPU_SPARC 1
#endif #endif
@ -20,11 +20,11 @@ diff -up webkit-1.3.1/JavaScriptCore/wtf/Platform.h.s390 webkit-1.3.1/JavaScript
/* CPU(X86) - i386 / x86 32-bit */ /* CPU(X86) - i386 / x86 32-bit */
#if defined(__i386__) \ #if defined(__i386__) \
|| defined(i386) \ || defined(i386) \
@@ -899,6 +911,7 @@ @@ -925,6 +937,7 @@
#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \ #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
|| (CPU(IA64) && !CPU(IA64_32)) \ || (CPU(IA64) && !CPU(IA64_32)) \
|| CPU(ALPHA) \ || CPU(ALPHA) \
+ || CPU(S390X) \ + || CPU(S390X) \
|| CPU(SPARC64) || CPU(SPARC64) \
|| CPU(PPC64)
#define WTF_USE_JSVALUE64 1 #define WTF_USE_JSVALUE64 1
#elif CPU(ARM) || CPU(PPC64) || CPU(MIPS)

5
webkitgtk.spec
View File

@ -55,6 +55,7 @@ Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz
## bug. :) ## bug. :)
Patch1: webkit-1.3.4-no-execmem.patch Patch1: webkit-1.3.4-no-execmem.patch
Patch2: webkit-1.1.14-nspluginwrapper.patch Patch2: webkit-1.1.14-nspluginwrapper.patch
Patch3: webkit-1.3.4-s390.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: chrpath BuildRequires: chrpath
@ -117,6 +118,7 @@ LICENSE, README, and AUTHORS files.
%setup -qn "webkit-%{version}" %setup -qn "webkit-%{version}"
%patch1 -p1 -b .no-execmem %patch1 -p1 -b .no-execmem
%patch2 -p1 -b .nspluginwrapper %patch2 -p1 -b .nspluginwrapper
%patch3 -p1 -b .s390
%build %build
CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \ CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \
@ -208,6 +210,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%changelog %changelog
* Mon Dec 13 2010 Dan Horák <dan[at]danny.cz> - 1.3.6-2
- Add back updated s390(x) patch
* Mon Nov 08 2010 Kevin Fenzi <kevin@tummy.com> - 1.3.6-1 * Mon Nov 08 2010 Kevin Fenzi <kevin@tummy.com> - 1.3.6-1
- Update to 1.3.6 - Update to 1.3.6