Re: Re: Request for delaying 4.8.4 request

2012-06-06 Thread Eric Hameleers

On Tue, 5 Jun 2012, Alex Fiestas wrote:


Reviewed and pushed to kdelibs KDE/4.8

Hash: 19213a6c34e1b47a100815ccbfee8b5c70c3c12a

Thanks for everything !


Please re-spin the kdelibs-4.8.4 tarball.

Cheers, Eric

--
Eric Hameleers al...@slackware.com
Jabber: al...@jabber.xs4all.nl
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: Request for delaying 4.8.4 request

2012-06-06 Thread Dirk Mueller
On Monday 04 June 2012, Kevin Kofler wrote:

  Not including this patch will mean not having fstab support until 4.9
  (since  we won't have 4.8.5).
 Why aren't we doing .5 releases anymore? Those .5 releases have always been
 welcome when they were done (which went back and forth). I also don't see a
 good reason for skipping them: With a monthly release cycle, why leave 2
 months between the .4 and .0 releases?
 
 I think the .5 releases really need to come back!

Hi Kevin, 

I'm fine with doing a .5 release when there is need for it, for me it is not a 
lot of effort. 

I was not involved in the #kde-release-team discussion that decided this (see 
release-team@ mailing list archive) so I don't really know what the reasons 
were. 

Greetings,
Dirk
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: Re: Request for delaying 4.8.4 request

2012-06-06 Thread Martin Gräßlin

Am 04.06.2012 23:57, schrieb Kevin Kofler:

On Monday 04 June 2012, Alex Fiestas wrote:
Not including this patch will mean not having fstab support until 
4.9

(since  we won't have 4.8.5).


Why aren't we doing .5 releases anymore? Those .5 releases have 
always been
welcome when they were done (which went back and forth). I also don't 
see a
good reason for skipping them: With a monthly release cycle, why 
leave 2

months between the .4 and .0 releases?

I think the .5 releases really need to come back!
What do you expect to be in the .5 release? I as a developer already 
deleted my local KDE/4.8 branch as the release schedule said there won't 
be any 4.8 release any more. I expect that also other developers are 
able to read the schedule and do their planning according to it.


Even if I had the local branch around, I would probably no longer push 
any changes to 4.8. From a bugfixing perspective we are concentrating on 
4.9 and it becomes more and more difficult to test anything on 4.8, 
especially once 4.9 is branched. The time spend backporting to 4.8 is 
quite high compared to the benefits of the bugfix to go into that 
release.


Cheers
Martin
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: kdelibs and Qt version dependency

2012-06-06 Thread Dirk Mueller
On Tuesday 05 June 2012, Albert Astals Cid wrote:

 On May 19, Dawit Alemayehu commited a change that uses
 QSslConfiguration::testSslOption that is only available in Qt 4.8
 
 This means that both kdelibs 4.8.4 and kdelibs 4.9 now depend in Qt 4.8
 instead Qt 4.7

Hi Albert, 

thanks for noticing. I confirmed the issue and I can confirm that 4.8.3 
compiled fine with Qt 4.7. 

 
 a) Do you think it makes sense to change our Qt required version from
 Qt 4.7 in kdelibs 4.8.3
 to
 Qt 4.8 in kdelibs 4.8.4
 ?

I think for kdelibs 4.8.4 we should make the dependency on Qt 4.8 optional. 
can we ifdef the change for Qt 4.8? is there a way to fallback ?


 
 b) Do you think kdelibs 4.9 should depend in Qt 4.8 or not?

I'd be in favor of that change. 

Greetings,
Dirk
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Missing french documentation for kstars in 4.8.3/4.8.4

2012-06-06 Thread Philip Muskovac
Hi,

we just got pointed to the fact that in the 4.8.3 release the french kstars 
documentation was removed [1]. That was done in svn rev 1292134 as it doesn't 
seem to build anymore. 
While we appreciate that you're trying to give us packagers working 
translations, please don't just drop things in a point release. If things 
break due to a change please at least ship the last working version instead as 
this now counts as a regression from 4.8.2. I've filed a bug [2] about this and 
would appreciate it if this could be fixed in 4.6.4 if still possible.

Thanks,
Philip

[1] https://bugs.launchpad.net/kdeedu/+bug/1008729
[2] https://bugs.kde.org/show_bug.cgi?id=301180
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: Re: Re: Request for delaying 4.8.4 request

2012-06-06 Thread Andreas K. Huettel
 What do you expect to be in the .5 release? I as a developer already
 deleted my local KDE/4.8 branch as the release schedule said there won't
 be any 4.8 release any more. I expect that also other developers are
 able to read the schedule and do their planning according to it.
 
 Even if I had the local branch around, I would probably no longer push
 any changes to 4.8. From a bugfixing perspective we are concentrating on
 4.9 and it becomes more and more difficult to test anything on 4.8,
 especially once 4.9 is branched. The time spend backporting to 4.8 is
 quite high compared to the benefits of the bugfix to go into that
 release.

Certainly there will be some fixes that are developed and/or applied for 
example by distributions or with help from them. After all some people will 
actually run 4.8 now and not immediately switch to 4.9. :) Being able to 
collect them somewhere with review would be a huge bonus, and could in the end 
lead to a 4.8.5 release. Making KDE even more stable and user-friendly!

-- 
Andreas K. Huettel
Gentoo Linux developer
kde, sci, arm, tex, printing


signature.asc
Description: This is a digitally signed message part.
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: Request for delaying 4.8.4 request

2012-06-06 Thread laurent Montel
Hi,
I don't know when 4.8.4 will release.
But if it's not too late (as not sure that 4.8.5 will create) perhaps you can 
retag kdepim
I fixed some bugs:
- Bug 301231
- Bug 285153
- Bug 301152 (important fix crash)
and resources/imap: Change the default ManageSieve port from 2000 to 4190, 
per IANA in kdepim-runtime (not sure if it's in tag)
David Jarvie fixed  Bug 300083: Warn user clearly when Akonadi fails to run

So it will good to retag kdepim/kdepim-runtime. Otherwise we will wait 
potential 4.8.5 or 4.9

Thanks
Regards

Le mercredi 6 juin 2012 00:41:20 Eric Hameleers a écrit :
 On Tue, 5 Jun 2012, Alex Fiestas wrote:
  Reviewed and pushed to kdelibs KDE/4.8
  
  Hash: 19213a6c34e1b47a100815ccbfee8b5c70c3c12a
  
  Thanks for everything !
 
 Please re-spin the kdelibs-4.8.4 tarball.
 
 Cheers, Eric
 
 --
 Eric Hameleers al...@slackware.com
 Jabber: al...@jabber.xs4all.nl
 ___
 Kde-packager mailing list
 kde-packa...@kde.org
 https://mail.kde.org/mailman/listinfo/kde-packager
-- 
Laurent Montel | laurent.mon...@kdab.com | KDE/Qt Senior Software Engineer
KDAB (France) S.A.S., a KDAB Group company
Tel. France +33 (0)4 90 84 08 53, Sweden (HQ) +46-563-540090
KDAB - Qt Experts - Platform-independent software solutions
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


System Activity (ksysguard) bug fix

2012-06-06 Thread John Tapsell
Hi,

  Could you please include the System Activity fix for 290687 in the release?

  I have committed it to the KDE/4.8 branch.

Thanks,

John
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: Request for delaying 4.8.4 request

2012-06-06 Thread Anne-Marie Mahfouf

On 06/06/2012 10:08 AM, Dirk Mueller wrote:

On Monday 04 June 2012, Kevin Kofler wrote:


Not including this patch will mean not having fstab support until 4.9
(since  we won't have 4.8.5).

Why aren't we doing .5 releases anymore? Those .5 releases have always been
welcome when they were done (which went back and forth). I also don't see a
good reason for skipping them: With a monthly release cycle, why leave 2
months between the .4 and .0 releases?

I think the .5 releases really need to come back!

Hi Kevin,

I'm fine with doing a .5 release when there is need for it, for me it is not a
lot of effort.

I was not involved in the #kde-release-team discussion that decided this (see
release-team@ mailing list archive) so I don't really know what the reasons
were.

Greetings,
Dirk
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


John Tapsell also committed a patch to kde-workspace.

For kdelibs we are waiting for Dawit to fix the Qt 4.8 problem and there 
is also a regression https://bugs.kde.org/show_bug.cgi?id=301033 which 
could get in if the devel is quick.


Quite a lot of recent bug fixes...

Anne-Marie
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: Request for delaying 4.8.4 request

2012-06-06 Thread Anne-Marie Mahfouf

On 06/06/2012 03:37 PM, Anne-Marie Mahfouf wrote:

On 06/06/2012 10:08 AM, Dirk Mueller wrote:

On Monday 04 June 2012, Kevin Kofler wrote:


Not including this patch will mean not having fstab support until 4.9
(since  we won't have 4.8.5).
Why aren't we doing .5 releases anymore? Those .5 releases have 
always been
welcome when they were done (which went back and forth). I also 
don't see a
good reason for skipping them: With a monthly release cycle, why 
leave 2

months between the .4 and .0 releases?

I think the .5 releases really need to come back!

Hi Kevin,

I'm fine with doing a .5 release when there is need for it, for me it 
is not a

lot of effort.

I was not involved in the #kde-release-team discussion that decided 
this (see
release-team@ mailing list archive) so I don't really know what the 
reasons

were.

Greetings,
Dirk
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


John Tapsell also committed a patch to kde-workspace.

For kdelibs we are waiting for Dawit to fix the Qt 4.8 problem and 
there is also a regression https://bugs.kde.org/show_bug.cgi?id=301033 
which could get in if the devel is quick.


Quite a lot of recent bug fixes...

Anne-Marie

OK sebas will patch kdelibs with Dawit's patch that I completed and 
tested and Lukas Tinkl got his fix in kdelibs just a few minutes ago

http://commits.kde.org/kdelibs/7f8c750541790de5a380409466cf07cfe19c3651
which caused a regression.

So when Sebas has sent Dawit's patch it'll be ready to go.

Anne-Marie


___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


[kdelibs/KDE/4.8] kio/kio: Fix build for Qt 4.8

2012-06-06 Thread Sebastian Kügler
Git commit c1f6c3980d92c2109f3f2ab3bd1fada31a0e4ecd by Sebastian Kügler.
Committed on 06/06/2012 at 16:02.
Pushed by sebas into branch 'KDE/4.8'.

Fix build for Qt 4.8

Patch by Annma

CCMAIL:release-team@kde.org

M  +16   -4kio/kio/tcpslavebase.cpp

http://commits.kde.org/kdelibs/c1f6c3980d92c2109f3f2ab3bd1fada31a0e4ecd

diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp
index 480dd04..3101bff 100644
--- a/kio/kio/tcpslavebase.cpp
+++ b/kio/kio/tcpslavebase.cpp
@@ -363,11 +363,14 @@ int TCPSlaveBase::connectToHost(const QString host, 
quint16 port, QString* erro
   the SSL handshake, then that combination will be cached using KIO's 
internal
   meta-data mechanism in order to speed up future connections to the same 
host.
 */
+
 QSslConfiguration sslConfig = d-socket.sslConfiguration();
+#if QT_VERSION = 0x040800
 const bool isSslCompressionDisabled = 
sslConfig.testSslOption(QSsl::SslOptionDisableCompression);
 const bool shouldSslCompressBeDisabled = 
config()-readEntry(LastUsedSslDisableCompressionFlag, 
isSslCompressionDisabled);
 sslConfig.setSslOption(QSsl::SslOptionDisableCompression, 
shouldSslCompressBeDisabled);
-
+#endif
+
 const int lastSslVerson = config()-readEntry(LastUsedSslVersion, 
static_castint(KTcpSocket::SecureProtocols));
 KTcpSocket::SslVersion trySslVersion = 
static_castKTcpSocket::SslVersion(lastSslVerson);
 KTcpSocket::SslVersions alreadyTriedSslVersions = trySslVersion;
@@ -409,29 +412,37 @@ int TCPSlaveBase::connectToHost(const QString host, 
quint16 port, QString* erro
 if (d-autoSSL) {
 SslResult res = d-startTLSInternal(trySslVersion, sslConfig, 
3 /*30 secs timeout*/);
 if ((res  ResultFailed)  (res  ResultFailedEarly)) {
+#if QT_VERSION = 0x040800
 if 
(!sslConfig.testSslOption(QSsl::SslOptionDisableCompression)) {
 sslConfig.setSslOption(QSsl::SslOptionDisableCompression, 
true);
 continue;
 }
+#endif
 
 if (!(alreadyTriedSslVersions  KTcpSocket::SecureProtocols)) {
 trySslVersion = KTcpSocket::SecureProtocols;
 alreadyTriedSslVersions |= trySslVersion;
+#if QT_VERSION = 0x040800
 sslConfig.setSslOption(QSsl::SslOptionDisableCompression, 
false);
+#endif
 continue;
 }
 
 if (!(alreadyTriedSslVersions  KTcpSocket::TlsV1)) {
 trySslVersion = KTcpSocket::TlsV1;
 alreadyTriedSslVersions |= trySslVersion;
+#if QT_VERSION = 0x040800
 sslConfig.setSslOption(QSsl::SslOptionDisableCompression, 
false);
+#endif
 continue;
 }
 
 if (!(alreadyTriedSslVersions  KTcpSocket::SslV3)) {
 trySslVersion = KTcpSocket::SslV3;
 alreadyTriedSslVersions |= trySslVersion;
+#if QT_VERSION = 0x040800
 sslConfig.setSslOption(QSsl::SslOptionDisableCompression, 
false);
+#endif
 continue;
 }
 }
@@ -449,11 +460,12 @@ int TCPSlaveBase::connectToHost(const QString host, 
quint16 port, QString* erro
 
setMetaData(QLatin1String({internal~currenthost}LastUsedSslVersion),
 QString::number(trySslVersion));
 }
-
+#if QT_VERSION = 0x040800
 if (sslConfig.testSslOption(QSsl::SslOptionDisableCompression)  
!shouldSslCompressBeDisabled) {
 
setMetaData(QLatin1String({internal~currenthost}LastUsedSslDisableCompressionFlag),
 QString::number(true));
 }
+#endif
 return 0;
 }
 Q_ASSERT(false);
@@ -568,10 +580,10 @@ TCPSlaveBase::SslResult 
TCPSlaveBase::TcpSlaveBasePrivate::startTLSInternal (KTc
 //setMetaData(ssl_session_id, d-kssl-session()-toString());
 //### we don't support session reuse for now...
 usingSSL = true;
-
+#if QT_VERSION = 0x040800
 kDebug(7027)  Trying SSL handshake with protocol:  version
   , SSL compression ON:  
sslConfig.testSslOption(QSsl::SslOptionDisableCompression);
-
+#endif
 // Set the SSL version to use...
 socket.setAdvertisedSslVersion(version);
 
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: Request for delaying 4.8.4 request

2012-06-06 Thread Albert Astals Cid
El Dimecres, 6 de juny de 2012, a les 10:08:11, Dirk Mueller va escriure:
 On Monday 04 June 2012, Kevin Kofler wrote:
   Not including this patch will mean not having fstab support until 4.9
   (since  we won't have 4.8.5).
  
  Why aren't we doing .5 releases anymore? Those .5 releases have always
  been
  welcome when they were done (which went back and forth). I also don't see
  a
  good reason for skipping them: With a monthly release cycle, why leave 2
  months between the .4 and .0 releases?
  
  I think the .5 releases really need to come back!
 
 Hi Kevin,
 
 I'm fine with doing a .5 release when there is need for it, for me it is not
 a lot of effort.
 
 I was not involved in the #kde-release-team discussion that decided this
 (see release-team@ mailing list archive) so I don't really know what the
 reasons were.

AFAIR The reasons where:
 * It wasn't on the schedule
 * We prefer developers to shift to bugfixing in 4.9

Albert

 
 Greetings,
 Dirk
 ___
 release-team mailing list
 release-team@kde.org
 https://mail.kde.org/mailman/listinfo/release-team
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: Request for delaying 4.8.4 request

2012-06-06 Thread Dirk Mueller
On Wednesday 06 June 2012, Anne-Marie Mahfouf wrote:

 http://commits.kde.org/kdelibs/7f8c750541790de5a380409466cf07cfe19c3651
 which caused a regression.
 
 So when Sebas has sent Dawit's patch it'll be ready to go.

Hi Anne-Marie, 

thanks a lot!

Greetings,
Dirk
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: Request for delaying 4.8.4 request

2012-06-06 Thread laurent Montel
Le mercredi 6 juin 2012 20:52:05 Dirk Mueller a écrit :
 On Wednesday 06 June 2012, laurent Montel wrote:
  But if it's not too late (as not sure that 4.8.5 will create) perhaps you
  can retag kdepim
  I fixed some bugs:
  - Bug 301231
  - Bug 285153
  - Bug 301152 (important fix crash)
 
 Hi Laurent,
 
 I'll include these fixes in 4.8.4, as kmail love is always appreciated.

Thanks a lot :)
Regards

  and resources/imap: Change the default ManageSieve port from 2000 to
  4190,
  per IANA in kdepim-runtime (not sure if it's in tag)
 
 Thiis was already in.
 
 
 Greetings,
 Dirk
 ___
 Kde-packager mailing list
 kde-packa...@kde.org
 https://mail.kde.org/mailman/listinfo/kde-packager
-- 
Laurent Montel | laurent.mon...@kdab.com | KDE/Qt Senior Software Engineer
KDAB (France) S.A.S., a KDAB Group company
Tel. France +33 (0)4 90 84 08 53, Sweden (HQ) +46-563-540090
KDAB - Qt Experts - Platform-independent software solutions
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: 4.8.80 is out

2012-06-06 Thread Dirk Mueller
On Monday 04 June 2012, Albert Astals Cid wrote:

 Good job everyone!

Hi Albert, 

thanks. it seems you accidentally tagged the KDE/4.8 branch in kdelibs to 
v4.8.80 ?

git describe
v4.8.80-19-gc1f6c39


Could you please double check that you tagged the KDE/4.9 branch on all 
related modules with the release tag?

Thanks,
Dirk
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: 4.8.80 is out

2012-06-06 Thread Nicolás Alvarez
2012/6/6, Dirk Mueller muel...@kde.org:
 On Monday 04 June 2012, Albert Astals Cid wrote:

 Good job everyone!

 Hi Albert,

 thanks. it seems you accidentally tagged the KDE/4.8 branch in kdelibs to
 v4.8.80 ?

 git describe
 v4.8.80-19-gc1f6c39


 Could you please double check that you tagged the KDE/4.9 branch on all
 related modules with the release tag?

There is no 4.9 branch in kdelibs. At least not yet.

-- 
Nicolás
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: 4.8.80 is out

2012-06-06 Thread Albert Astals Cid
El Dimecres, 6 de juny de 2012, a les 22:12:46, Dirk Mueller va escriure:
 On Monday 04 June 2012, Albert Astals Cid wrote:
  Good job everyone!
 
 Hi Albert,
 
 thanks. it seems you accidentally tagged the KDE/4.8 branch in kdelibs to
 v4.8.80 ?

No accident, we don't have a KDE/4.9 nor a master branch for kdelibs, so yes, 
i tagged it from KDE/4.8

 git describe
 v4.8.80-19-gc1f6c39
 
 
 Could you please double check that you tagged the KDE/4.9 branch on all
 related modules with the release tag?

All the rest modules were tagged in master.

Cheers,
  Albert

 
 Thanks,
 Dirk
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


[kdelibs/KDE/4.8.x] kio/kio: Fix build for Qt 4.8

2012-06-06 Thread Dirk Mueller
Git commit 3425961d216b629214fd1d32e905219f4de2ef71 by Dirk Mueller, on behalf 
of Sebastian Kügler.
Committed on 06/06/2012 at 16:02.
Pushed by mueller into branch 'KDE/4.8.x'.

Fix build for Qt 4.8

Patch by Annma

CCMAIL:release-team@kde.org

M  +16   -4kio/kio/tcpslavebase.cpp

http://commits.kde.org/kdelibs/3425961d216b629214fd1d32e905219f4de2ef71

diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp
index 480dd04..3101bff 100644
--- a/kio/kio/tcpslavebase.cpp
+++ b/kio/kio/tcpslavebase.cpp
@@ -363,11 +363,14 @@ int TCPSlaveBase::connectToHost(const QString host, 
quint16 port, QString* erro
   the SSL handshake, then that combination will be cached using KIO's 
internal
   meta-data mechanism in order to speed up future connections to the same 
host.
 */
+
 QSslConfiguration sslConfig = d-socket.sslConfiguration();
+#if QT_VERSION = 0x040800
 const bool isSslCompressionDisabled = 
sslConfig.testSslOption(QSsl::SslOptionDisableCompression);
 const bool shouldSslCompressBeDisabled = 
config()-readEntry(LastUsedSslDisableCompressionFlag, 
isSslCompressionDisabled);
 sslConfig.setSslOption(QSsl::SslOptionDisableCompression, 
shouldSslCompressBeDisabled);
-
+#endif
+
 const int lastSslVerson = config()-readEntry(LastUsedSslVersion, 
static_castint(KTcpSocket::SecureProtocols));
 KTcpSocket::SslVersion trySslVersion = 
static_castKTcpSocket::SslVersion(lastSslVerson);
 KTcpSocket::SslVersions alreadyTriedSslVersions = trySslVersion;
@@ -409,29 +412,37 @@ int TCPSlaveBase::connectToHost(const QString host, 
quint16 port, QString* erro
 if (d-autoSSL) {
 SslResult res = d-startTLSInternal(trySslVersion, sslConfig, 
3 /*30 secs timeout*/);
 if ((res  ResultFailed)  (res  ResultFailedEarly)) {
+#if QT_VERSION = 0x040800
 if 
(!sslConfig.testSslOption(QSsl::SslOptionDisableCompression)) {
 sslConfig.setSslOption(QSsl::SslOptionDisableCompression, 
true);
 continue;
 }
+#endif
 
 if (!(alreadyTriedSslVersions  KTcpSocket::SecureProtocols)) {
 trySslVersion = KTcpSocket::SecureProtocols;
 alreadyTriedSslVersions |= trySslVersion;
+#if QT_VERSION = 0x040800
 sslConfig.setSslOption(QSsl::SslOptionDisableCompression, 
false);
+#endif
 continue;
 }
 
 if (!(alreadyTriedSslVersions  KTcpSocket::TlsV1)) {
 trySslVersion = KTcpSocket::TlsV1;
 alreadyTriedSslVersions |= trySslVersion;
+#if QT_VERSION = 0x040800
 sslConfig.setSslOption(QSsl::SslOptionDisableCompression, 
false);
+#endif
 continue;
 }
 
 if (!(alreadyTriedSslVersions  KTcpSocket::SslV3)) {
 trySslVersion = KTcpSocket::SslV3;
 alreadyTriedSslVersions |= trySslVersion;
+#if QT_VERSION = 0x040800
 sslConfig.setSslOption(QSsl::SslOptionDisableCompression, 
false);
+#endif
 continue;
 }
 }
@@ -449,11 +460,12 @@ int TCPSlaveBase::connectToHost(const QString host, 
quint16 port, QString* erro
 
setMetaData(QLatin1String({internal~currenthost}LastUsedSslVersion),
 QString::number(trySslVersion));
 }
-
+#if QT_VERSION = 0x040800
 if (sslConfig.testSslOption(QSsl::SslOptionDisableCompression)  
!shouldSslCompressBeDisabled) {
 
setMetaData(QLatin1String({internal~currenthost}LastUsedSslDisableCompressionFlag),
 QString::number(true));
 }
+#endif
 return 0;
 }
 Q_ASSERT(false);
@@ -568,10 +580,10 @@ TCPSlaveBase::SslResult 
TCPSlaveBase::TcpSlaveBasePrivate::startTLSInternal (KTc
 //setMetaData(ssl_session_id, d-kssl-session()-toString());
 //### we don't support session reuse for now...
 usingSSL = true;
-
+#if QT_VERSION = 0x040800
 kDebug(7027)  Trying SSL handshake with protocol:  version
   , SSL compression ON:  
sslConfig.testSslOption(QSsl::SslOptionDisableCompression);
-
+#endif
 // Set the SSL version to use...
 socket.setAdvertisedSslVersion(version);
 
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: 4.8.80 is out

2012-06-06 Thread Dirk Mueller
On Wednesday 06 June 2012, Nicolás Alvarez wrote:

  Could you please double check that you tagged the KDE/4.9 branch on all
  related modules with the release tag?
 There is no 4.9 branch in kdelibs. At least not yet.

Ah, d'oh. okay, that explains it. 

Well, now we have the mess completed. IMHO we should create a KDE/4.9 and move 
Sebastian Truegs nepomuk branch merge there. then we can also bump the Qt 
requirements. 

For now I created a KDE/4.8.x branch without the merge and will create v4.8.4 
from it. We can also use it for cherry-picking KDE 4.8.5 fixes if needed. 

Thanks,
Dirk

___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


final KDE 4.8.4 tarballs

2012-06-06 Thread Dirk Mueller

Hi, 

in order to respin kdelibs tarball I had to create a KDE/4.8.x branch to 
cherry-pick the right patches,took some time. 

Now we're complete: 

fc50a6ff95843925ec4d6e12ebce7f3c  kdemultimedia-4.8.4.tar.xz

- doc/ fixes.

af1ff1da6f1fbd5eab18fdd57282f5c1  kdepim-4.8.4.tar.xz

- kmail crash fix

fc1911379365eaaf5d6aa0759259cce8  kde-workspace-4.8.4.tar.xz

- ksysguard cpu accounting fix

83e0de7d22d07503da9cf2e2ff7cea43  kdelibs-4.8.4.tar.xz

- Qt 4.7.x compile fix
- regression fix in upower support of solid (2404110)
- fstab handling fixes (63ccc43)


these are all changes compared to the initial mail. Planned announcement is in 
24 hours, unless there is feedback about new issues. 

Thanks,
Dirk
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: 4.8.80 is out

2012-06-06 Thread Albert Astals Cid
El Dimecres, 6 de juny de 2012, a les 23:09:05, Dirk Mueller va escriure:
 On Wednesday 06 June 2012, Nicolás Alvarez wrote:
   Could you please double check that you tagged the KDE/4.9 branch on all
   related modules with the release tag?
  
  There is no 4.9 branch in kdelibs. At least not yet.
 
 Ah, d'oh. okay, that explains it.
 
 Well, now we have the mess completed. IMHO we should create a KDE/4.9 and
 move Sebastian Truegs nepomuk branch merge there. then we can also bump the
 Qt requirements.

Why should we move it there? He commited it to KDE/4.8 so he wants it there, 
right?

I'm not still convinced we have agreed to bump the Qt requirements. I'd like 
to hear David's opinion on it.

Cheers,
  Albert

 For now I created a KDE/4.8.x branch without the merge and will create
 v4.8.4 from it. We can also use it for cherry-picking KDE 4.8.5 fixes if
 needed.
 
 Thanks,
 Dirk
 
 ___
 release-team mailing list
 release-team@kde.org
 https://mail.kde.org/mailman/listinfo/release-team
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: 4.8.80 is out

2012-06-06 Thread Nicolás Alvarez
2012/6/6, Albert Astals Cid aa...@kde.org:
 El Dimecres, 6 de juny de 2012, a les 23:09:05, Dirk Mueller va escriure:
 On Wednesday 06 June 2012, Nicolás Alvarez wrote:
   Could you please double check that you tagged the KDE/4.9 branch on
   all
   related modules with the release tag?
 
  There is no 4.9 branch in kdelibs. At least not yet.

 Ah, d'oh. okay, that explains it.

 Well, now we have the mess completed. IMHO we should create a KDE/4.9 and
 move Sebastian Truegs nepomuk branch merge there. then we can also bump
 the
 Qt requirements.

 Why should we move it there? He commited it to KDE/4.8 so he wants it there,
 right?

Where else could he have committed?! There is no master, there is no
4.9. If I wanted something to be in 4.9 but not in 4.8.4, what option
do I have?

-- 
Nicolás
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team


Re: 4.8.80 is out

2012-06-06 Thread Albert Astals Cid
El Dimecres, 6 de juny de 2012, a les 19:37:48, Nicolás Alvarez va escriure:
 2012/6/6, Albert Astals Cid aa...@kde.org:
  El Dimecres, 6 de juny de 2012, a les 23:09:05, Dirk Mueller va escriure:
  On Wednesday 06 June 2012, Nicolás Alvarez wrote:
Could you please double check that you tagged the KDE/4.9 branch on
all
related modules with the release tag?
   
   There is no 4.9 branch in kdelibs. At least not yet.
  
  Ah, d'oh. okay, that explains it.
  
  Well, now we have the mess completed. IMHO we should create a KDE/4.9 and
  move Sebastian Truegs nepomuk branch merge there. then we can also bump
  the
  Qt requirements.
  
  Why should we move it there? He commited it to KDE/4.8 so he wants it
  there, right?
 
 Where else could he have committed?! There is no master, there is no
 4.9. If I wanted something to be in 4.9 but not in 4.8.4, what option
 do I have?

None.

kdelibs is feature frozen, you can't want to have anything in 4.9 but not in 
4.8.4 by the kdelibs state definition, kdelibs will be renamed to 4.9 just for 
naming sake but it is still kdelibs 4.8 and it is still kdelibs 4.7, *only* 
bugfixes should go there.

And yes, you might disagree, but it is what we agreed back then when the 
freeze was put in place.

Albert
___
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team