[arch-commits] Commit in libwebkit/repos (4 files)

[andyrtr at archlinux.org]

    Date: Saturday, January 3, 2009 @ 12:54:41
  Author: andyrtr
Revision: 23138

Merged revisions 23137 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/libwebkit/trunk

........
  r23137 | andyrtr | 2009-01-03 17:54:06 +0000 (Sa, 03 Jan 2009) | 2 lines
  
  upgpkg: libwebkit 1.0.3-0.39572
      new snapshot, revision r39572
........

Modified:
  libwebkit/repos/extra-x86_64/	(properties)
  libwebkit/repos/extra-x86_64/PKGBUILD
Deleted:
  libwebkit/repos/extra-x86_64/buildfix.diff
  libwebkit/repos/extra-x86_64/buildfix_soup.diff

--------------------+
 PKGBUILD           |   11 +++++------
 buildfix.diff      |   10 ----------
 buildfix_soup.diff |   14 --------------
 3 files changed, 5 insertions(+), 30 deletions(-)


Property changes on: libwebkit/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /libwebkit/trunk:1-22067
   + /libwebkit/trunk:1-23137

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-01-03 17:54:06 UTC (rev 23137)
+++ extra-x86_64/PKGBUILD	2009-01-03 17:54:41 UTC (rev 23138)
@@ -3,7 +3,7 @@
 
 pkgname=libwebkit
 pkgver=1.0.3 # see configure.ac
-_svnver=39370 # date: 20081218
+_svnver=39572 # date: 20090102
 pkgrel=0.${_svnver}
 pkgdesc="an opensource web content engine, derived from KHTML and KJS from KDE"
 arch=('i686' 'x86_64')
@@ -15,16 +15,15 @@
 conflicts=('webkitgtk-svn')
 replaces=('webgitgtk-svn')
 source=(http://builds.nightly.webkit.org/files/trunk/src/WebKit-r${_svnver}.tar.bz2
-	buildfix_webkit_bison2.4.diff buildfix_soup.diff)
+	buildfix_webkit_bison2.4.diff)
 options=('!libtool')
-md5sums=('0f5b867df3b660511f01c2c456904da3'
-         '98c8c22b290160f4de7dfcf62eef67bc'
-         '9225bbfc0d92de0863a1aad76f57dafb')
+md5sums=('828a6b11ad7ae810d45b923d3eba12be'
+         '98c8c22b290160f4de7dfcf62eef67bc')
 
 build() {
   cd ${srcdir}/WebKit-r${_svnver}
   patch -Np1 -i ${srcdir}/buildfix_webkit_bison2.4.diff || return 1 
-  patch -Np1 -i ${srcdir}/buildfix_soup.diff || return 1 
+
   ./autogen.sh --prefix=/usr \
 	--enable-video \
 	--with-font-backend=pango \

Deleted: extra-x86_64/buildfix.diff
===================================================================
--- extra-x86_64/buildfix.diff	2009-01-03 17:54:06 UTC (rev 23137)
+++ extra-x86_64/buildfix.diff	2009-01-03 17:54:41 UTC (rev 23138)
@@ -1,10 +0,0 @@
---- WebCore/page/gtk/AXObjectCacheAtk.cpp	2008-06-15 23:40:06.000000000 +0000
-+++ WebCore/page/gtk/AXObjectCacheAtk.cpp.new	2008-08-12 09:23:25.000000000 +0000
-@@ -25,6 +25,7 @@
- #include "RenderObject.h"
- 
- #include "CString.h"
-+#include "stdio.h"
- 
- namespace WebCore {
- 

Deleted: extra-x86_64/buildfix_soup.diff
===================================================================
--- extra-x86_64/buildfix_soup.diff	2009-01-03 17:54:06 UTC (rev 23137)
+++ extra-x86_64/buildfix_soup.diff	2009-01-03 17:54:41 UTC (rev 23138)
@@ -1,14 +0,0 @@
-diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
-index af577ba..5fd3a4d 100644
---- a/WebCore/platform/network/soup/ResourceHandleSoup.cpp
-+++ b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
-@@ -298,7 +298,7 @@ bool ResourceHandle::startHttp(String urlString)
-     if (!customHeaders.isEmpty()) {
-         HTTPHeaderMap::const_iterator end = customHeaders.end();
-         for (HTTPHeaderMap::const_iterator it = customHeaders.begin(); it != end; ++it)
--            soup_message_headers_append(msg->request_headers, it->first.utf8().data(), it->second.utf8().data());
-+            soup_message_headers_append(msg->request_headers, it->first.string().utf8().data(), it->second.utf8().data());
-     }
- 
-     FormData* httpBody = d->m_request.httpBody();
-