[arch-commits] Commit in kdelibs/trunk (PKGBUILD fix-scroll-in-khtml.patch)

[Andrea Scarpino]

    Date: Friday, February 26, 2010 @ 15:49:40
  Author: andrea
Revision: 70443

updated for 4.4.1

Modified:
  kdelibs/trunk/PKGBUILD
Deleted:
  kdelibs/trunk/fix-scroll-in-khtml.patch

---------------------------+
 PKGBUILD                  |   15 +++++----------
 fix-scroll-in-khtml.patch |   15 ---------------
 2 files changed, 5 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-26 20:39:05 UTC (rev 70442)
+++ PKGBUILD	2010-02-26 20:49:40 UTC (rev 70443)
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdelibs
-pkgver=4.4.0
-pkgrel=4
+pkgver=4.4.1
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -16,13 +16,11 @@
 replaces=('arts' 'kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch'
-	'fix-scroll-in-khtml.patch')
-md5sums=('957bca85de744a9ddd316fd85e882b40'
+        'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch')
+md5sums=('5057908fb9dcf7997a87fe27a382bfc9'
          '2b30cc3e382e99333e7ff388943473e9'
          'a2c351e5c4d5bef39865e5fc1a39219a'
-         '18ea42696a7f41332a092d6ead7efc6a'
-         '5422652692da9297369b9b630bbd3c81')
+         '18ea42696a7f41332a092d6ead7efc6a')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
@@ -34,9 +32,6 @@
 	# add syntax highlightning for PKGBUILD and .install files
 	patch -p1 -i $srcdir/abs-syntax-highlight.patch
 
-	# BUG: 226265
-	patch -p3 -i ${srcdir}/fix-scroll-in-khtml.patch || return 1
-
 	cd ${srcdir}
 	mkdir build
 	cd build

Deleted: fix-scroll-in-khtml.patch
===================================================================
--- fix-scroll-in-khtml.patch	2010-02-26 20:39:05 UTC (rev 70442)
+++ fix-scroll-in-khtml.patch	2010-02-26 20:49:40 UTC (rev 70443)
@@ -1,15 +0,0 @@
---- trunk/KDE/kdelibs/khtml/khtmlview.cpp	2010/02/12 15:36:30	1089158
-+++ trunk/KDE/kdelibs/khtml/khtmlview.cpp	2010/02/12 15:39:04	1089159
-@@ -604,6 +604,12 @@
-         setWidget( new QWidget(this) );
-     widget()->setAttribute( Qt::WA_NoSystemBackground );
- 
-+    // Do *not* remove this attribute frivolously.
-+    // You might not notice a change of behaviour in Debug builds
-+    // but removing opaque events will make QWidget::scroll fail horribly
-+    // in Release builds.
-+    widget()->setAttribute( Qt::WA_OpaquePaintEvent );
-+
-     verticalScrollBar()->setCursor( Qt::ArrowCursor );
-     horizontalScrollBar()->setCursor( Qt::ArrowCursor );
-