qywebkit 2.3 beta2 update

This commit is contained in:
Anke 2013-02-13 19:39:54 +00:00
parent 2c6b8133db
commit 184714e279
2 changed files with 3 additions and 21 deletions

View File

@ -1,15 +0,0 @@
diff --git a/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp b/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
index 56ed0b4..1e50c9e 100644
--- a/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
@@ -323,7 +323,8 @@ void NotificationPresenterClientQt::requestPermission(ScriptExecutionContext* co
RefPtr<VoidCallback> cb = callback;
CallbacksInfo info;
info.m_frame = toFrame(context);
- info.m_callbacks.append(cb);
+ if (cb)
+ info.m_callbacks.append(cb);
m_pendingPermissionRequests.insert(context, info);
if (toPage(context) && toFrame(context)) {

View File

@ -6,7 +6,7 @@
pkgname=qtwebkit
pkgver=2.3
_pkgver=23
pkgrel=5
pkgrel=6
_qtver=4.8.4
arch=('x86_64')
url='http://trac.webkit.org/wiki/QtWebKit'
@ -16,23 +16,20 @@ depends=('qt' 'gstreamer0.10' 'gstreamer0.10-base' 'gstreamer0.10-base-plugins'
'gstreamer0.10-good-plugins' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-ffmpeg'
'gstreamer0.10-ugly-plugins' 'systemd')
makedepends=('gperf' 'sqlite3' 'fontconfig' 'perl' 'python2' 'mesa' 'ruby' 'git')
source=("${pkgname}-${pkgver}.tar.gz"::"https://gitorious.org/webkit/qtwebkit-23/archive-tarball/qtwebkit-2.3-beta1"
source=("${pkgname}-${pkgver}.tar.gz"::"https://gitorious.org/webkit/qtwebkit-23/archive-tarball/qtwebkit-2.3-beta2"
"http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz"
'qwebview.patch'
'Notifications.diff'
'MediaControl.diff'
'WindowOpen.diff')
sha1sums=('e5a8ffe62fc57dbbea2110241077bebbcd605fd2'
sha1sums=('b1bfa9e3303ce9c95eec0a1e66b2b812b844bf08'
'f5880f11c139d7d8d01ecb8d874535f7d9553198'
'ef467fcfc9e74aa88356f27acc21792706ed1e4d'
'37cef3fb9f853e49c2394abb722634b4cdb3a744'
'd92bc12d2d0f45a7343ee2acdb66df0ebf446d18'
'1d98d3505c85f6b70a81444939be342cf51d3540')
build() {
cd "${srcdir}"/webkit-qtwebkit-${_pkgver}
patch -p1 -i "${srcdir}"/Notifications.diff
patch -p1 -i "${srcdir}"/MediaControl.diff
patch -p1 -i "${srcdir}"/WindowOpen.diff