kdepim-runtime patch, adjusted md5

This commit is contained in:
abveritas 2011-12-03 19:01:11 +00:00
parent 6df294953e
commit 4cceb41fa3
3 changed files with 41 additions and 8 deletions

View File

@ -8,9 +8,13 @@
565ebff0d1e2316097897149eeb4d255 kate-4.7.4.tar.bz2
39f6eaf063e31aef694df30ce998396e kbruch-4.7.4.tar.bz2
9a66ae51f42f681344664efb87645e38 kcolorchooser-4.7.4.tar.bz2
d44310cad99a9afb757ff13f24eeae32 kde-baseapps-4.7.4.tar.bz2
8e6af5f464ae06e3b7cbfd73aa9f7971 kde-runtime-4.7.4.tar.bz2
e3606013a1406ba87293aa5948a6c123 kde-wallpapers-4.7.4.tar.bz2
42492b9669b1bb8d549b59223b8732cb kde-workspace-4.7.4.tar.bz2
8cad28a2e76f020f7aaca2709447f5f9 kdeaccessibility-4.7.4.tar.bz2
890660c26e177187106144d52741437f kdeadmin-4.7.4.tar.bz2
5a287460b09252853276ad6644753326 kdeartwork-4.7.4.tar.bz2
d44310cad99a9afb757ff13f24eeae32 kde-baseapps-4.7.4.tar.bz2
0446dcecc7723a3df0324d394327b984 kdegames-4.7.4.tar.bz2
5489ad5a410636b994bbd7660814f796 kdegraphics-strigi-analyzer-4.7.4.tar.bz2
cf1fb62fa3f9668406a1a27c3cc3b8d2 kdegraphics-thumbnailers-4.7.4.tar.bz2
@ -18,15 +22,13 @@ cf1fb62fa3f9668406a1a27c3cc3b8d2 kdegraphics-thumbnailers-4.7.4.tar.bz2
64dc14f2b964b9e5b412090b046a0268 kdemultimedia-4.7.4.tar.bz2
e180222d932c64574ba5b8ef31e6bb86 kdenetwork-4.7.4.tar.bz2
fd197859ad0f3c55a175133c2a7b6c47 kdepim-4.7.4.tar.bz2
ccc9d9ec4173e5627623d93207fdf318 kdepimlibs-4.7.4.tar.bz2
fff04e1be1ffb8047fc8c5a395b79efb kdepim-runtime-4.7.4.tar.bz2
ccc9d9ec4173e5627623d93207fdf318 kdepimlibs-4.7.4.tar.bz2
57b6c3ee0bed9c0c2190308a4e690e39 kdeplasma-addons-4.7.4.tar.bz2
8e6af5f464ae06e3b7cbfd73aa9f7971 kde-runtime-4.7.4.tar.bz2
13e9015de83969b478e1b21ac6a901b2 kdesdk-4.7.4.tar.bz2
e596142c0d8c8622aa2577c3990b2293 kdetoys-4.7.4.tar.bz2
e3606013a1406ba87293aa5948a6c123 kde-wallpapers-4.7.4.tar.bz2
7df8a48c48851cb0438acbbf727be396 kdeutils-4.7.4.tar.bz2
6608ace1b8b35ec12e0a2d3644d66e71 kdewebdev-4.7.4.tar.bz2
42492b9669b1bb8d549b59223b8732cb kde-workspace-4.7.4.tar.bz2
8d2a5b123b6f07e60bce0064de6b1e1d kgamma-4.7.4.tar.bz2
4a468d620e9e4ed8bb1356bed6765842 kgeography-4.7.4.tar.bz2
5988daa03e87648ff200ff4fccdeedf7 khangman-4.7.4.tar.bz2

View File

@ -24,8 +24,10 @@ depends=("kdepimlibs>=${_kdever}" "kde-runtime>=${_kdever}" "kdelibs>=${_kdever}
makedepends=('pkgconfig' 'cmake' 'automoc4' 'libdmtx' 'prison' 'qrencode')
groups=("kde" "kdepim" "kde-uninstall" "kde-minimal")
source=($_mirror/${pkgbase}-$_kdever.tar.bz2)
md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`)
source=($_mirror/${pkgbase}-$_kdever.tar.bz2
kmail_bcc.diff)
md5sums=(`grep ${pkgbase}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
'06a124e94713704411ddd20fcae3ad21')
#
# build and install
@ -34,9 +36,10 @@ build()
{
msg "starting build ..."
cd ${srcdir}
patch -p0 -i ${srcdir}/kmail_bcc.diff
mkdir -p build
cd build
cmake ../${pkgbase}-${pkgver} \
-DCMAKE_BUILD_TYPE=${_build_type} \
-DCMAKE_INSTALL_PREFIX=${_installprefix} \

View File

@ -0,0 +1,28 @@
commit 468b955ec785d8dca94ae00aa982d6d1b0a86410
Author: Torgny Nyblom <nyblom@kde.org>
Date: Fri Dec 2 09:43:38 2011 +0100
Make sure that the Bcc header is removed
When sending a mail make sure that the Bcc header is removed before
sending the mail.
CCBUG: 263587
REVIEW: 103308
(cherry picked from commit 0875ca055322fd94962ed473be0a41854e17373a)
diff --git agents/maildispatcher/sendjob.cpp agents/maildispatcher/sendjob.cpp
index 52b0e27..ed02267 100644
--- kdepim-runtime-4.7.4/agents/maildispatcher/sendjob.cpp
+++ kdepim-runtime-4.7.4/agents/maildispatcher/sendjob.cpp
@@ -175,6 +175,10 @@ void SendJob::Private::doTraditionalTransport()
// Message.
Q_ASSERT( item.hasPayload<Message::Ptr>() );
const Message::Ptr message = item.payload<Message::Ptr>();
+ if( message->hasHeader( "Bcc" ) ) {
+ message->removeHeader( "Bcc" );
+ message->assemble();
+ }
const QByteArray content = message->encodedContent( true ) + "\r\n";
Q_ASSERT( !content.isEmpty() );