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 =================================================================== --- PKGBUILD 2010-10-14 15:03:49 UTC (rev 95078) +++ PKGBUILD 2010-10-14 18:34:57 UTC (rev 95079) @@ -2,8 +2,8 @@ # Maintainer: Andreas Radke <[email protected]> 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 <[email protected]> -+ -+ 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 <[email protected]> -+ -+ 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 <[email protected]> -+ -+ 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 <[email protected]> -+ -+ 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 <[email protected]> -+ -+ 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 <[email protected]> - - 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) - menuListOnChange(data, element); -- if (RenderMenuList* menuList = toRenderMenuList(element->renderer())) -- menuList->didSetSelectedIndex(); -+ RenderObject* renderer = element->renderer(); -+ if (renderer) { -+ if (data.usesMenuList()) -+ toRenderMenuList(renderer)->didSetSelectedIndex(); -+ else if (renderer->isListBox()) -+ toRenderListBox(renderer)->selectionChanged(); -+ } - } - - if (Frame* frame = element->document()->frame()) -diff --git a/WebCore/editing/SelectionController.cpp b/WebCore/editing/SelectionController.cpp -index 38a6e7b..b365d1d 100644 ---- a/WebCore/editing/SelectionController.cpp -+++ b/WebCore/editing/SelectionController.cpp -@@ -1389,6 +1389,9 @@ void SelectionController::updateAppearance() - } - #endif - -+ // We need to update style in case the node containing the selection is made display:none. -+ m_frame->document()->updateStyleIfNeeded(); -+ - RenderView* view = m_frame->contentRenderer(); - if (!view) - return; -diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp -index d38f655..8b82fc3 100644 ---- a/WebCore/page/FrameView.cpp -+++ b/WebCore/page/FrameView.cpp -@@ -260,11 +260,11 @@ void FrameView::detachCustomScrollbars() - return; - - Scrollbar* horizontalBar = horizontalScrollbar(); -- if (horizontalBar && horizontalBar->isCustomScrollbar() && !toRenderScrollbar(horizontalBar)->owningRenderer()->isRenderPart()) -+ if (horizontalBar && horizontalBar->isCustomScrollbar()) - setHasHorizontalScrollbar(false); - - Scrollbar* verticalBar = verticalScrollbar(); -- if (verticalBar && verticalBar->isCustomScrollbar() && !toRenderScrollbar(verticalBar)->owningRenderer()->isRenderPart()) -+ if (verticalBar && verticalBar->isCustomScrollbar()) - setHasVerticalScrollbar(false); - - if (m_scrollCorner) { -diff --git a/WebKit/gtk/NEWS b/WebKit/gtk/NEWS -index ff703f4..2316057 100644 ---- a/WebKit/gtk/NEWS -+++ b/WebKit/gtk/NEWS -@@ -1,4 +1,18 @@ - ================ -+WebKitGTK+ 1.2.5 -+================ -+ -+What's new in WebKitGTK+ 1.2.5? -+ -+ - New stable release, API and ABI compatible with previous 1.2.x -+ versions; -+ - The patches to fix the following CVEs are included with help from -+ Vincent Danen and other members of the Red Hat security team: -+ -+ CVE-2010-1780 CVE-2010-3113 CVE-2010-1814 CVE-2010-1812 -+ CVE-2010-1815 -+ -+================ - WebKitGTK+ 1.2.4 - ================ - -@@ -13,6 +27,9 @@ What's new in WebKitGTK+ 1.2.4? - CVE-2010-1786 CVE-2010-1787 CVE-2010-1788 CVE-2010-1790 - CVE-2010-1792 CVE-2010-1793 CVE-2010-2648 - -+ Update: CVE-2010-2647 was also addressed in this release, but failed -+ to be listed at release time. -+ - ================ - WebKitGTK+ 1.2.3 - ================
