From ef08c4c067aaa1c0c098c16424ff577a6b0afdfc Mon Sep 17 00:00:00 2001
From: Christoph Feck <cfeck@kde.org>
Date: Wed, 2 Dec 2020 22:48:44 +0100
Subject: [PATCH 1/3] GIT_SILENT Upgrade release service version to 20.12.0.

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 831f620e6d..c86a14cb18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.0)
 
 # KDE Application Version, managed by release script
 set (RELEASE_SERVICE_VERSION_MAJOR "20")
-set (RELEASE_SERVICE_VERSION_MINOR "11")
-set (RELEASE_SERVICE_VERSION_MICRO "90")
+set (RELEASE_SERVICE_VERSION_MINOR "12")
+set (RELEASE_SERVICE_VERSION_MICRO "0")
 set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 project(Dolphin VERSION ${RELEASE_SERVICE_VERSION})
 

From 9b8ac3ef3f73a79896160fee7e92d4bc6a18c71d Mon Sep 17 00:00:00 2001
From: Christoph Feck <cfeck@kde.org>
Date: Wed, 2 Dec 2020 23:01:21 +0100
Subject: [PATCH 2/3] GIT_SILENT Update Appstream for new release

---
 src/org.kde.dolphin.appdata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml
index 5bbb7f885a..cfbc06d2ba 100644
--- a/src/org.kde.dolphin.appdata.xml
+++ b/src/org.kde.dolphin.appdata.xml
@@ -628,9 +628,9 @@
     <binary>dolphin</binary>
   </provides>
   <releases>
+    <release version="20.12.0" date="2020-12-10"/>
     <release version="20.08.3" date="2020-11-05"/>
     <release version="20.08.2" date="2020-10-08"/>
     <release version="20.08.1" date="2020-09-03"/>
-    <release version="20.08.0" date="2020-08-13"/>
   </releases>
 </component>

From c453393d357f094bc48d61061bf818cfe9d1c4ec Mon Sep 17 00:00:00 2001
From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Sat, 5 Dec 2020 19:15:51 +0100
Subject: [PATCH 3/3] Fix PlacesItemModelTest, 2nd try

This partly reverts 15a5189b1193cc7305ad2c556d67ec79bdb6e38a

The KDE CI does not have KDE_FULL_SESSION set, which means that KIO
doesn't add the recentlyused:// urls to the model, but defaults to the
old timeline:// urls instead.

In both cases KIO adds 2 places, so it is safe to always assume that the
expected model count is 14.
---
 src/tests/placesitemmodeltest.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/tests/placesitemmodeltest.cpp b/src/tests/placesitemmodeltest.cpp
index 0a6ccf27dd..d289b390d2 100644
--- a/src/tests/placesitemmodeltest.cpp
+++ b/src/tests/placesitemmodeltest.cpp
@@ -67,7 +67,7 @@ private:
     PlacesItemModel* m_model;
     QSet<int> m_tobeRemoved;
     QMap<QString, QDBusInterface *> m_interfacesMap;
-    int m_expectedModelCount = qEnvironmentVariableIsSet("KDE_FULL_SESSION") && KProtocolInfo::isKnownProtocol(QStringLiteral("recentlyused")) ? 14 : 12;
+    int m_expectedModelCount = 14;
     bool m_hasDesktopFolder = false;
     bool m_hasDocumentsFolder = false;
     bool m_hasDownloadsFolder = false;
@@ -184,6 +184,9 @@ QStringList PlacesItemModelTest::initialUrls() const
         if (qEnvironmentVariableIsSet("KDE_FULL_SESSION") && KProtocolInfo::isKnownProtocol(QStringLiteral("recentlyused"))) {
             urls << QStringLiteral("recentlyused:/files");
             urls << QStringLiteral("recentlyused:/locations");
+        } else {
+            urls << QStringLiteral("timeline:/today")
+                 << QStringLiteral("timeline:/yesterday");
         }
 
         urls << QStringLiteral("search:/documents") << QStringLiteral("search:/images") << QStringLiteral("search:/audio") << QStringLiteral("search:/videos")
@@ -352,17 +355,16 @@ void PlacesItemModelTest::testGroups()
     QCOMPARE(groups.at(1).first, expectedRemoteIndex);
     QCOMPARE(groups.at(1).second.toString(), QStringLiteral("Remote"));
 
-    if (qEnvironmentVariableIsSet("KDE_FULL_SESSION") && KProtocolInfo::isKnownProtocol(QStringLiteral("recentlyused"))) {
-        expectedRemoteIndex += 2;
-    }
+    QCOMPARE(groups.at(2).first, expectedRemoteIndex + 2);
+    QCOMPARE(groups.at(2).second.toString(), QStringLiteral("Recent"));
 
-    QCOMPARE(groups.at(3).first, expectedRemoteIndex + 2);
+    QCOMPARE(groups.at(3).first, expectedRemoteIndex + 4);
     QCOMPARE(groups.at(3).second.toString(), QStringLiteral("Search For"));
 
-    QCOMPARE(groups.at(4).first, expectedRemoteIndex + 6);
+    QCOMPARE(groups.at(4).first, expectedRemoteIndex + 8);
     QCOMPARE(groups.at(4).second.toString(), QStringLiteral("Devices"));
 
-    QCOMPARE(groups.at(5).first, expectedRemoteIndex + 7);
+    QCOMPARE(groups.at(5).first, expectedRemoteIndex + 9);
     QCOMPARE(groups.at(5).second.toString(), QStringLiteral("Removable Devices"));
 }