[arch-commits] Commit in libwebkit/trunk (PKGBUILD smp_fix.diff)

[andyrtr at archlinux.org]

    Date: Monday, December 6, 2010 @ 09:46:53
  Author: andyrtr
Revision: 102185

upgpkg: libwebkit 1.2.5-2
rebuild for icu-4.6

Added:
  libwebkit/trunk/smp_fix.diff
Modified:
  libwebkit/trunk/PKGBUILD

--------------+
 PKGBUILD     |   17 ++++++++++++-----
 smp_fix.diff |   11 +++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-06 14:44:49 UTC (rev 102184)
+++ PKGBUILD	2010-12-06 14:46:53 UTC (rev 102185)
@@ -3,25 +3,32 @@
 
 pkgname=libwebkit
 pkgver=1.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc="an opensource web content engine, derived from KHTML and KJS from KDE"
 arch=('i686' 'x86_64')
 url="http://webkitgtk.org/"
 license=('custom')
-depends=('libxt' 'libxslt' 'sqlite3' 'gtk2' 'icu>=4.4' 'gstreamer0.10-base' 'libsoup' 'enchant')
+depends=('libxt' 'libxslt' 'sqlite3' 'gtk2' 'icu>=4.6' 'gstreamer0.10-base' 'libsoup' 'enchant')
 makedepends=('gperf' 'gtk-doc' 'gobject-introspection')
 provides=('webkitgtk-svn')
 conflicts=('webkitgtk-svn')
 replaces=('webkitgtk-svn')
-options=('!libtool') # '!makeflags')
+options=('!libtool' '!makeflags')
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz
-        introspection.patch)
+        introspection.patch
+	# smp_fix::"http://trac.webkit.org/changeset/71535?format=diff&new=71535"
+	smp_fix.diff)
 md5sums=('09f04985665b9abf6f0d9956f86a6a31'
-         'e7e83312618cb30cc9a1567a21cd0e06')
+         'e7e83312618cb30cc9a1567a21cd0e06'
+         '43ba9c43e638b06eb70df9f3990c81d8')
 
+
 build() {
   cd "${srcdir}/webkit-${pkgver}"
   patch -Np0 -i "${srcdir}/introspection.patch"
+  # fix smp build - https://bugs.webkit.org/show_bug.cgi?id=49128
+#  patch -Np1 -i ${srcdir}/smp_fix.diff - doesn't solve it
+  
   ./configure --prefix=/usr \
       --enable-video --enable-introspection \
       --with-font-backend=freetype --enable-gtk-doc \

Added: smp_fix.diff
===================================================================
--- smp_fix.diff	                        (rev 0)
+++ smp_fix.diff	2010-12-06 14:46:53 UTC (rev 102185)
@@ -0,0 +1,11 @@
+--- webkit-1.2.5/JavaScriptCore/wtf/Platform.h	2010-09-10 15:20:23.000000000 +0200
++++ webkit-1.2.5/JavaScriptCore/wtf/Platform.h.new	2010-12-06 10:49:06.000000000 +0100
+@@ -775,7 +775,7 @@
+ /* ENABLE macro defaults */
+ 
+ #if PLATFORM(QT)
+-// We musn't customize the global operator new and delete for the Qt port.
++/* We musn't customize the global operator new and delete for the Qt port. */
+ #define ENABLE_GLOBAL_FASTMALLOC_NEW 0
+ #endif
+