Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1017a73bc3c94a23320c7b51ac6e58d266102acd
commit 1017a73bc3c94a23320c7b51ac6e58d266102acd
Author: crazy <[EMAIL PROTECTED]>
Date: Fri Feb 22 03:02:10 2008 +0100
kdelibs-3.5.9-1-i686
* Version bump
diff --git a/source/kde/kdelibs/FrugalBuild b/source/kde/kdelibs/FrugalBuild
index 8003e18..a9e2b6e 100644
--- a/source/kde/kdelibs/FrugalBuild
+++ b/source/kde/kdelibs/FrugalBuild
@@ -3,12 +3,12 @@
# Contributor: Kapolnasi Tamas <[EMAIL PROTECTED]>
pkgname=kdelibs
-pkgver=3.5.8
-pkgrel=2
+pkgver=3.5.9
+pkgrel=1
pkgdesc="KDE Core Libraries."
-depends=('arts>=1.5.8' 'hicolor-icon-theme' 'libxslt' 'pcre' 'openmotif'
'openssl' 'libart_lgpl' 'gamin' 'bzip2' \
+depends=('arts>=1.5.9' 'hicolor-icon-theme' 'libxslt' 'pcre' 'openmotif'
'openssl' 'libart_lgpl' 'gamin' 'bzip2' \
'xfsprogs-acl' 'openexr>=1.4.0a-2' 'libidn' 'aspell' 'jasper>=1.900.1-2'
'avahi-qt3>=0.6.14-2' \
- 'avahi-compat>=0.6.14-2' 'heimdal>=1.0' 'rgb' 'qt>=3.3.8-3' 'libdrm'
'libxrender' 'libxcb')
+ 'avahi-compat>=0.6.14-2' 'heimdal>=1.0' 'rgb' 'qt>=3.3.8-8' 'libdrm'
'libxrender' 'libxcb')
makedepends=('cups>=1.2.3' 'openldap' 'sane-backends' 'hspell' 'flex' 'opensp' \
'openjade' 'doxygen' 'qt-docs>=3.3.8-2' 'graphviz')
rodepends=('dejavu-ttf' 'corefonts' 'aspell6-en')
@@ -17,7 +17,6 @@ archs=('i686' 'x86_64')
_F_kde_reconf=1
Finclude kde
source=([EMAIL PROTECTED] kde.sh \
- from_svn-fix.patch \
kdelibs-kill-broken-AM_LDFLAGS_use_foo_LDFLAGS_to_fix_automake1.10.patch \
fix-warning.patch \
x-mplayer2.desktop \
@@ -63,9 +62,8 @@ build()
touch $Fdestdir/usr/env/.hold || Fdie
}
-sha1sums=('b524a5d9969e7319bb5ffb926a39fd6afb39b2ed' \
+sha1sums=('b8197d94075a54f90f08a9ef7bed95ccf53e12ad' \
'b67afb54be3b2ac24ba9a491cb38a871a27a6316' \
- 'f37193c90fbf72e33334d995421202b375245c71' \
'916c2a2c5e28f4d72720d37348f9c813114adabf' \
'538d8f2076e360f1d733e79b7c35b5326edb41af' \
'e45f5f357859f243e627cfaa7bd9682ac49c2eab' \
diff --git a/source/kde/kdelibs/from_svn-fix.patch
b/source/kde/kdelibs/from_svn-fix.patch
deleted file mode 100644
index c2f607a..0000000
--- a/source/kde/kdelibs/from_svn-fix.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-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: [EMAIL PROTECTED]
-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
-
-
---- kdelibs/kdecore/kstartupinfo.cpp #724471:724472
-+++ 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;
- }
---- kdelibs/kioslave/http/http.cc 2007/09/26 17:08:43 717341
-+++ kdelibs/kioslave/http/http.cc 2007/10/17 04:11:51 726097
-@@ -3409,10 +3409,6 @@
-
- } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) &&
(gets(buffer, sizeof(buffer)-1)));
-
-- // Send the current response before processing starts or it
-- // might never get sent...
-- forwardHttpResponseHeader();
--
- // Now process the HTTP/1.1 upgrade
- QStringList::Iterator opt = upgradeOffers.begin();
- for( ; opt != upgradeOffers.end(); ++opt) {
-@@ -3818,6 +3814,10 @@
- mimeType( m_strMimeType );
- }
-
-+ // Do not move send response header before any redirection as it seems
-+ // to screw up some sites. See BR# 150904.
-+ forwardHttpResponseHeader();
-+
- if (m_request.method == HTTP_HEAD)
- return true;
-
-@@ -3830,10 +3830,10 @@
- // Check...
- createCacheEntry(m_strMimeType, expireDate); // Create a cache entry
- if (!m_request.fcache)
-- {
-- m_request.bCachedWrite = false; // Error creating cache entry.
-- kdDebug(7113) << "(" << m_pid << ") Error creating cache entry
for " << m_request.url.url()<<"!\n";
-- }
-+ {
-+ m_request.bCachedWrite = false; // Error creating cache entry.
-+ kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for
" << m_request.url.url()<<"!\n";
-+ }
- m_request.expireDate = expireDate;
- m_maxCacheSize = config()->readNumEntry("MaxCacheSize",
DEFAULT_MAX_CACHE_SIZE) / 2;
- }
---- kdelibs/kdeui/kactionclasses.cpp 2007/08/30 19:30:39 706570
-+++ kdelibs/kdeui/kactionclasses.cpp 2007/10/20 20:49:01 727528
-@@ -667,8 +667,8 @@
- KToolBar* bar = static_cast<KToolBar*>( widget );
- int id_ = KAction::getToolButtonID();
- bar->insertCombo( comboItems(), id_, isEditable(),
-- SIGNAL( activated( int ) ), this,
-- SLOT( slotActivated( int ) ), isEnabled(),
-+ SIGNAL( activated( const QString & ) ), this,
-+ SLOT( slotActivated( const QString & ) ), isEnabled(),
- toolTip(), -1, index );
-
- QComboBox *cb = bar->getCombo( id_ );
-
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
