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

2012-08-31 Thread andyrtr
Date: Friday, August 31, 2012 @ 02:08:20
  Author: andyrtr
Revision: 165829

upgpkg: libwebkit 1.8.3-1

upstream update 1.8.3

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-31 05:56:11 UTC (rev 165828)
+++ PKGBUILD2012-08-31 06:08:20 UTC (rev 165829)
@@ -3,7 +3,7 @@
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.8.2
+pkgver=1.8.3
 pkgrel=1
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@
 options=('!libtool' '!emptydirs')
 source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz
 bison26.diff)
-sha256sums=('0cd69b7c4bf4af3442a5e6777a1487cabf14db15baeeed96d0865419f69b81e6'
+sha256sums=('ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7'
 '2a9c0c1b9d5259fd1254ebea228fc83313267fbe8cfec1bb43356de1f355b93e')
 
 build() {



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

2012-08-06 Thread andyrtr
Date: Monday, August 6, 2012 @ 15:56:31
  Author: andyrtr
Revision: 164819

upgpkg: libwebkit 1.8.2-1

upstream update 1.8.2

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

--+
 PKGBUILD |   28 ++
 bison26.diff |  556 +
 2 files changed, 579 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-06 19:24:07 UTC (rev 164818)
+++ PKGBUILD2012-08-06 19:56:31 UTC (rev 164819)
@@ -3,7 +3,7 @@
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.8.1
+pkgver=1.8.2
 pkgrel=1
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
@@ -13,16 +13,21 @@
  'geoclue')
 makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa')
 options=('!libtool' '!emptydirs')
-source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz)
-sha256sums=('9a126a76b40ca61adb1f1626e1567f976740af2332948cc5189489dbd01e3b28')
+source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz
+bison26.diff)
+sha256sums=('0cd69b7c4bf4af3442a5e6777a1487cabf14db15baeeed96d0865419f69b81e6'
+'2a9c0c1b9d5259fd1254ebea228fc83313267fbe8cfec1bb43356de1f355b93e')
 
 build() {
   cd $srcdir/webkit-$pkgver
+  # https://bugs.webkit.org/show_bug.cgi?id=92264 / 
http://trac.webkit.org/changeset/124099
+  patch -Np1 -i ${srcdir}/bison26.diff
+
   mkdir build-gtk{2,3}
 
   # clear makeflags: race during introspection.
   # WebKit*.gir should be created before WebKit*.typelib, but isn't
-  MAKEFLAGS=
+  #MAKEFLAGS=
 
   ( cd build-gtk2  _build --with-gtk=2.0 )
   ( cd build-gtk3  _build --with-gtk=3.0 )
@@ -34,7 +39,20 @@
 --with-font-backend=freetype \
 --with-unicode-backend=icu \
 --enable-spellcheck $@
-  make all stamp-po
+  #make all stamp-po
+  
+  # crazy smp build fix by LFS - 
http://www.linuxfromscratch.org/blfs/view/svn/x/webkitgtk.html
+  # !!! safes a lot of time but may cover other bugs you won't notice anymore 
!!!
+  error_count=0
+  until make all stamp-po #-j$(getconf _NPROCESSORS_ONLN)
+  do
+if (( $((error_count++))  4 ))
+then
+  echo Too Many Errors
+  break
+fi
+  done
+  unset error_count
 }
 
 package_libwebkit() {

Added: bison26.diff
===
--- bison26.diff(rev 0)
+++ bison26.diff2012-08-06 19:56:31 UTC (rev 164819)
@@ -0,0 +1,556 @@
+Subversion Revision: 123651
+diff --git a/Source/WebCore/css/CSSGrammar.y b/Source/WebCore/css/CSSGrammar.y
+index 
c7c10b541cd46ad4febc6efe289e81b2cfb0861e..1c604e76b4da4cc65f395bc4a73b112561bd5c84
 100644
+--- a/Source/WebCore/css/CSSGrammar.y
 b/Source/WebCore/css/CSSGrammar.y
+@@ -53,14 +53,13 @@ using namespace HTMLNames;
+ #define YYMAXDEPTH 1
+ #define YYDEBUG 0
+ 
+-// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend 
on bison 2.x
+-#define YYPARSE_PARAM parser
+-#define YYLEX_PARAM parser
+-
+ %}
+ 
+ %pure_parser
+ 
++%parse-param { CSSParser* parser }
++%lex-param { CSSParser* parser }
++
+ %union {
+ bool boolean;
+ char character;
+@@ -89,7 +88,7 @@ using namespace HTMLNames;
+ 
+ %{
+ 
+-static inline int cssyyerror(const char*)
++static inline int cssyyerror(void*, const char*)
+ {
+ return 1;
+ }
+diff --git a/Source/WebCore/css/CSSParser.cpp 
b/Source/WebCore/css/CSSParser.cpp
+index 
650844060477cfc6ea6fdeaf11ec63b34ac646e7..8369549dbff25537cf93a11237a9bbbac4fe50f2
 100644
+--- a/Source/WebCore/css/CSSParser.cpp
 b/Source/WebCore/css/CSSParser.cpp
+@@ -114,7 +114,7 @@
+ extern int cssyydebug;
+ #endif
+ 
+-extern int cssyyparse(void* parser);
++extern int cssyyparse(WebCore::CSSParser*);
+ 
+ using namespace std;
+ using namespace WTF;
+diff --git a/Source/WebCore/xml/XPathGrammar.y 
b/Source/WebCore/xml/XPathGrammar.y
+index 
2eba5b35bd2338272a0f4ec756d137e47d2d59c8..d558211db2d89ea13716762a51397755560f66f3
 100644
+--- a/Source/WebCore/xml/XPathGrammar.y
 b/Source/WebCore/xml/XPathGrammar.y
+@@ -34,6 +34,7 @@
+ #include XPathParser.h
+ #include XPathPath.h
+ #include XPathPredicate.h
++#include XPathStep.h
+ #include XPathVariableReference.h
+ #include wtf/FastMalloc.h
+ 
+@@ -44,8 +45,6 @@
+ #define YYLTYPE_IS_TRIVIAL 1
+ #define YYDEBUG 0
+ #define YYMAXDEPTH 1
+-#define YYPARSE_PARAM parserParameter
+-#define PARSER static_castParser*(parserParameter)
+ 
+ using namespace WebCore;
+ using namespace XPath;
+@@ -53,6 +52,7 @@ using namespace XPath;
+ %}
+ 
+ %pure_parser
++%parse-param { WebCore::XPath::Parser* parser }
+ 
+ %union
+ {
+@@ -71,7 +71,7 @@ using namespace XPath;
+ %{
+ 
+ static int xpathyylex(YYSTYPE* yylval) { return 
Parser::current()-lex(yylval); }
+-static void xpathyyerror(const char*) { }
++static void xpathyyerror(void*, const char*) { }
+ 
+ %}
+ 
+@@ -118,7 +118,7 @@ static void xpathyyerror(const char*) { }
+ Expr:
+ 

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

2012-04-24 Thread Ionut Biru
Date: Tuesday, April 24, 2012 @ 18:22:34
  Author: ibiru
Revision: 157141

update to 1.8.1

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-24 22:10:55 UTC (rev 157140)
+++ PKGBUILD2012-04-24 22:22:34 UTC (rev 157141)
@@ -3,8 +3,8 @@
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.8.0
-pkgrel=2
+pkgver=1.8.1
+pkgrel=1
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
 url=http://webkitgtk.org/;
@@ -14,7 +14,7 @@
 makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa')
 options=('!libtool' '!emptydirs')
 source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz)
-sha256sums=('8cebd53b412ae9eb192493ad8e41fa8739a7b1a00f74c6b5a69d367709a801bc')
+sha256sums=('9a126a76b40ca61adb1f1626e1567f976740af2332948cc5189489dbd01e3b28')
 
 build() {
   cd $srcdir/webkit-$pkgver



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

2012-04-17 Thread Thomas Dziedzic
Date: Tuesday, April 17, 2012 @ 22:56:17
  Author: tdziedzic
Revision: 156409

sqlite3 - sqlite

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-18 02:55:09 UTC (rev 156408)
+++ PKGBUILD2012-04-18 02:56:17 UTC (rev 156409)
@@ -9,7 +9,7 @@
 arch=('i686' 'x86_64')
 url=http://webkitgtk.org/;
 license=('custom')
-depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 
'enchant' 'libgl'
+depends=('libxt' 'libxslt' 'sqlite' 'icu' 'gstreamer0.10-base' 'libsoup' 
'enchant' 'libgl'
  'geoclue')
 makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa')
 options=('!libtool' '!emptydirs')



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

2012-04-06 Thread Ionut Biru
Date: Friday, April 6, 2012 @ 03:50:06
  Author: ibiru
Revision: 155760

icu rebuild

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-06 07:48:34 UTC (rev 155759)
+++ PKGBUILD2012-04-06 07:50:06 UTC (rev 155760)
@@ -4,7 +4,7 @@
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
 pkgver=1.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
 url=http://webkitgtk.org/;
@@ -23,7 +23,7 @@
   # clear makeflags: race during introspection.
   # WebKit*.gir should be created before WebKit*.typelib, but isn't
   MAKEFLAGS=
-  
+
   ( cd build-gtk2  _build --with-gtk=2.0 )
   ( cd build-gtk3  _build --with-gtk=3.0 )
 }



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

2012-03-30 Thread Jan Steffens
Date: Friday, March 30, 2012 @ 04:53:48
  Author: heftig
Revision: 154557

1.8.0

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-30 08:32:21 UTC (rev 154556)
+++ PKGBUILD2012-03-30 08:53:48 UTC (rev 154557)
@@ -3,22 +3,27 @@
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.7.92
+pkgver=1.8.0
 pkgrel=1
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
 url=http://webkitgtk.org/;
 license=('custom')
-depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 
'enchant' 'libgl')
+depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 
'enchant' 'libgl'
+ 'geoclue')
 makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa')
 options=('!libtool' '!emptydirs')
-source=(http://webkitgtk.org/webkit-$pkgver.tar.xz)
-sha256sums=('b5f7b9eef333609d457a0e6b335ff8d9e31c92459019b8aa80e1e24767601bb0')
+source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz)
+sha256sums=('8cebd53b412ae9eb192493ad8e41fa8739a7b1a00f74c6b5a69d367709a801bc')
 
 build() {
   cd $srcdir/webkit-$pkgver
   mkdir build-gtk{2,3}
 
+  # clear makeflags: race during introspection.
+  # WebKit*.gir should be created before WebKit*.typelib, but isn't
+  MAKEFLAGS=
+  
   ( cd build-gtk2  _build --with-gtk=2.0 )
   ( cd build-gtk3  _build --with-gtk=3.0 )
 }
@@ -28,7 +33,6 @@
 --enable-introspection \
 --with-font-backend=freetype \
 --with-unicode-backend=icu \
---enable-geolocation=no \
 --enable-spellcheck $@
   make all stamp-po
 }



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

2012-03-20 Thread Ionut Biru
Date: Tuesday, March 20, 2012 @ 07:43:46
  Author: ibiru
Revision: 153902

update to 1.7.92

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |   23 +--
 1 file changed, 5 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-20 11:14:50 UTC (rev 153901)
+++ PKGBUILD2012-03-20 11:43:46 UTC (rev 153902)
@@ -3,28 +3,21 @@
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.7.91
+pkgver=1.7.92
 pkgrel=1
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
 url=http://webkitgtk.org/;
 license=('custom')
 depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 
'enchant' 'libgl')
-makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa' 
'gtk-doc')
+makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa')
 options=('!libtool' '!emptydirs')
 install=libwebkit.install
-source=(http://webkitgtk.org/webkit-$pkgver.tar.xz
-webkit-gtk-1.7.90-parallel-make-hack.patch
-python.patch)
-sha256sums=('9d9de6968c466b973988ce97e4f2f53535dd4f72356bd7b29b03ba9dab937545'
-'e20d7d45e6230308f7d4a7aac1095cb1fe8d9c7eb0f3e65b061acf8bc4bbaf73'
-'29b82e47277d982bc57a7ba967d28ae76e07556986627c2e456694b699ae0e09')
+source=(http://webkitgtk.org/webkit-$pkgver.tar.xz)
+sha256sums=('b5f7b9eef333609d457a0e6b335ff8d9e31c92459019b8aa80e1e24767601bb0')
 
 build() {
   cd $srcdir/webkit-$pkgver
-  patch -Np1 -i $srcdir/webkit-gtk-1.7.90-parallel-make-hack.patch
-  patch -Np1 -i $srcdir/python.patch
-  autoreconf -I Source/autotools -fi
   mkdir build-gtk{2,3}
 
   ( cd build-gtk2  _build --with-gtk=2.0 )
@@ -38,13 +31,7 @@
 --with-unicode-backend=icu \
 --enable-geolocation=no \
 --enable-spellcheck $@
-#  make all stamp-po
-#  until parallel building is fixed
-  make all-built-sources-local
-  make all-ltlibraries-local
-  make all-programs-local
-  make all-data-local
-  make stamp-po
+  make all stamp-po
 }
 
 package_libwebkit() {



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

2012-03-20 Thread Ionut Biru
Date: Tuesday, March 20, 2012 @ 08:07:17
  Author: ibiru
Revision: 153904

gsettings schema was dropped.

Modified:
  libwebkit/trunk/PKGBUILD
Deleted:
  libwebkit/trunk/libwebkit.install

---+
 PKGBUILD  |1 -
 libwebkit.install |   11 ---
 2 files changed, 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-20 11:44:19 UTC (rev 153903)
+++ PKGBUILD2012-03-20 12:07:17 UTC (rev 153904)
@@ -12,7 +12,6 @@
 depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 
'enchant' 'libgl')
 makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa')
 options=('!libtool' '!emptydirs')
-install=libwebkit.install
 source=(http://webkitgtk.org/webkit-$pkgver.tar.xz)
 sha256sums=('b5f7b9eef333609d457a0e6b335ff8d9e31c92459019b8aa80e1e24767601bb0')
 

Deleted: libwebkit.install
===
--- libwebkit.install   2012-03-20 11:44:19 UTC (rev 153903)
+++ libwebkit.install   2012-03-20 12:07:17 UTC (rev 153904)
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}



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

2012-02-02 Thread Ionut Biru
Date: Thursday, February 2, 2012 @ 10:27:15
  Author: ibiru
Revision: 148492

update to 1.6.3

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-02 15:06:50 UTC (rev 148491)
+++ PKGBUILD2012-02-02 15:27:15 UTC (rev 148492)
@@ -3,21 +3,21 @@
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.6.1
-pkgrel=2
+pkgver=1.6.3
+pkgrel=1
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
 url=http://webkitgtk.org/;
 license=('custom')
 depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 
'enchant')
-makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
+makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
 options=('!libtool' '!emptydirs')
 install=libwebkit.install
-source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
-md5sums=('c11743694b1b71dad287b2e7a9e73b05')
+source=(http://webkitgtk.org/webkit-$pkgver.tar.xz)
+sha256sums=('12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3')
 
 build() {
-  cd ${srcdir}/webkit-${pkgver}
+  cd $srcdir/webkit-$pkgver
   mkdir build-gtk{2,3}
 
   ( cd build-gtk2  _build --with-gtk=2.0 )
@@ -27,7 +27,7 @@
 _build() {
   PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
 --enable-introspection \
---with-font-backend=freetype --enable-gtk-doc \
+--with-font-backend=freetype \
 --with-unicode-backend=icu \
 --enable-spellcheck $@
   make all stamp-po
@@ -39,14 +39,14 @@
 
   cd $srcdir/webkit-$pkgver/build-gtk2
   make DESTDIR=${pkgdir} install
-  install -Dm644 ../Source/WebKit/LICENSE 
${pkgdir}/usr/share/licenses/libwebkit/LICENSE
+  install -Dm644 ../Source/WebKit/LICENSE 
$pkgdir/usr/share/licenses/libwebkit/LICENSE
 }
 
 package_libwebkit3() {
   pkgdesc+= (for GTK3)
   depends+=(gtk3)
 
-  cd ${srcdir}/webkit-${pkgver}/build-gtk3
-  make DESTDIR=${pkgdir} install
-  install -Dm644 ../Source/WebKit/LICENSE 
${pkgdir}/usr/share/licenses/libwebkit3/LICENSE
+  cd $srcdir/webkit-$pkgver/build-gtk3
+  make DESTDIR=$pkgdir install
+  install -Dm644 ../Source/WebKit/LICENSE 
$pkgdir/usr/share/licenses/libwebkit3/LICENSE
 }



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

2012-01-20 Thread Eric BĂ©langer
Date: Friday, January 20, 2012 @ 16:25:18
  Author: eric
Revision: 147025

upgpkg: libwebkit 1.6.1-2

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 21:12:16 UTC (rev 147024)
+++ PKGBUILD2012-01-20 21:25:18 UTC (rev 147025)
@@ -4,7 +4,7 @@
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
 pkgver=1.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
 url=http://webkitgtk.org/;



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

2011-09-27 Thread Ionut Biru
Date: Tuesday, September 27, 2011 @ 06:18:03
  Author: ibiru
Revision: 138547

update to 1.6.0

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-27 09:03:19 UTC (rev 138546)
+++ PKGBUILD2011-09-27 10:18:03 UTC (rev 138547)
@@ -3,7 +3,7 @@
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.5.90
+pkgver=1.6.0
 pkgrel=1
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
 options=('!libtool' '!emptydirs')
 install=libwebkit.install
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
-md5sums=('19f046dcf68502e59bd03396edce60a8')
+md5sums=('c45f78b6de29f16ffb57cadae70c3f1a')
 
 build() {
   cd ${srcdir}/webkit-${pkgver}



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

2011-09-27 Thread Ionut Biru
Date: Tuesday, September 27, 2011 @ 12:22:47
  Author: ibiru
Revision: 138686

update to 1.6.1

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-27 16:03:39 UTC (rev 138685)
+++ PKGBUILD2011-09-27 16:22:47 UTC (rev 138686)
@@ -3,7 +3,7 @@
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.6.0
+pkgver=1.6.1
 pkgrel=1
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
 options=('!libtool' '!emptydirs')
 install=libwebkit.install
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
-md5sums=('c45f78b6de29f16ffb57cadae70c3f1a')
+md5sums=('c11743694b1b71dad287b2e7a9e73b05')
 
 build() {
   cd ${srcdir}/webkit-${pkgver}



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

2011-09-20 Thread Ionut Biru
Date: Tuesday, September 20, 2011 @ 13:13:23
  Author: ibiru
Revision: 138358

update to 1.5.90

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-20 16:16:07 UTC (rev 138357)
+++ PKGBUILD2011-09-20 17:13:23 UTC (rev 138358)
@@ -3,18 +3,18 @@
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.5.2
+pkgver=1.5.90
 pkgrel=1
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
 url=http://webkitgtk.org/;
 license=('custom')
 depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 
'enchant')
-makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 
'namcap')
+makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
 options=('!libtool' '!emptydirs')
 install=libwebkit.install
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
-md5sums=('92e512b8222d107b71beccf88a045e09')
+md5sums=('19f046dcf68502e59bd03396edce60a8')
 
 build() {
   cd ${srcdir}/webkit-${pkgver}
@@ -36,9 +36,6 @@
 package_libwebkit() {
   pkgdesc+= (for GTK2)
   depends+=(gtk2)
-  provides=('webkitgtk-svn')
-  conflicts=('webkitgtk-svn')
-  replaces=('webkitgtk-svn')
 
   cd $srcdir/webkit-$pkgver/build-gtk2
   make DESTDIR=${pkgdir} install



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

2011-09-01 Thread Ionut Biru
Date: Thursday, September 1, 2011 @ 03:33:07
  Author: ibiru
Revision: 136752

update to 1.5.2

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |   13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-01 06:55:02 UTC (rev 136751)
+++ PKGBUILD2011-09-01 07:33:07 UTC (rev 136752)
@@ -3,24 +3,21 @@
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.4.2
+pkgver=1.5.2
 pkgrel=1
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
 url=http://webkitgtk.org/;
 license=('custom')
 depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 
'enchant')
-makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
-options=('!libtool')
+makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 
'namcap')
+options=('!libtool' '!emptydirs')
 install=libwebkit.install
-source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz
-replace-switch-with-given-when.patch)
-md5sums=('361f8420e93d12101d650758fec09fa0'
- '3ba708a26b7af0e1e853867966fe14f7')
+source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
+md5sums=('92e512b8222d107b71beccf88a045e09')
 
 build() {
   cd ${srcdir}/webkit-${pkgver}
-#  patch -Np1 -i ${srcdir}/replace-switch-with-given-when.patch
   mkdir build-gtk{2,3}
 
   ( cd build-gtk2  _build --with-gtk=2.0 )



[arch-commits] Commit in libwebkit/trunk (PKGBUILD gcc46.patch)

2011-06-06 Thread andyrtr
Date: Monday, June 6, 2011 @ 17:34:03
  Author: andyrtr
Revision: 126732

upgpkg: libwebkit 1.4.1-1
upstream update 1.4.1

Modified:
  libwebkit/trunk/PKGBUILD
Deleted:
  libwebkit/trunk/gcc46.patch

-+
 PKGBUILD|9 +++--
 gcc46.patch |   11 ---
 2 files changed, 3 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-06 21:24:06 UTC (rev 126731)
+++ PKGBUILD2011-06-06 21:34:03 UTC (rev 126732)
@@ -3,8 +3,8 @@
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.4.1
+pkgrel=1
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
 url=http://webkitgtk.org/;
@@ -14,15 +14,12 @@
 options=('!libtool')
 install=libwebkit.install
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz
-gcc46.patch
 replace-switch-with-given-when.patch)
-md5sums=('10c969db3b5484c71df1aa9a338377ff'
- '970a2fa91b9827dff8e9b9edb4867701'
+md5sums=('c1a4f732a77d6f8197437b50678d3dbc'
  '3ba708a26b7af0e1e853867966fe14f7')
 
 build() {
   cd ${srcdir}/webkit-${pkgver}
-  patch -Np1 -i ${srcdir}/gcc46.patch
   patch -Np1 -i ${srcdir}/replace-switch-with-given-when.patch
   mkdir build-gtk{2,3}
 

Deleted: gcc46.patch
===
--- gcc46.patch 2011-06-06 21:24:06 UTC (rev 126731)
+++ gcc46.patch 2011-06-06 21:34:03 UTC (rev 126732)
@@ -1,11 +0,0 @@
-Index: trunk/Source/WebCore/dom/make_names.pl
-===
 trunk/Source/WebCore/dom/make_names.pl (revision 73989)
-+++ trunk/Source/WebCore/dom/make_names.pl (revision 84123)
-@@ -66,5 +66,5 @@
- $gccLocation = /usr/bin/gcc;
- }
--my $preprocessor = $gccLocation .  -E -P -x c++;
-+my $preprocessor = $gccLocation .  -E -x c++;
- 
- GetOptions(



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

2011-06-01 Thread andyrtr
Date: Wednesday, June 1, 2011 @ 18:31:25
  Author: andyrtr
Revision: 126165

upgpkg: libwebkit 1.4.0-2
icu rebuild

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-01 21:54:34 UTC (rev 126164)
+++ PKGBUILD2011-06-01 22:31:25 UTC (rev 126165)
@@ -4,7 +4,7 @@
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
 url=http://webkitgtk.org/;



[arch-commits] Commit in libwebkit/trunk (PKGBUILD gcc46.patch)

2011-04-27 Thread Ionut Biru
Date: Wednesday, April 27, 2011 @ 17:44:28
  Author: ibiru
Revision: 121025

update to 1.4.0 
drop --enable-video --enable-jit are enabled by default
drop --enable-3d-transforms --enable-mathml since upstream doesn't support them 
and suggested to remove them

Added:
  libwebkit/trunk/gcc46.patch
Modified:
  libwebkit/trunk/PKGBUILD

-+
 PKGBUILD|   15 ---
 gcc46.patch |   11 +++
 2 files changed, 19 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-27 20:47:39 UTC (rev 121024)
+++ PKGBUILD2011-04-27 21:44:28 UTC (rev 121025)
@@ -3,21 +3,23 @@
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.3.13
+pkgver=1.4.0
 pkgrel=1
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
 url=http://webkitgtk.org/;
 license=('custom')
-depends=('libxt' 'libxslt' 'sqlite3' 'icu=4.6' 'gstreamer0.10-base' 'libsoup' 
'enchant')
+depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 
'enchant')
 makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
 options=('!libtool')
 install=libwebkit.install
-source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
-md5sums=('984adaafac545a89c24351fd4dbd743c')
+source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz gcc46.patch)
+md5sums=('10c969db3b5484c71df1aa9a338377ff'
+ '970a2fa91b9827dff8e9b9edb4867701')
 
 build() {
   cd ${srcdir}/webkit-${pkgver}
+  patch -Np1 -i ${srcdir}/gcc46.patch
   mkdir build-gtk{2,3}
 
   ( cd build-gtk2  _build --with-gtk=2.0 )
@@ -26,10 +28,9 @@
 
 _build() {
   PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
---enable-video --enable-introspection \
+--enable-introspection \
 --with-font-backend=freetype --enable-gtk-doc \
---enable-jit --with-unicode-backend=icu \
---enable-3d-transforms --enable-mathml \
+--with-unicode-backend=icu \
 --enable-spellcheck $@
   make all stamp-po
 }

Added: gcc46.patch
===
--- gcc46.patch (rev 0)
+++ gcc46.patch 2011-04-27 21:44:28 UTC (rev 121025)
@@ -0,0 +1,11 @@
+Index: trunk/Source/WebCore/dom/make_names.pl
+===
+--- trunk/Source/WebCore/dom/make_names.pl (revision 73989)
 trunk/Source/WebCore/dom/make_names.pl (revision 84123)
+@@ -66,5 +66,5 @@
+ $gccLocation = /usr/bin/gcc;
+ }
+-my $preprocessor = $gccLocation .  -E -P -x c++;
++my $preprocessor = $gccLocation .  -E -x c++;
+ 
+ GetOptions(



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

2011-03-22 Thread Ionut Biru
Date: Tuesday, March 22, 2011 @ 18:04:47
  Author: ibiru
Revision: 116332

upgpkg: libwebkit 1.3.13-1
update to 1.3.13

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-22 21:46:48 UTC (rev 116331)
+++ PKGBUILD2011-03-22 22:04:47 UTC (rev 116332)
@@ -3,7 +3,7 @@
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.3.12
+pkgver=1.3.13
 pkgrel=1
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
 options=('!libtool')
 install=libwebkit.install
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
-md5sums=('6d4506086fb0d274d1a2c871fcaf851e')
+md5sums=('984adaafac545a89c24351fd4dbd743c')
 
 build() {
   cd ${srcdir}/webkit-${pkgver}
@@ -30,7 +30,7 @@
 --with-font-backend=freetype --enable-gtk-doc \
 --enable-jit --with-unicode-backend=icu \
 --enable-3d-transforms --enable-mathml \
---enable-spellcheck $@ 
+--enable-spellcheck $@
   make all stamp-po
 }
 
@@ -54,4 +54,3 @@
   make DESTDIR=${pkgdir} install
   install -Dm644 ../Source/WebKit/LICENSE 
${pkgdir}/usr/share/licenses/libwebkit3/LICENSE
 }
-md5sums=('f76350682f56761e734faba8689903b5')



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

2011-02-23 Thread Jan Steffens
Date: Wednesday, February 23, 2011 @ 12:30:04
  Author: heftig
Revision: 111026

upgpkg: libwebkit 1.3.12-1
Update to 1.3.12, fix translations, add spellcheck

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |   28 +++-
 1 file changed, 11 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-23 17:23:06 UTC (rev 111025)
+++ PKGBUILD2011-02-23 17:30:04 UTC (rev 111026)
@@ -3,7 +3,7 @@
 
 pkgbase=libwebkit
 pkgname=(libwebkit libwebkit3)
-pkgver=1.3.11
+pkgver=1.3.12
 pkgrel=1
 pkgdesc=An opensource web content engine
 arch=('i686' 'x86_64')
@@ -18,27 +18,20 @@
 
 build() {
   cd ${srcdir}/webkit-${pkgver}
-  mkdir build-gtk2
-  pushd build-gtk2
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
---enable-video --enable-introspection \
---with-font-backend=freetype --enable-gtk-doc \
---enable-jit --with-unicode-backend=icu \
---enable-3D-transforms --enable-mathml \
---with-gtk=2.0
-  make
-  popd
+  mkdir build-gtk{2,3}
 
-  mkdir build-gtk3
-  pushd build-gtk3
+  ( cd build-gtk2  _build --with-gtk=2.0 )
+  ( cd build-gtk3  _build --with-gtk=3.0 )
+}
+
+_build() {
   PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
 --enable-video --enable-introspection \
 --with-font-backend=freetype --enable-gtk-doc \
 --enable-jit --with-unicode-backend=icu \
---enable-3D-transforms --enable-mathml \
---with-gtk=3.0
-  make
-  popd
+--enable-3d-transforms --enable-mathml \
+--enable-spellcheck $@ 
+  make all stamp-po
 }
 
 package_libwebkit() {
@@ -61,3 +54,4 @@
   make DESTDIR=${pkgdir} install
   install -Dm644 ../Source/WebKit/LICENSE 
${pkgdir}/usr/share/licenses/libwebkit3/LICENSE
 }
+md5sums=('f76350682f56761e734faba8689903b5')



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

2011-02-15 Thread Jan de Groot
Date: Tuesday, February 15, 2011 @ 19:08:04
  Author: jgc
Revision: 110073

Remove horrible use of source copying by building outside of source directory

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |   56 +---
 1 file changed, 25 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-15 21:50:21 UTC (rev 110072)
+++ PKGBUILD2011-02-16 00:08:04 UTC (rev 110073)
@@ -17,34 +17,28 @@
 md5sums=('6d4506086fb0d274d1a2c871fcaf851e')
 
 build() {
-  cd ${srcdir}
+  cd ${srcdir}/webkit-${pkgver}
+  mkdir build-gtk2
+  pushd build-gtk2
+  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
+--enable-video --enable-introspection \
+--with-font-backend=freetype --enable-gtk-doc \
+--enable-jit --with-unicode-backend=icu \
+--enable-3D-transforms --enable-mathml \
+--with-gtk=2.0
+  make
+  popd
 
-  export PYTHON=/usr/bin/python2
-
-  rm -rf gtk3-build
-  cp -a webkit-${pkgver} gtk3-build
-
-  (
-cd webkit-$pkgver
-./configure --prefix=/usr \
---enable-video --enable-introspection \
---with-font-backend=freetype --enable-gtk-doc \
---enable-jit --with-unicode-backend=icu \
---enable-3D-transforms --enable-mathml \
---with-gtk=2.0
-make
-  )
-
-  (
-cd gtk3-build
-./configure --prefix=/usr \
---enable-video --enable-introspection \
---with-font-backend=freetype --enable-gtk-doc \
---enable-jit --with-unicode-backend=icu \
---enable-3D-transforms --enable-mathml \
---with-gtk=3.0
-make
-  )
+  mkdir build-gtk3
+  pushd build-gtk3
+  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
+--enable-video --enable-introspection \
+--with-font-backend=freetype --enable-gtk-doc \
+--enable-jit --with-unicode-backend=icu \
+--enable-3D-transforms --enable-mathml \
+--with-gtk=3.0
+  make
+  popd
 }
 
 package_libwebkit() {
@@ -54,16 +48,16 @@
   conflicts=('webkitgtk-svn')
   replaces=('webkitgtk-svn')
 
-  cd $srcdir/webkit-$pkgver
+  cd $srcdir/webkit-$pkgver/build-gtk2
   make DESTDIR=${pkgdir} install
-  install -Dm644 Source/WebKit/LICENSE 
${pkgdir}/usr/share/licenses/libwebkit/LICENSE
+  install -Dm644 ../Source/WebKit/LICENSE 
${pkgdir}/usr/share/licenses/libwebkit/LICENSE
 }
 
 package_libwebkit3() {
   pkgdesc+= (for GTK3)
   depends+=(gtk3)
 
-  cd ${srcdir}/gtk3-build
+  cd ${srcdir}/webkit-${pkgver}/build-gtk3
   make DESTDIR=${pkgdir} install
-  install -Dm644 Source/WebKit/LICENSE 
${pkgdir}/usr/share/licenses/libwebkit3/LICENSE
+  install -Dm644 ../Source/WebKit/LICENSE 
${pkgdir}/usr/share/licenses/libwebkit3/LICENSE
 }



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

2011-02-09 Thread andyrtr
Date: Wednesday, February 9, 2011 @ 15:43:10
  Author: andyrtr
Revision: 109463

upgpkg: libwebkit 1.2.7-1
upstream update 1.2.7

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-09 19:24:36 UTC (rev 109462)
+++ PKGBUILD2011-02-09 20:43:10 UTC (rev 109463)
@@ -2,7 +2,7 @@
 # Maintainer: Andreas Radke andy...@archlinux.org
 
 pkgname=libwebkit
-pkgver=1.2.6
+pkgver=1.2.7
 pkgrel=1
 pkgdesc=an opensource web content engine, derived from KHTML and KJS from KDE
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 options=('!libtool')
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz
 introspection.patch)
-md5sums=('7afb510040b2a49c65514a06bb8200fc'
+md5sums=('25c7e548b65aeb6d83c0182c32ef0927'
  'e7e83312618cb30cc9a1567a21cd0e06')
 
 



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

2010-12-30 Thread 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
===
--- PKGBUILD2010-12-30 22:14:54 UTC (rev 104227)
+++ PKGBUILD2010-12-30 22:22:42 UTC (rev 104228)
@@ -2,8 +2,8 @@
 # Maintainer: Andreas Radke andy...@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=diffnew=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.diff2010-12-30 22:14:54 UTC (rev 104227)
+++ smp_fix.diff2010-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.0 
+0200
-+++ webkit-1.2.5/JavaScriptCore/wtf/Platform.h.new 2010-12-06 
10:49:06.0 +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
- 



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

2010-12-06 Thread andyrtr
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
===
--- PKGBUILD2010-12-06 14:44:49 UTC (rev 102184)
+++ PKGBUILD2010-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=diffnew=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.diff2010-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.0 
+0200
 webkit-1.2.5/JavaScriptCore/wtf/Platform.h.new 2010-12-06 
10:49:06.0 +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
+ 



[arch-commits] Commit in libwebkit/trunk (PKGBUILD webkitgtk-1.2.5.patch)

2010-10-14 Thread andyrtr
Date: Thursday, October 14, 2010 @ 14:34:57
  Author: andyrtr
Revision: 95079

upgpkg: libwebkit 1.2.5-1
new version 1.2.5; enable smp build again

Modified:
  libwebkit/trunk/PKGBUILD
Deleted:
  libwebkit/trunk/webkitgtk-1.2.5.patch

---+
 PKGBUILD  |   11 +--
 webkitgtk-1.2.5.patch |  162 
 2 files changed, 4 insertions(+), 169 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-14 15:03:49 UTC (rev 95078)
+++ PKGBUILD2010-10-14 18:34:57 UTC (rev 95079)
@@ -2,8 +2,8 @@
 # Maintainer: Andreas Radke andy...@archlinux.org
 
 pkgname=libwebkit
-pkgver=1.2.4
-pkgrel=2
+pkgver=1.2.5
+pkgrel=1
 pkgdesc=an opensource web content engine, derived from KHTML and KJS from KDE
 arch=('i686' 'x86_64')
 url=http://webkitgtk.org/;
@@ -13,17 +13,14 @@
 provides=('webkitgtk-svn')
 conflicts=('webkitgtk-svn')
 replaces=('webkitgtk-svn')
-options=('!libtool' '!makeflags')
+options=('!libtool') # '!makeflags')
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz
-   webkitgtk-1.2.5.patch
 introspection.patch)
-md5sums=('dc3a92dd0e8c2e70263fbfdf809b51a5'
- '41542fac596ef2359592a83451dec37d'
+md5sums=('09f04985665b9abf6f0d9956f86a6a31'
  'e7e83312618cb30cc9a1567a21cd0e06')
 
 build() {
   cd ${srcdir}/webkit-${pkgver}
-  patch -Np1 -i ${srcdir}/webkitgtk-1.2.5.patch
   patch -Np0 -i ${srcdir}/introspection.patch
   ./configure --prefix=/usr \
   --enable-video --enable-introspection \

Deleted: webkitgtk-1.2.5.patch
===
--- webkitgtk-1.2.5.patch   2010-10-14 15:03:49 UTC (rev 95078)
+++ webkitgtk-1.2.5.patch   2010-10-14 18:34:57 UTC (rev 95079)
@@ -1,162 +0,0 @@
-diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
-index 1e508d4..b5a0feb 100644
 a/WebCore/ChangeLog
-+++ b/WebCore/ChangeLog
-@@ -1,3 +1,72 @@
-+2010-07-12  Tony Chang  t...@chromium.org
-+
-+Reviewed by David Hyatt.
-+
-+crash in FrameView::detachCustomScrollbars
-+https://bugs.webkit.org/show_bug.cgi?id=41196
-+
-+Test: scrollbars/hidden-iframe-scrollbar-crash.html
-+
-+* page/FrameView.cpp:
-+(WebCore::FrameView::detachCustomScrollbars):
-+
-+2010-07-02  Ojan Vafai  o...@chromium.org
-+
-+Reviewed by Adam Barth.
-+
-+Crash in RenderObject::containingBlock when clearing selection in a 
display:none node.
-+https://bugs.webkit.org/show_bug.cgi?id=41523
-+
-+updateStyleIfNeeded before clearing the selection in the RenderView. 
Otherwise,
-+m_selectionStart and m_selectionEnd in RenderView point to garbage 
object.
-+This fixes the crash because updateStyleIfNeeded clears the selection 
before
-+clobbering nodes that contain the selection.
-+
-+Test: editing/selection/crash-on-clear-selection.html
-+
-+* editing/SelectionController.cpp:
-+(WebCore::SelectionController::updateAppearance):
-+
-+2010-06-23  Abhishek Arya  infe...@chromium.org
-+
-+Reviewed by Kenneth Rohde Christiansen.
-+
-+Firing the onchange event on select which changes its size  1 causes 
the select
-+object to change from a menulist to a listbox. However, when 
propogating the events,
-+we do a bad cast assuming the object will remain a menulist. Added 
proper checks to
-+make sure we check the renderer after the onchange is fired and 
propogate the event
-+based on correct object type.
-+https://bugs.webkit.org/show_bug.cgi?id=40828 
-+
-+Test: fast/events/select-onchange-crash.html
-+
-+* dom/SelectElement.cpp:
-+(WebCore::SelectElement::setSelectedIndex):
-+
-+2010-07-21  Justin Schuh  jsc...@chromium.org
-+
-+Reviewed by Oliver Hunt.
-+
-+Prevent DeleteButtonController enable state from changing when not 
editing
-+https://bugs.webkit.org/show_bug.cgi?id=42659
-+
-+Test: svg/custom/use-invalid-html.xhtml
-+
-+* dom/ContainerNode.cpp:
-+(WebCore::ContainerNode::cloneChildNodes):
-+
-+2010-06-10  Tony Chang  t...@chromium.org
-+
-+Reviewed by Kent Tamura.
-+
-+crash when focus is changed while trying to focus next element
-+https://bugs.webkit.org/show_bug.cgi?id=40407
-+
-+Test: fast/events/focus-change-crash.html
-+
-+* dom/Element.cpp:
-+(WebCore::Element::focus):
-+
- 2010-08-10  Abhishek Arya  infe...@chromium.org
- 
- Reviewed by David Hyatt.
-diff --git a/WebCore/dom/SelectElement.cpp b/WebCore/dom/SelectElement.cpp
-index 0096627..95f6ac6 100644
 a/WebCore/dom/SelectElement.cpp
-+++ b/WebCore/dom/SelectElement.cpp
-@@ -342,8 +342,13 @@ void SelectElement::setSelectedIndex(SelectElementData 
data, Element* element,
- data.setUserDrivenChange(userDrivenChange);
- if (fireOnChangeNow)
-

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

2010-09-07 Thread andyrtr
Date: Tuesday, September 7, 2010 @ 13:55:45
  Author: andyrtr
Revision: 90082

upgpkg: libwebkit 1.2.4-1
new version 1.2.4

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-07 17:55:34 UTC (rev 90081)
+++ PKGBUILD2010-09-07 17:55:45 UTC (rev 90082)
@@ -2,7 +2,7 @@
 # Maintainer: Andreas Radke andy...@archlinux.org
 
 pkgname=libwebkit
-pkgver=1.2.3
+pkgver=1.2.4
 pkgrel=1
 pkgdesc=an opensource web content engine, derived from KHTML and KJS from KDE
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@
 replaces=('webkitgtk-svn')
 options=('!libtool')
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz;)
-md5sums=('0ab5c478a6f5b74a1ae96bf13a456662')
+md5sums=('dc3a92dd0e8c2e70263fbfdf809b51a5')
 
 build() {
   cd ${srcdir}/webkit-${pkgver}



[arch-commits] Commit in libwebkit/trunk (PKGBUILD icu-4.4.patch)

2010-07-17 Thread andyrtr
Date: Saturday, July 17, 2010 @ 05:53:02
  Author: andyrtr
Revision: 85665

upgpkg: libwebkit 1.2.3-1
new version 1.2.3

Modified:
  libwebkit/trunk/PKGBUILD
Deleted:
  libwebkit/trunk/icu-4.4.patch

---+
 PKGBUILD  |   11 +---
 icu-4.4.patch |  141 
 2 files changed, 4 insertions(+), 148 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-17 09:12:57 UTC (rev 85664)
+++ PKGBUILD2010-07-17 09:53:02 UTC (rev 85665)
@@ -2,7 +2,7 @@
 # Maintainer: Andreas Radke andy...@archlinux.org
 
 pkgname=libwebkit
-pkgver=1.2.2
+pkgver=1.2.3
 pkgrel=1
 pkgdesc=an opensource web content engine, derived from KHTML and KJS from KDE
 arch=('i686' 'x86_64')
@@ -14,14 +14,11 @@
 conflicts=('webkitgtk-svn')
 replaces=('webkitgtk-svn')
 options=('!libtool')
-source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz;
-'icu-4.4.patch')
-md5sums=('40338001324a38b977c163291e8816d3'
- 'ea289da2a03857e946cb835fd9e95097')
+source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz;)
+md5sums=('0ab5c478a6f5b74a1ae96bf13a456662')
 
 build() {
   cd ${srcdir}/webkit-${pkgver}
-  patch -p2 -i $srcdir/icu-4.4.patch
   ./configure --prefix=/usr \
   --enable-video --enable-introspection \
   --with-font-backend=freetype --enable-gtk-doc \
@@ -31,6 +28,6 @@
 
 package() {
   cd ${srcdir}/webkit-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
   install -Dm644 WebKit/LICENSE 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

Deleted: icu-4.4.patch
===
--- icu-4.4.patch   2010-07-17 09:12:57 UTC (rev 85664)
+++ icu-4.4.patch   2010-07-17 09:53:02 UTC (rev 85665)
@@ -1,141 +0,0 @@
-2010-03-22  Darin Adler  da...@apple.com
-
-Reviewed by Dan Bernstein.
-
-TextBreakIteratorICU.cpp is incompatible with new UBreakIterator type 
in ICU 4.4
-https://bugs.webkit.org/show_bug.cgi?id=36381
-
-* platform/text/TextBreakIteratorICU.cpp:
-(WebCore::setUpIterator): Use reinterpret_cast instead of static_cast 
or relying
-on conversion to void*.
-(WebCore::textBreakFirst): Ditto.
-(WebCore::textBreakLast): Ditto.
-(WebCore::textBreakNext): Ditto.
-(WebCore::textBreakPrevious): Ditto.
-(WebCore::textBreakPreceding): Ditto.
-(WebCore::textBreakFollowing): Ditto.
-(WebCore::textBreakCurrent): Ditto.
-(WebCore::isTextBreak): Ditto.
-(WebCore::setUpIteratorWithRules): Ditto.
-
- 2010-03-22  Eric Carlson  eric.carl...@apple.com
- 
-Index: /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp
-===
 /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp (revision 50977)
-+++ /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp (revision 56345)
-@@ -25,5 +25,4 @@
- #include PlatformString.h
- #include TextBreakIteratorInternalICU.h
--
- #include unicode/ubrk.h
- #include wtf/Assertions.h
-@@ -39,5 +38,5 @@
- if (!createdIterator) {
- UErrorCode openStatus = U_ZERO_ERROR;
--iterator = static_castTextBreakIterator*(ubrk_open(type, 
currentTextBreakLocaleID(), 0, 0, openStatus));
-+iterator = reinterpret_castTextBreakIterator*(ubrk_open(type, 
currentTextBreakLocaleID(), 0, 0, openStatus));
- createdIterator = true;
- ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), ICU could not open a 
break iterator: %s (%d), u_errorName(openStatus), openStatus);
-@@ -47,5 +46,5 @@
- 
- UErrorCode setTextStatus = U_ZERO_ERROR;
--ubrk_setText(iterator, string, length, setTextStatus);
-+ubrk_setText(reinterpret_castUBreakIterator*(iterator), string, length, 
setTextStatus);
- if (U_FAILURE(setTextStatus))
- return 0;
-@@ -86,42 +85,42 @@
- }
- 
--int textBreakFirst(TextBreakIterator* bi)
--{
--return ubrk_first(bi);
--}
--
--int textBreakLast(TextBreakIterator* bi)
--{
--return ubrk_last(bi);
--}
--
--int textBreakNext(TextBreakIterator* bi)
--{
--return ubrk_next(bi);
--}
--
--int textBreakPrevious(TextBreakIterator* bi)
--{
--return ubrk_previous(bi);
--}
--
--int textBreakPreceding(TextBreakIterator* bi, int pos)
--{
--return ubrk_preceding(bi, pos);
--}
--
--int textBreakFollowing(TextBreakIterator* bi, int pos)
--{
--return ubrk_following(bi, pos);
--}
--
--int textBreakCurrent(TextBreakIterator* bi)
--{
--return ubrk_current(bi);
--}
--
--bool isTextBreak(TextBreakIterator* bi, int pos)
--{
--return ubrk_isBoundary(bi, pos);
-+int textBreakFirst(TextBreakIterator* iterator)
-+{
-+return ubrk_first(reinterpret_castUBreakIterator*(iterator));
-+}
-+
-+int textBreakLast(TextBreakIterator* iterator)
-+{
-+return ubrk_last(reinterpret_castUBreakIterator*(iterator));
-+}
-+
-+int textBreakNext(TextBreakIterator* iterator)

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

2010-07-13 Thread andyrtr
Date: Tuesday, July 13, 2010 @ 02:40:42
  Author: andyrtr
Revision: 85412

upgpkg: libwebkit 1.2.2-1
new version 1.2.2

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-12 21:09:25 UTC (rev 85411)
+++ PKGBUILD2010-07-13 06:40:42 UTC (rev 85412)
@@ -2,7 +2,7 @@
 # Maintainer: Andreas Radke andy...@archlinux.org
 
 pkgname=libwebkit
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 pkgdesc=an opensource web content engine, derived from KHTML and KJS from KDE
 arch=('i686' 'x86_64')
@@ -16,21 +16,21 @@
 options=('!libtool')
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz;
 'icu-4.4.patch')
-md5sums=('eb6f473d8d7be56ecd226e7dd55dcb9b'
+md5sums=('40338001324a38b977c163291e8816d3'
  'ea289da2a03857e946cb835fd9e95097')
 
 build() {
   cd ${srcdir}/webkit-${pkgver}
-  patch -p2 -i $srcdir/icu-4.4.patch || return 1
+  patch -p2 -i $srcdir/icu-4.4.patch
   ./configure --prefix=/usr \
   --enable-video --enable-introspection \
   --with-font-backend=freetype --enable-gtk-doc \
-  --enable-jit --with-unicode-backend=icu || return 1
+  --enable-jit --with-unicode-backend=icu
   make || return 1
 }
 
 package() {
   cd ${srcdir}/webkit-${pkgver}
   make DESTDIR=${pkgdir} install || return 1
-  install -Dm644 WebKit/LICENSE 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
+  install -Dm644 WebKit/LICENSE 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }



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

2010-05-15 Thread andyrtr
Date: Saturday, May 15, 2010 @ 11:58:25
  Author: andyrtr
Revision: 80342

upgpkg: libwebkit 1.2.1-1
new version 1.2.1

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-15 15:11:04 UTC (rev 80341)
+++ PKGBUILD2010-05-15 15:58:25 UTC (rev 80342)
@@ -2,7 +2,7 @@
 # Maintainer: Andreas Radke andy...@archlinux.org
 
 pkgname=libwebkit
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc=an opensource web content engine, derived from KHTML and KJS from KDE
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 options=('!libtool')
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz;
 'icu-4.4.patch')
-md5sums=('b2bfcbc4bbf1d0a51f848cb54c21ee66'
+md5sums=('eb6f473d8d7be56ecd226e7dd55dcb9b'
  'ea289da2a03857e946cb835fd9e95097')
 
 build() {



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

2010-04-05 Thread andyrtr
Date: Monday, April 5, 2010 @ 15:56:43
  Author: andyrtr
Revision: 76005

upgpkg: libwebkit 1.2.0-1
1.2.0

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-05 19:08:39 UTC (rev 76004)
+++ PKGBUILD2010-04-05 19:56:43 UTC (rev 76005)
@@ -2,13 +2,13 @@
 # Maintainer: Andreas Radke andy...@archlinux.org
 
 pkgname=libwebkit
-pkgver=1.1.90
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
 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' 'gstreamer0.10-base' 
'libsoup' 'enchant')
+depends=('libxt' 'libxslt' 'sqlite3' 'gtk2' 'icu=4.4' 'gstreamer0.10-base' 
'libsoup' 'enchant')
 makedepends=('gperf' 'gtk-doc' 'gir-repository')
 provides=('webkitgtk-svn')
 conflicts=('webkitgtk-svn')
@@ -16,7 +16,7 @@
 options=('!libtool')
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz;
 'icu-4.4.patch')
-md5sums=('839bea95a10119332c8a6574e6aa329b'
+md5sums=('b2bfcbc4bbf1d0a51f848cb54c21ee66'
  'ea289da2a03857e946cb835fd9e95097')
 
 build() {



[arch-commits] Commit in libwebkit/trunk (PKGBUILD icu-4.4.patch)

2010-04-02 Thread Pierre Schmitz
Date: Friday, April 2, 2010 @ 17:24:51
  Author: pierre
Revision: 75735

upgpkg: libwebkit 1.1.90-2
icu rebuild

Added:
  libwebkit/trunk/icu-4.4.patch
Modified:
  libwebkit/trunk/PKGBUILD

---+
 PKGBUILD  |   18 ---
 icu-4.4.patch |  141 
 2 files changed, 153 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-02 21:23:48 UTC (rev 75734)
+++ PKGBUILD2010-04-02 21:24:51 UTC (rev 75735)
@@ -3,28 +3,34 @@
 
 pkgname=libwebkit
 pkgver=1.1.90
-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=3.6.22' 'gtk2=2.19.7' 'icu=4.2' 
'gstreamer0.10-base=0.10.26' 'libsoup=2.29.91' 'enchant=1.5.0')
-makedepends=('gperf' 'gtk-doc=1.11' 'gir-repository')
+depends=('libxt' 'libxslt' 'sqlite3' 'gtk2' 'icu' 'gstreamer0.10-base' 
'libsoup' 'enchant')
+makedepends=('gperf' 'gtk-doc' 'gir-repository')
 provides=('webkitgtk-svn')
 conflicts=('webkitgtk-svn')
 replaces=('webkitgtk-svn')
 options=('!libtool')
-source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
-md5sums=('839bea95a10119332c8a6574e6aa329b')
+source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz;
+'icu-4.4.patch')
+md5sums=('839bea95a10119332c8a6574e6aa329b'
+ 'ea289da2a03857e946cb835fd9e95097')
 
 build() {
   cd ${srcdir}/webkit-${pkgver}
+  patch -p2 -i $srcdir/icu-4.4.patch || return 1
   ./configure --prefix=/usr \
   --enable-video --enable-introspection \
   --with-font-backend=freetype --enable-gtk-doc \
   --enable-jit --with-unicode-backend=icu || return 1
   make || return 1
+}
+
+package() {
+  cd ${srcdir}/webkit-${pkgver}
   make DESTDIR=${pkgdir} install || return 1
-
   install -Dm644 WebKit/LICENSE 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
 }

Added: icu-4.4.patch
===
--- icu-4.4.patch   (rev 0)
+++ icu-4.4.patch   2010-04-02 21:24:51 UTC (rev 75735)
@@ -0,0 +1,141 @@
+2010-03-22  Darin Adler  da...@apple.com
+
+Reviewed by Dan Bernstein.
+
+TextBreakIteratorICU.cpp is incompatible with new UBreakIterator type 
in ICU 4.4
+https://bugs.webkit.org/show_bug.cgi?id=36381
+
+* platform/text/TextBreakIteratorICU.cpp:
+(WebCore::setUpIterator): Use reinterpret_cast instead of static_cast 
or relying
+on conversion to void*.
+(WebCore::textBreakFirst): Ditto.
+(WebCore::textBreakLast): Ditto.
+(WebCore::textBreakNext): Ditto.
+(WebCore::textBreakPrevious): Ditto.
+(WebCore::textBreakPreceding): Ditto.
+(WebCore::textBreakFollowing): Ditto.
+(WebCore::textBreakCurrent): Ditto.
+(WebCore::isTextBreak): Ditto.
+(WebCore::setUpIteratorWithRules): Ditto.
+
+ 2010-03-22  Eric Carlson  eric.carl...@apple.com
+ 
+Index: /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp
+===
+--- /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp (revision 50977)
 /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp (revision 56345)
+@@ -25,5 +25,4 @@
+ #include PlatformString.h
+ #include TextBreakIteratorInternalICU.h
+-
+ #include unicode/ubrk.h
+ #include wtf/Assertions.h
+@@ -39,5 +38,5 @@
+ if (!createdIterator) {
+ UErrorCode openStatus = U_ZERO_ERROR;
+-iterator = static_castTextBreakIterator*(ubrk_open(type, 
currentTextBreakLocaleID(), 0, 0, openStatus));
++iterator = reinterpret_castTextBreakIterator*(ubrk_open(type, 
currentTextBreakLocaleID(), 0, 0, openStatus));
+ createdIterator = true;
+ ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), ICU could not open a 
break iterator: %s (%d), u_errorName(openStatus), openStatus);
+@@ -47,5 +46,5 @@
+ 
+ UErrorCode setTextStatus = U_ZERO_ERROR;
+-ubrk_setText(iterator, string, length, setTextStatus);
++ubrk_setText(reinterpret_castUBreakIterator*(iterator), string, length, 
setTextStatus);
+ if (U_FAILURE(setTextStatus))
+ return 0;
+@@ -86,42 +85,42 @@
+ }
+ 
+-int textBreakFirst(TextBreakIterator* bi)
+-{
+-return ubrk_first(bi);
+-}
+-
+-int textBreakLast(TextBreakIterator* bi)
+-{
+-return ubrk_last(bi);
+-}
+-
+-int textBreakNext(TextBreakIterator* bi)
+-{
+-return ubrk_next(bi);
+-}
+-
+-int textBreakPrevious(TextBreakIterator* bi)
+-{
+-return ubrk_previous(bi);
+-}
+-
+-int textBreakPreceding(TextBreakIterator* bi, int pos)
+-{
+-return ubrk_preceding(bi, pos);
+-}
+-
+-int textBreakFollowing(TextBreakIterator* bi, int pos)
+-{
+-return ubrk_following(bi, pos);
+-}
+-
+-int textBreakCurrent(TextBreakIterator* bi)
+-{
+-return ubrk_current(bi);
+-}
+-
+-bool 

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

2010-02-24 Thread Ionut Biru
Date: Wednesday, February 24, 2010 @ 18:10:09
  Author: ibiru
Revision: 70135

update to 1.1.22

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-24 23:06:04 UTC (rev 70134)
+++ PKGBUILD2010-02-24 23:10:09 UTC (rev 70135)
@@ -2,20 +2,20 @@
 # Maintainer: Andreas Radke andy...@archlinux.org
 
 pkgname=libwebkit
-pkgver=1.1.21
-pkgrel=2
+pkgver=1.1.22
+pkgrel=1
 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=3.6.22' 'gtk2=2.19.5-2' 'icu=4.2' 
'gstreamer0.10-base=0.10.26' 'libsoup=2.29.90' 'enchant=1.5.0')
+depends=('libxt' 'libxslt' 'sqlite3=3.6.22' 'gtk2=2.19.6' 'icu=4.2' 
'gstreamer0.10-base=0.10.26' 'libsoup=2.29.91' 'enchant=1.5.0')
 makedepends=('gperf' 'gtk-doc=1.11' 'gir-repository')
 provides=('webkitgtk-svn')
 conflicts=('webkitgtk-svn')
 replaces=('webkitgtk-svn')
 options=('!libtool')
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
-md5sums=('8957bcffd0a0394a75f8f7936ab270bc')
+md5sums=('2c07cbf3ac577cf5f6b3c10861a0e051')
 
 build() {
   cd ${srcdir}/webkit-${pkgver}



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

2010-02-21 Thread Jan de Groot
Date: Sunday, February 21, 2010 @ 10:31:20
  Author: jgc
Revision: 69625

upgpkg: libwebkit 1.1.21-2
Add introspection data

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-21 15:09:52 UTC (rev 69624)
+++ PKGBUILD2010-02-21 15:31:20 UTC (rev 69625)
@@ -3,13 +3,13 @@
 
 pkgname=libwebkit
 pkgver=1.1.21
-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=3.6.22' 'gtk2=2.19.5' 'icu=4.2' 
'gstreamer0.10-base=0.10.26' 'libsoup=2.29.90' 'enchant=1.5.0')
-makedepends=('gperf' 'gtk-doc=1.11')
+depends=('libxt' 'libxslt' 'sqlite3=3.6.22' 'gtk2=2.19.5-2' 'icu=4.2' 
'gstreamer0.10-base=0.10.26' 'libsoup=2.29.90' 'enchant=1.5.0')
+makedepends=('gperf' 'gtk-doc=1.11' 'gir-repository')
 provides=('webkitgtk-svn')
 conflicts=('webkitgtk-svn')
 replaces=('webkitgtk-svn')
@@ -20,7 +20,7 @@
 build() {
   cd ${srcdir}/webkit-${pkgver}
   ./configure --prefix=/usr \
-  --enable-video \
+  --enable-video --enable-introspection \
   --with-font-backend=freetype --enable-gtk-doc \
   --enable-jit --with-unicode-backend=icu || return 1
   make || return 1



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

2010-02-13 Thread Jan de Groot
Date: Saturday, February 13, 2010 @ 12:19:14
  Author: jgc
Revision: 68600

upgpkg: libwebkit 1.1.21-1
Update to 1.1.21

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |   16 +---
 1 file changed, 5 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-13 17:19:12 UTC (rev 68599)
+++ PKGBUILD2010-02-13 17:19:14 UTC (rev 68600)
@@ -2,29 +2,23 @@
 # Maintainer: Andreas Radke andy...@archlinux.org
 
 pkgname=libwebkit
-pkgver=1.1.15.4
-pkgrel=3
+pkgver=1.1.21
+pkgrel=1
 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=3.6.22' 'gtk2=2.18.6' 'icu=4.2' 
'gstreamer0.10-base=0.10.25' 'libsoup=2.28.2' 'enchant=1.5.0')
+depends=('libxt' 'libxslt' 'sqlite3=3.6.22' 'gtk2=2.19.5' 'icu=4.2' 
'gstreamer0.10-base=0.10.26' 'libsoup=2.29.90' 'enchant=1.5.0')
 makedepends=('gperf' 'gtk-doc=1.11')
 provides=('webkitgtk-svn')
 conflicts=('webkitgtk-svn')
 replaces=('webkitgtk-svn')
 options=('!libtool')
-source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz
-webkitdownload-use-webkitnetworkresponse.patch
-webkit-add-gzip.patch)
-md5sums=('47301fb7120421ac38bf714db8f5d428'
- 'a041ddf393002ebd4ea4eaec972c47c2'
- 'adf43a17499c136f35b899967b01b9f9')
+source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
+md5sums=('8957bcffd0a0394a75f8f7936ab270bc')
 
 build() {
   cd ${srcdir}/webkit-${pkgver}
-  patch -Np1 -i ${srcdir}/webkitdownload-use-webkitnetworkresponse.patch || 
return 1
-  patch -Np1 -i ${srcdir}/webkit-add-gzip.patch || return 1
   ./configure --prefix=/usr \
   --enable-video \
   --with-font-backend=freetype --enable-gtk-doc \



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

2010-01-17 Thread Jan de Groot
Date: Sunday, January 17, 2010 @ 14:30:43
  Author: jgc
Revision: 63538

upgpkg: libwebkit 1.1.15.4-3
Rebuild for libpng14/libjpeg8

Modified:
  libwebkit/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-17 19:12:03 UTC (rev 63537)
+++ PKGBUILD2010-01-17 19:30:43 UTC (rev 63538)
@@ -3,12 +3,12 @@
 
 pkgname=libwebkit
 pkgver=1.1.15.4
-pkgrel=2
+pkgrel=3
 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=3.6.21' 'gtk2=2.18.5' 'icu=4.2' 
'gstreamer0.10-base=0.10.25' 'libsoup=2.28.2' 'enchant=1.5.0')
+depends=('libxt' 'libxslt' 'sqlite3=3.6.22' 'gtk2=2.18.6' 'icu=4.2' 
'gstreamer0.10-base=0.10.25' 'libsoup=2.28.2' 'enchant=1.5.0')
 makedepends=('gperf' 'gtk-doc=1.11')
 provides=('webkitgtk-svn')
 conflicts=('webkitgtk-svn')



[arch-commits] Commit in libwebkit/trunk (PKGBUILD webkit-add-gzip.patch)

2009-12-16 Thread Jan de Groot
Date: Wednesday, December 16, 2009 @ 14:00:15
  Author: jgc
Revision: 61483

upgpkg: libwebkit 1.1.15.4-2
Include patch to support gzip encoding. Speeds up a lot of sites and fixes 
some that assume gzip encoding is supported by every browser

Added:
  libwebkit/trunk/webkit-add-gzip.patch
Modified:
  libwebkit/trunk/PKGBUILD

---+
 PKGBUILD  |   11 +++
 webkit-add-gzip.patch |   30 ++
 2 files changed, 37 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-16 18:49:06 UTC (rev 61482)
+++ PKGBUILD2009-12-16 19:00:15 UTC (rev 61483)
@@ -3,25 +3,28 @@
 
 pkgname=libwebkit
 pkgver=1.1.15.4
-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=3.6.18' 'gtk2=2.18.0' 'icu=4.2' 
'gstreamer0.10-base=0.10.24' 'libsoup=2.28.0' 'enchant=1.4.2')
+depends=('libxt' 'libxslt' 'sqlite3=3.6.21' 'gtk2=2.18.5' 'icu=4.2' 
'gstreamer0.10-base=0.10.25' 'libsoup=2.28.2' 'enchant=1.5.0')
 makedepends=('gperf' 'gtk-doc=1.11')
 provides=('webkitgtk-svn')
 conflicts=('webkitgtk-svn')
 replaces=('webkitgtk-svn')
 options=('!libtool')
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz
-webkitdownload-use-webkitnetworkresponse.patch)
+webkitdownload-use-webkitnetworkresponse.patch
+webkit-add-gzip.patch)
 md5sums=('47301fb7120421ac38bf714db8f5d428'
- 'a041ddf393002ebd4ea4eaec972c47c2')
+ 'a041ddf393002ebd4ea4eaec972c47c2'
+ 'adf43a17499c136f35b899967b01b9f9')
 
 build() {
   cd ${srcdir}/webkit-${pkgver}
   patch -Np1 -i ${srcdir}/webkitdownload-use-webkitnetworkresponse.patch || 
return 1
+  patch -Np1 -i ${srcdir}/webkit-add-gzip.patch || return 1
   ./configure --prefix=/usr \
   --enable-video \
   --with-font-backend=freetype --enable-gtk-doc \

Added: webkit-add-gzip.patch
===
--- webkit-add-gzip.patch   (rev 0)
+++ webkit-add-gzip.patch   2009-12-16 19:00:15 UTC (rev 61483)
@@ -0,0 +1,30 @@
+diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp 
b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+index 2177bd2..85ca8c5 100644
+--- a/WebCore/platform/network/soup/ResourceHandleSoup.cpp
 b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+@@ -541,12 +541,6 @@ static bool startHttp(ResourceHandle* handle)
+ // balanced by a deref() in finishedCallback, which should always run
+ handle-ref();
+ 
+-// FIXME: For now, we cannot accept content encoded in anything
+-// other than identity, so force servers to do it our way. When
+-// libsoup gets proper Content-Encoding support we will want to
+-// use it here instead.
+-soup_message_headers_replace(d-m_msg-request_headers, 
Accept-Encoding, identity);
+-
+ // Balanced in ResourceHandleInternal's destructor; we need to
+ // keep our own ref, because after queueing the message, the
+ // session owns the initial reference.
+diff --git a/WebKit/gtk/webkit/webkitprivate.cpp 
b/WebKit/gtk/webkit/webkitprivate.cpp
+index 4425dcd..975708e 100644
+--- a/WebKit/gtk/webkit/webkitprivate.cpp
 b/WebKit/gtk/webkit/webkitprivate.cpp
+@@ -249,6 +249,8 @@ void webkit_init()
+ SoupSessionFeature* sniffer = 
static_castSoupSessionFeature*(g_object_new(SOUP_TYPE_CONTENT_SNIFFER, NULL));
+ soup_session_add_feature(session, sniffer);
+ g_object_unref(sniffer);
++
++soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER);
+ }
+ 
+ void webkit_white_list_access_from_origin(const gchar* sourceOrigin, const 
gchar* destinationProtocol, const gchar* destinationHost, bool 
allowDestinationSubdomains)