The KDE/FreeBSD team is pleased to announce KDE SC 4.7.4, which

concludes the 4.7 series.

The official release notes can be found at:
http://kde.org/announcements/announce-4.7.4.php

PR:		162216
PR:		163662

6 files changed, 41 insertions, 9 deletions

diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index 0e23ed964282..2df4c25591af 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeutils-4.7.3.tar.bz2) = a8c802f32b9e918d806a4487c25485f86019e4c473f0de6d3086d8ea8e492839
-SIZE (KDE/kdeutils-4.7.3.tar.bz2) = 3802391
+SHA256 (KDE/kdeutils-4.7.4.tar.bz2) = bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
+SIZE (KDE/kdeutils-4.7.4.tar.bz2) = 3802873
diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist
index 075e9e1e6330..2b26cef5db6e 100644
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect/pkg-plist
@@ -175,7 +175,7 @@ share/doc/HTML/en/ktimer/index.cache.bz2
 share/doc/HTML/en/ktimer/index.docbook
 share/doc/HTML/en/ktimer/main.png
 share/doc/HTML/en/ktimer/running.png
-share/doc/HTML/en/ktimer/two.at.once.png
+share/doc/HTML/en/ktimer/two_at_once.png
 share/doc/HTML/en/kwallet/common
 share/doc/HTML/en/kwallet/edit1.png
 share/doc/HTML/en/kwallet/edit2.png
diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo
index 516796f6b519..d8859df9ff39 100644
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdepimlibs-4.7.3.tar.bz2) = 11bec0a8d404bab11e0dd54d2c4e007812f675b85b3d9471a82abfcfb4925b87
-SIZE (KDE/kdepimlibs-4.7.3.tar.bz2) = 3233484
+SHA256 (KDE/kdepimlibs-4.7.4.tar.bz2) = 37c2a5903b6ed8f5b10ade3696dd43bcc7515b10dd8f75d157d3ed7e019bee66
+SIZE (KDE/kdepimlibs-4.7.4.tar.bz2) = 3236435
diff --git a/deskutils/kdepimlibs4/files/patch-kioslave__imap4__imapcommand.cpp b/deskutils/kdepimlibs4/files/patch-kioslave__imap4__imapcommand.cpp
new file mode 100644
index 000000000000..b1028e089002
--- /dev/null
+++ b/deskutils/kdepimlibs4/files/patch-kioslave__imap4__imapcommand.cpp
@@ -0,0 +1,32 @@
+commit ddc273ca863aacc65742bf6193826809a2d3265e
+Author: Allen Winter <winter@kde.org>
+Date:   Sat Dec 17 12:38:49 2011 -0500
+
+    In clientAppend(), be careful how the arguments for the APPEND command
+    are constructed so as not to break things.
+    
+    Found by Luke Dashjr <luke-jr+git@utopios.org>
+    with help from Andreas. Thanks guys.
+    Please test this.
+    
+    BUG: 289084
+    FIXED-IN: 4.8.0
+
+diff --git a/kioslave/imap4/imapcommand.cpp b/kioslave/imap4/imapcommand.cpp
+index 43daccd..88d95df 100644
+--- ./kioslave/imap4/imapcommand.cpp
++++ ./kioslave/imap4/imapcommand.cpp
+@@ -231,7 +231,12 @@ CommandPtr
+ imapCommand::clientAppend (const QString & box, const QString & flags,
+                            ulong size)
+ {
+-  QString tmp = QString(flags.isEmpty() ? QString("") : QString(('(' + flags + ") ")) + '{' + QString::number(size) + '}'); 
++  QString tmp;
++  if ( !flags.isEmpty() ) {
++    tmp = '(' + flags + ") ";
++  }
++  tmp += '{' + QString::number( size ) + '}';
++
+   return CommandPtr( new imapCommand ("APPEND",
+                           "\"" + KIMAP::encodeImapFolderName (box) + "\" " + tmp));
+ }
diff --git a/deskutils/kdeplasma-addons/distinfo b/deskutils/kdeplasma-addons/distinfo
index 81b2c46102eb..7df6f8b8573a 100644
--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeplasma-addons-4.7.3.tar.bz2) = c1d0cdb41dc5293ef1ee415d99cda2b7f6c51b776d08199f0904c25b30bc9601
-SIZE (KDE/kdeplasma-addons-4.7.3.tar.bz2) = 1974816
+SHA256 (KDE/kdeplasma-addons-4.7.4.tar.bz2) = c55f5304d426a56455e34da7826f51b3ead2234ed31237a6673ae7ebaf141519
+SIZE (KDE/kdeplasma-addons-4.7.4.tar.bz2) = 1975849
diff --git a/deskutils/kruler/distinfo b/deskutils/kruler/distinfo
index cd63cdc1d434..e3991f6d2615 100644
--- a/deskutils/kruler/distinfo
+++ b/deskutils/kruler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kruler-4.7.3.tar.bz2) = fc323ef362249e933c84205d98a19b8e9e9f88e7c8584bc95687b69590a3e203
-SIZE (KDE/kruler-4.7.3.tar.bz2) = 139849
+SHA256 (KDE/kruler-4.7.4.tar.bz2) = 8154d445d1bbf18c83e0a3f5a1bb5af38f011a93a07c42689a5a85297801a871
+SIZE (KDE/kruler-4.7.4.tar.bz2) = 140029