Skip to content

Commit

Permalink
Format patches as zero-commits
Browse files Browse the repository at this point in the history
To reduce delta on patches following procedure reduces changes on patches
when submodule is updated.

git am --3way --keep-non-patch --no-signoff  ../rpm/00*
git format-patch --no-signoff --zero-commit -N origin/master

Use no-numbered (-N) and zero-commit to minimize delta.
  • Loading branch information
rainemak committed Feb 2, 2021
1 parent 8737598 commit 7675c9e
Show file tree
Hide file tree
Showing 29 changed files with 60 additions and 60 deletions.
@@ -1,4 +1,4 @@
From f2d4bba3b0e068ae45b7b76c2e1abad6f9f498c0 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rio=20Val=C3=A9rio?= <valerio.valerio@jolla.com>
Date: Mon, 23 Feb 2015 13:08:24 +0200
Subject: [PATCH] Stop _incomingDataTimer when imapprotocol object is
Expand All @@ -24,5 +24,5 @@ index 4df62a57..984e2638 100644
delete _fsm;
}
--
2.26.2
2.29.2

@@ -1,4 +1,4 @@
From 69205cb598d6db0c5edeb184ec90de745ddbf51b Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.vuorela@jolla.com>
Date: Mon, 13 Aug 2018 15:45:24 +0300
Subject: [PATCH] Introduce acceptUntrustedCertificates() configuration.
Expand Down Expand Up @@ -441,5 +441,5 @@ index e8b28a6b..ed115d53 100644
void setSmtpPassword(const QString& password);
void setSmtpAuthentication(int t);
--
2.26.2
2.29.2

4 changes: 2 additions & 2 deletions rpm/0003-fix-tests-installation-path.patch
@@ -1,4 +1,4 @@
From fba75e39c44bdb971387ec74c228dc8af7739cbd Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Valerio Valerio <valerio.valerio@jollamobile.com>
Date: Tue, 30 Apr 2013 14:38:17 +0300
Subject: [PATCH] fix tests installation path.
Expand Down Expand Up @@ -2935,5 +2935,5 @@ index 4cde1fe3..204ecd5a 100644

INSTALLS += testdata
--
2.26.2
2.29.2

4 changes: 2 additions & 2 deletions rpm/0004-Accounts-qt-integration.patch
@@ -1,4 +1,4 @@
From 1ac228490d30ad5902b608a6d74a947e68ddc4d6 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Valerio Valerio <valerio.valerio@jollamobile.com>
Date: Wed, 29 May 2013 09:44:20 +0300
Subject: [PATCH] Accounts-qt integration.
Expand Down Expand Up @@ -5482,5 +5482,5 @@ index 26719daa..84ca9409 100644
QMailAccount account3(account1.id());
QCOMPARE(QMailStore::instance()->lastError(), QMailStore::InvalidId);
--
2.26.2
2.29.2

@@ -1,4 +1,4 @@
From 071b29984213918dfee0b375caa82757901b6ba2 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Evgeny Karpov <evgeny.karpov@oss.tieto.com>
Date: Thu, 24 Oct 2013 09:37:30 +0000
Subject: [PATCH] Start messageserver on system startup in case there are email
Expand Down Expand Up @@ -172,5 +172,5 @@ index d05c3377..689ad320 100644
+ SUBDIRS += accountscheck
+}
--
2.26.2
2.29.2

4 changes: 2 additions & 2 deletions rpm/0006-Add-keepalive-timer-to-IMAP-IDLE-service.patch
@@ -1,4 +1,4 @@
From 15d35e73cd6bc3b1128aa23b7c30b8ce26ab9ba3 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Valerio Valerio <valerio.valerio@jollamobile.com>
Date: Wed, 10 Sep 2014 14:36:13 +0300
Subject: [PATCH] Add keepalive timer to IMAP IDLE service
Expand Down Expand Up @@ -105,5 +105,5 @@ index 00682a87..b3e8dd97 100644

class ImapServicePlugin : public QMailMessageServicePlugin
--
2.26.2
2.29.2

4 changes: 2 additions & 2 deletions rpm/0007-Use-Qt5-booster-to-save-memory.patch
@@ -1,4 +1,4 @@
From 4f228ab04d182f22253bb66756e3111a57d45ffe Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Valerio Valerio <valerio.valerio@jollamobile.com>
Date: Mon, 27 Oct 2014 09:49:12 +0200
Subject: [PATCH] Use Qt5 booster to save memory.
Expand Down Expand Up @@ -61,5 +61,5 @@ index 0d583d15..a5aa05a9 100644
RestartSec=1

--
2.26.2
2.29.2

@@ -1,4 +1,4 @@
From 572179f5aef58be39e6a0e9daa742e0f457c3bd3 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.vuorela@jolla.com>
Date: Mon, 13 Aug 2018 17:24:36 +0300
Subject: [PATCH] Introduce QMailAccount::HasPersistentConnection status flag
Expand Down Expand Up @@ -59,5 +59,5 @@ index 221fa7c5..ab509afd 100644
ssoAccount->setValue("emailaddress", account->fromAddress().address());
ssoAccount->setValue("fullName", account->fromAddress().name());
--
2.26.2
2.29.2

@@ -1,4 +1,4 @@
From 275994691f0f2c292437800d413dc4fd159f4a0c Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.vuorela@jolla.com>
Date: Wed, 15 Aug 2018 11:26:49 +0300
Subject: [PATCH] Introduce discovery of authentication from the anounced
Expand Down Expand Up @@ -1396,5 +1396,5 @@ index 8603694e..a2f66cd9 100644
};

--
2.26.2
2.29.2

4 changes: 2 additions & 2 deletions rpm/0010-Handle-SMTP-response-504.patch
@@ -1,4 +1,4 @@
From 0863fa4521af4ecf2108c403e1250561fc9c1e92 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Valerio Valerio <valerio.valerio@jollamobile.com>
Date: Wed, 17 Dec 2014 17:16:45 +0000
Subject: [PATCH] Handle SMTP response 504.
Expand Down Expand Up @@ -288,5 +288,5 @@ index 1ca218a8..96852b2b 100644
QTimer *authTimeout;

--
2.26.2
2.29.2

@@ -1,4 +1,4 @@
From e846fbd37877440a5a13dee50a5ed2cd7d17f781 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Valerio Valerio <valerio.valerio@jollamobile.com>
Date: Mon, 19 Jan 2015 11:25:01 +0200
Subject: [PATCH] Recreate SSO identity for smtp in case of failure.
Expand Down Expand Up @@ -65,5 +65,5 @@ index 96852b2b..12003c7e 100644
#endif
};
--
2.26.2
2.29.2

@@ -1,4 +1,4 @@
From 48d083a0845681f379fd8072e811152895f40784 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Valerio Valerio <valerio.valerio@jollamobile.com>
Date: Mon, 2 Feb 2015 17:03:21 +0200
Subject: [PATCH] Listen to sync schedule changes from buteo sync framework.
Expand Down Expand Up @@ -466,5 +466,5 @@ index a5aa05a9..9622d701 100644

[Service]
--
2.26.2
2.29.2

4 changes: 2 additions & 2 deletions rpm/0013-Do-AUTHENTICATE-PLAIN-in-two-stages.patch
@@ -1,4 +1,4 @@
From b535bf5077ae8a7832943821590b7699dbfd5340 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rio=20Val=C3=A9rio?= <valerio.valerio@jolla.com>
Date: Fri, 20 Feb 2015 15:06:21 +0200
Subject: [PATCH] Do AUTHENTICATE PLAIN in two stages
Expand Down Expand Up @@ -98,5 +98,5 @@ index 88db5298..00ad7e73 100644

// Currently pop account does not have any auth settings, so only plain can be used
--
2.26.2
2.29.2

4 changes: 2 additions & 2 deletions rpm/0014-Prevent-push-enabled-status-to-go-out-of-sync.patch
@@ -1,4 +1,4 @@
From 3678112efc4311f9a7720576b7ee59cba5b54891 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rio=20Val=C3=A9rio?= <valerio.valerio@jolla.com>
Date: Mon, 23 Feb 2015 13:31:30 +0200
Subject: [PATCH] Prevent push enabled status to go out of sync.
Expand Down Expand Up @@ -131,5 +131,5 @@ index 157da852..c8300aa4 100644
}
}
--
2.26.2
2.29.2

@@ -1,4 +1,4 @@
From 492bd281990970b6e37514507c3c27dd3e4a9b4b Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rio=20Val=C3=A9rio?= <valerio.valerio@jolla.com>
Date: Mon, 11 May 2015 15:12:07 +0300
Subject: [PATCH] Check if IDLE connection needs to be established after login.
Expand Down Expand Up @@ -33,5 +33,5 @@ index 40bbe543..d78d897e 100644
bool compressCapable(_protocol.capabilities().contains("COMPRESS=DEFLATE", Qt::CaseInsensitive));
if (!_protocol.encrypted() && QMFALLOWCOMPRESS && compressCapable && !_protocol.compress()) {
--
2.26.2
2.29.2

4 changes: 2 additions & 2 deletions rpm/0016-Revert-Fix-bundled-zlib-detection.patch
@@ -1,4 +1,4 @@
From b8ee070cbaa3a1960407101108a80bd481836230 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.vuorela@jolla.com>
Date: Tue, 14 Aug 2018 14:04:19 +0300
Subject: [PATCH] Revert "Fix bundled zlib detection"
Expand Down Expand Up @@ -37,5 +37,5 @@ index 8a2258bd..e4897df9 100644
}

--
2.26.2
2.29.2

4 changes: 2 additions & 2 deletions rpm/0017-Add-signature-settings-in-account.patch
@@ -1,4 +1,4 @@
From cdb7272f21c278479ccc640bfb29126251d076d6 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Damien Caliste <dcaliste@free.fr>
Date: Mon, 5 Nov 2018 16:11:29 +0100
Subject: [PATCH] Add signature settings in account
Expand Down Expand Up @@ -184,5 +184,5 @@ index ab509afd..a6913276 100644
ssoAccount->setValue("fullName", account->fromAddress().name());
if (account->lastSynchronized().isValid()) {
--
2.26.2
2.29.2

@@ -1,4 +1,4 @@
From 42dc9606299bd2f1cb05b038f12944b74568b2a0 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Tue, 23 Jul 2019 11:44:27 +0300
Subject: [PATCH] Use socket's local address for HELO and EHLO messages
Expand Down Expand Up @@ -65,5 +65,5 @@ index 19f69880..0300dcf1 100644
status = Helo;
} else {
--
2.26.2
2.29.2

@@ -1,4 +1,4 @@
From 4165b1ae3ed3c24b8cec6cafcd862a5dbe8757aa Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Lepp=C3=A4nen?= <tomi.leppanen@jolla.com>
Date: Mon, 30 Sep 2019 14:11:57 +0300
Subject: [PATCH] Use EightBit encoding instead of Base64 for text types
Expand Down Expand Up @@ -33,5 +33,5 @@ index 71491f1a..d7678678 100644
addedSome = true;
}
--
2.26.2
2.29.2

@@ -1,4 +1,4 @@
From 6d07d9c296e0559580271fbe9e157f47149e6222 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Damien Caliste <dcaliste@free.fr>
Date: Fri, 24 Jan 2020 16:28:37 +0100
Subject: [PATCH] Follow the synchronizationEnabled flag when folders are not
Expand Down Expand Up @@ -163,5 +163,5 @@ index 1f418e44..260fd580 100644
uint _total;
};
--
2.26.2
2.29.2

@@ -1,4 +1,4 @@
From 9c1464707679de152568f6257079828c3c466265 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: David Llewellyn-Jones <david.llewellyn-jones@jolla.com>
Date: Fri, 7 Feb 2020 19:29:59 +0200
Subject: [PATCH] Set new IMAP folders to inherit SynchronizationEnabled flag
Expand Down Expand Up @@ -36,5 +36,5 @@ index d78d897e..cfb11519 100644
// The reported flags pertain to the listed folder only
QString folderFlags;
--
2.26.2
2.29.2

4 changes: 2 additions & 2 deletions rpm/0022-Set-qmf-accountscheck-to-be-run-by-the-booster.patch
@@ -1,4 +1,4 @@
From 550dfab63f14994687dc520040d149cd04ecc454 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: David Llewellyn-Jones <david.llewellyn-jones@jolla.com>
Date: Wed, 25 Mar 2020 11:59:52 +0200
Subject: [PATCH] Set qmf-accountscheck to be run by the booster
Expand Down Expand Up @@ -44,5 +44,5 @@ index 689ad320..15aa630e 100644
+
+OTHER_FILES += systemd/*.service
--
2.26.2
2.29.2

@@ -1,4 +1,4 @@
From ccebc56bdc0fcebcff8a622c93401b6c41239a78 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: David Llewellyn-Jones <david.llewellyn-jones@jolla.com>
Date: Wed, 8 Jul 2020 15:51:08 +0000
Subject: [PATCH] Retrieve message lists based on the folder sync policy
Expand Down Expand Up @@ -384,5 +384,5 @@ index 3b8663a7..7b6492ab 100644
_service->_client.newConnection();
_unavailable = true;
--
2.26.2
2.29.2

4 changes: 2 additions & 2 deletions rpm/0024-Apply-folder-policy-to-always-on-connection.patch
@@ -1,4 +1,4 @@
From 5639df7e29b112a53ad1b8ff9ada906897bfab95 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: David Llewellyn-Jones <david.llewellyn-jones@jolla.com>
Date: Wed, 22 Jul 2020 11:08:24 +0000
Subject: [PATCH] Apply folder policy to always on connection
Expand Down Expand Up @@ -124,5 +124,5 @@ index 07289a1c..c8dc7b9e 100644

int ImapConfiguration::checkInterval() const
--
2.26.2
2.29.2

@@ -1,4 +1,4 @@
From 0b9ed226a501ce7ae67c1923335221ab9d22f3ce Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Damien Caliste <dcaliste@free.fr>
Date: Wed, 2 Sep 2020 16:58:12 +0200
Subject: [PATCH] Add missing slash character as protected in header parameters
Expand Down Expand Up @@ -49,5 +49,5 @@ index 34d8ae63..7f3f0eef 100644

void tst_QMailMessageHeaderField::isParameterEncoded()
--
2.26.2
2.29.2

@@ -1,4 +1,4 @@
From ecd5ca0b6b1178f2ab2e1ccf10f037718690da61 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Slava Monich <slava.monich@jolla.com>
Date: Sun, 26 Jul 2020 03:03:44 +0300
Subject: [PATCH] Handle encoded-word's containing partial characters
Expand All @@ -17,11 +17,11 @@ to be doing - I haven't found a single one which wouldn't handle it.

Change-Id: I5bbb785343ad60459fa6e52f5728fd796c7e5961
---
src/libraries/qmfclient/qmailmessage.cpp | 52 +++++++++++++++++++++-----------
src/libraries/qmfclient/qmailmessage.cpp | 52 ++++++++++++++++--------
1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/libraries/qmfclient/qmailmessage.cpp b/src/libraries/qmfclient/qmailmessage.cpp
index 71491f1..35ef6a3 100644
index f51e8c02..ecfe9d41 100644
--- a/src/libraries/qmfclient/qmailmessage.cpp
+++ b/src/libraries/qmfclient/qmailmessage.cpp
@@ -329,9 +329,10 @@ static QMailCodec* codecForEncoding(QMailMessageBody::TransferEncoding te, const
Expand Down Expand Up @@ -117,5 +117,5 @@ index 71491f1..35ef6a3 100644
return out;
}
--
1.9.1
2.29.2

@@ -1,4 +1,4 @@
From 03f36b882f2034157043d697368a58b544bc1ea3 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Andrew den Exter <andrew.den.exter@jolla.com>
Date: Mon, 2 Nov 2020 06:18:17 +0000
Subject: [PATCH] Allow a service provided folder to be set as the standard
Expand Down Expand Up @@ -33,5 +33,5 @@ index 79025c6e..48baaf37 100644
}

--
2.25.0
2.29.2

4 changes: 2 additions & 2 deletions rpm/0028-Add-QMailMessage-CalendarCancellation-flag.patch
@@ -1,4 +1,4 @@
From 45fb98f4a669025e104121cb81eada87d7b01a3d Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: David Llewellyn-Jones <david.llewellyn-jones@jolla.com>
Date: Mon, 4 Jan 2021 15:21:12 +0000
Subject: [PATCH] Add QMailMessage::CalendarCancellation flag
Expand Down Expand Up @@ -197,5 +197,5 @@ index f44528fd..b4f64d91 100644

// Special case to handle spurious hotmail messages. Hide in UI, but do not delete from server
--
2.26.2
2.29.2

@@ -1,4 +1,4 @@
From 998ad664e26424ac0dbb7f3383f3d5d8110a354d Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chris Adams <chris.adams@jolla.com>
Date: Tue, 19 Jan 2021 16:29:41 +1000
Subject: [PATCH] Use a queued connection to handle accountsUpdated signal
Expand Down Expand Up @@ -98,5 +98,5 @@ index 9da2f7b8..6f8b4518 100644
}
}
--
2.17.1
2.29.2

0 comments on commit 7675c9e

Please sign in to comment.