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

[Ionut Biru]

    Date: Thursday, December 30, 2010 @ 17:22:42
  Author: ibiru
Revision: 104228

upgpkg: libwebkit 1.2.6-1
update to 1.2.6, cleanup unused patches, enable parallel building.

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

--------------+
 PKGBUILD     |   22 +++++++++-------------
 smp_fix.diff |   11 -----------
 2 files changed, 9 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-30 22:14:54 UTC (rev 104227)
+++ PKGBUILD	2010-12-30 22:22:42 UTC (rev 104228)
@@ -2,8 +2,8 @@
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 
 pkgname=libwebkit
-pkgver=1.2.5
-pkgrel=2
+pkgver=1.2.6
+pkgrel=1
 pkgdesc="an opensource web content engine, derived from KHTML and KJS from KDE"
 arch=('i686' 'x86_64')
 url="http://webkitgtk.org/"
@@ -13,27 +13,23 @@
 provides=('webkitgtk-svn')
 conflicts=('webkitgtk-svn')
 replaces=('webkitgtk-svn')
-options=('!libtool' '!makeflags')
+options=('!libtool')
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz
-        introspection.patch
-	# smp_fix::"http://trac.webkit.org/changeset/71535?format=diff&new=71535"
-	smp_fix.diff)
-md5sums=('09f04985665b9abf6f0d9956f86a6a31'
-         'e7e83312618cb30cc9a1567a21cd0e06'
-         '43ba9c43e638b06eb70df9f3990c81d8')
+        introspection.patch)
+md5sums=('7afb510040b2a49c65514a06bb8200fc'
+         'e7e83312618cb30cc9a1567a21cd0e06')
 
 
 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 \
       --enable-jit --with-unicode-backend=icu
-  make
+  #disable makeflags if parallel building fails
+  make ${MAKEFLAGS}
 }
 
 package() {

Deleted: smp_fix.diff
===================================================================
--- smp_fix.diff	2010-12-30 22:14:54 UTC (rev 104227)
+++ smp_fix.diff	2010-12-30 22:22:42 UTC (rev 104228)
@@ -1,11 +0,0 @@
---- 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
-