[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15.1-1-39-gad8f3c7

Gustavo Noronha Silva kov at debian.org
Thu Oct 29 20:30:50 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit f0a6d7c7a684f45fab76b612e36f06dd868e5fab
Author: Colin Watson <cjwatson at ubuntu.com>
Date:   Tue Oct 6 21:09:22 2009 +0100

    Fix building on IA64

diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 598ed64..410af65 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -292,6 +292,11 @@
 #define WTF_PLATFORM_X86_64 1
 #endif
 
+/* PLATFORM(IA64) */
+#if defined(__ia64__)
+#define WTF_PLATFORM_IA64 1
+#endif
+
 /* PLATFORM(SPARC) */
 #if   defined(__sparc__) \
    || defined(__sparc)
@@ -647,7 +652,7 @@
 #endif
 
 #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
-#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX))
+#if (PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX))) || PLATFORM(IA64)
 #define WTF_USE_JSVALUE64 1
 #elif PLATFORM(ARM) || PLATFORM(PPC64)
 #define WTF_USE_JSVALUE32 1
diff --git a/debian/changelog b/debian/changelog
index 3679c1f..7014700 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 webkit (1.1.15.2-1) unstable; urgency=low
 
   * New upstream (semi-stable) release
+  * Fix building on IA64 (Closes: #547797)
+    Thanks to Colin Watson <cjwatson at ubuntu.com>
 
- -- Gustavo Noronha Silva <kov at debian.org>  Tue, 06 Oct 2009 21:05:04 +0100
+ -- Gustavo Noronha Silva <kov at debian.org>  Tue, 06 Oct 2009 21:09:17 +0100
 
 webkit (1.1.15.1-1) unstable; urgency=low
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list