[arch-commits] CVS update of extra/kde/kdelibs (PKGBUILD post-3.5.8.patch)
Tobias Powalowski
tpowa at archlinux.org
Mon Oct 15 12:18:16 UTC 2007
Date: Monday, October 15, 2007 @ 08:18:16
Author: tpowa
Path: /home/cvs-extra/extra/kde/kdelibs
Added: post-3.5.8.patch (1.1)
Modified: PKGBUILD (1.88 -> 1.89)
upgpkg: update to new version
------------------+
PKGBUILD | 48 ++++++++++++++++++++------------------------
post-3.5.8.patch | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 79 insertions(+), 26 deletions(-)
Index: extra/kde/kdelibs/PKGBUILD
diff -u extra/kde/kdelibs/PKGBUILD:1.88 extra/kde/kdelibs/PKGBUILD:1.89
--- extra/kde/kdelibs/PKGBUILD:1.88 Wed Oct 3 18:13:02 2007
+++ extra/kde/kdelibs/PKGBUILD Mon Oct 15 08:18:16 2007
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD,v 1.88 2007/10/03 22:13:02 andyrtr Exp $
+# $Id: PKGBUILD,v 1.89 2007/10/15 12:18:16 tpowa Exp $
# Contributor: Roman Kreisel <roman.kreisel at epost.de>
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
pkgname=kdelibs
-pkgver=3.5.7
-kdever=3.5.7
-pkgrel=8
+pkgver=3.5.8
+kdever=3.5.8
+pkgrel=1
pkgdesc="KDE Core Libraries"
arch=(i686 x86_64)
url="http://www.kde.org"
@@ -13,10 +13,10 @@
groups=('kde')
-depends=('arts>=1.5.7' 'db>=4.6' 'libxslt' 'pcre' 'libart-lgpl' 'openexr'
+depends=('arts>=1.5.8' 'db>=4.6' 'libxslt' 'pcre' 'libart-lgpl' 'openexr'
'avahi>=0.6.9' 'jasper>=1.900.1' 'fam' 'bzip2' 'openssl' 'libidn' 'perl'
'aspell' 'heimdal>=1.0.1' 'acl' 'libtiff' 'qt>=3.3.7')
-makedepends=(pkgconfig "cups>=1.3.3")
+makedepends=(pkgconfig cups)
# for easier build, just uncomment the mirror you want to use
mirror="ftp.solnet.ch/mirror/KDE" # updated every 2 hours, very fast for Europe
@@ -24,7 +24,6 @@
# mirror="ibiblio.org/pub/mirrors/kde/" # ibiblio mirror
source=(ftp://$mirror/stable/$kdever/src/$pkgname-$pkgver.tar.bz2
- ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdelibs-kdecore-2.diff
http://www.archlinux.org/~jgc/kdnssd-avahi-20060319.tar.bz2
kconf-update-faster.diff
applications.menu.patch
@@ -35,20 +34,7 @@
kde-menu.patch
inotify.patch
gmail.fix
- kdelibs-3.5.7-cups13.patch)
-md5sums=('50ed644f2ec91963570fe2b155652957'
- '4c0fb2576875ded606f276421fc49752'
- 'b7b98e965960f2d55741a10070aa943d'
- 'c9e8c50d4b26648cf4487001db9dca48'
- 'a66270abcdd0dcb2e28d3b2464927ff6'
- '6061c259247f56f0ede21deabfad2732'
- '60ab1a486895d6c18ef334ec958c48d6'
- 'f7abfe849e5122dd01d6b8a884999da0'
- '091d05a08330372ddbaf5ef9d426be53'
- 'e94aef45b5a59fe58c7cc085ab1dd3ae'
- '42d288e71fa0a886bc8882c198a27f2e'
- 'd888793ff50dafb970f503e3ab6851b6'
- '507569f4f368f387f42834444ea73994')
+ post-3.5.8.patch)
build() {
# Source the QT and KDE profile
@@ -64,8 +50,8 @@
patch -Np0 -i $startdir/src/kconf-update-faster.diff || return 1
# fix gmail
patch -Np1 -i $startdir/src/gmail.fix || return 1
- # fix compilation with cups >1.3
- patch -Np1 -i $startdir/src/kdelibs-3.5.7-cups13.patch || return 1
+ # fix from ML
+ patch -Np4 -i $startdir/src/post-3.5.8.patch || return 1
# Replace dns-sd implementation with avahi implementation
rm dnssd/*
@@ -73,8 +59,7 @@
rm dnssd/configure{,.in}
sed -i -e 's/kdnssd-avahi/dnssd/g' dnssd/configure.in.in
sed -i -e 's|ksocketaddress\.h|network/ksocketaddress\.h|' dnssd/publicservice.cpp
- # fix security issue
- patch -Np0 -i $startdir/src/post-3.5.7-kdelibs-kdecore-2.diff || return 1
+
#Needed for updated kdnssd-avahi and inotify patch
make -f admin/Makefile.common dist
@@ -87,7 +72,6 @@
# --enable-final # remove this if you build with < 512mb ram.
make || return 1
make DESTDIR=$startdir/pkg install || return 1
-
# Set cups as default printing system
cd $startdir/pkg/opt/kde/share/config
patch -Np0 -i $startdir/src/kdeprintrc.patch || return 1
@@ -101,3 +85,15 @@
cd $startdir/pkg/opt/kde/bin/
ln -s fileshareset.pl filesharelist
}
+md5sums=('acaa37e79e840d10dca326277a20863c'
+ 'b7b98e965960f2d55741a10070aa943d'
+ 'c9e8c50d4b26648cf4487001db9dca48'
+ 'a66270abcdd0dcb2e28d3b2464927ff6'
+ '6061c259247f56f0ede21deabfad2732'
+ '60ab1a486895d6c18ef334ec958c48d6'
+ 'f7abfe849e5122dd01d6b8a884999da0'
+ '091d05a08330372ddbaf5ef9d426be53'
+ 'e94aef45b5a59fe58c7cc085ab1dd3ae'
+ '42d288e71fa0a886bc8882c198a27f2e'
+ 'd888793ff50dafb970f503e3ab6851b6'
+ 'fc9e7395316a85547988bf506234327e')
Index: extra/kde/kdelibs/post-3.5.8.patch
diff -u /dev/null extra/kde/kdelibs/post-3.5.8.patch:1.1
--- /dev/null Mon Oct 15 08:18:16 2007
+++ extra/kde/kdelibs/post-3.5.8.patch Mon Oct 15 08:18:16 2007
@@ -0,0 +1,57 @@
+SVN commit 724472 by lunakl:
+
+Handle properly X timestamps that are so high that they cannot be
+represented properly as signed long, only unsigned. This fixes
+focus e.g. when mailing a link from Konqueror.
+
+CCMAIL: kde-packagers at kde.org
+Since such X timestamps happen right after startup on both of my 10.3 machines,
+I suggest packagers consider adding this patch to their 3.5.8 packages.
+
+
+
+ M +8 -4 kstartupinfo.cpp
+
+
+--- branches/KDE/3.5/kdelibs/kdecore/kstartupinfo.cpp #724471:724472
++++ branches/KDE/3.5/kdelibs/kdecore/kstartupinfo.cpp #724471:724472
+@@ -545,7 +545,7 @@
+
+ void KStartupInfo::setNewStartupId( QWidget* window, const QCString& startup_id )
+ {
+- long activate = true;
++ bool activate = true;
+ kapp->setStartupId( startup_id );
+ if( window != NULL )
+ {
+@@ -937,7 +937,7 @@
+ #ifdef Q_WS_X11
+ extern Time qt_x_user_time;
+ #else
+- long qt_x_user_time = 0;
++ unsigned long qt_x_user_time = 0;
+ #endif
+ QCString id = QString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec )
+ .arg( tm.tv_usec ).arg( getpid()).arg( qt_x_user_time ).utf8();
+@@ -1078,7 +1078,9 @@
+ if( pos >= 0 )
+ {
+ bool ok;
+- long time = d->id.mid( pos + 5 ).toLong( &ok );
++ unsigned long time = d->id.mid( pos + 5 ).toULong( &ok );
++ if( !ok && d->id[ pos + 5 ] == '-' ) // try if it's as a negative signed number perhaps
++ time = d->id.mid( pos + 5 ).toLong( &ok );
+ if( ok )
+ return time;
+ }
+@@ -1093,7 +1095,9 @@
+ if( pos2 >= 0 )
+ {
+ bool ok;
+- long time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toLong( &ok );
++ unsigned long time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toULong( &ok );
++ if( !ok && d->id[ pos + 5 ] == '-' ) // try if it's as a negative signed number perhaps
++ time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toLong( &ok );
+ if( ok )
+ return time;
+ }
More information about the arch-commits
mailing list