Update to EteSync 2.0's branch until merged

3 files changed, 27 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 58e146444529..99576444a6f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kdepim-runtime-etesync-git
 	pkgdesc = Extends the functionality of kdepim (with etesync modules)
-	pkgver = v20.04.1.r205.g166ef579c
+	pkgver = v20.04.1.r301.gbbfadc713
 	pkgrel = 1
 	url = https://kontact.kde.org
 	arch = x86_64
@@ -23,10 +23,10 @@ pkgbase = kdepim-runtime-etesync-git
 	depends = libakonadi
 	depends = qca
 	depends = qt5-networkauth
-	depends = etesync-git
+	depends = etebase
 	provides = kdepim-runtime
 	conflicts = kdepim-runtime
-	source = kdepim-runtime-etesync::git+https://invent.kde.org/sjolly/kdepim-runtime.git#branch=etesyncResource
+	source = kdepim-runtime-etesync::git+https://invent.kde.org/sjolly/kdepim-runtime.git#branch=etesync2resource
 	source = 0001-XXX-Ease-version-requirements.patch
 	sha512sums = SKIP
 	sha512sums = SKIP
diff --git a/0001-XXX-Ease-version-requirements.patch b/0001-XXX-Ease-version-requirements.patch
index 10d2d3d73f4e..5e2816c3225b 100644
--- a/0001-XXX-Ease-version-requirements.patch
+++ b/0001-XXX-Ease-version-requirements.patch
@@ -1,14 +1,14 @@
-From ad3f1988d83f5f83fdcb82663dffe8b6b3e8019a Mon Sep 17 00:00:00 2001
+From 15506f982fca6140ee8f289771749e3ae554be6d Mon Sep 17 00:00:00 2001
 From: Tom Hacohen <tom@stosb.com>
-Date: Sun, 16 Aug 2020 16:14:00 +0300
-Subject: [PATCH 1/2] XXX: Ease version requirements
+Date: Tue, 6 Oct 2020 13:48:39 +0300
+Subject: [PATCH 1/2] XXX: ease version requirements.
 
 ---
- CMakeLists.txt | 38 +++++++++++++++++++-------------------
- 1 file changed, 19 insertions(+), 19 deletions(-)
+ CMakeLists.txt | 42 +++++++++++++++++++++---------------------
+ 1 file changed, 21 insertions(+), 21 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 17767ba13..503594352 100644
+index e57367da3..6489b53cc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -1,5 +1,5 @@
@@ -18,7 +18,16 @@ index 17767ba13..503594352 100644
  set(KDEPIM_RUNTIME_VERSION_NUMBER ${PIM_VERSION})
  project(kdepim-runtime VERSION ${KDEPIM_RUNTIME_VERSION_NUMBER})
  
-@@ -71,25 +71,25 @@ set(QT_REQUIRED_VERSION "5.13.0")
+@@ -48,7 +48,7 @@ set(KDEPIM_RUNTIME_VERSION "${KDEPIM_RUNTIME_VERSION_NUMBER}${KDEPIM_DEV_VERSION
+ 
+ configure_file(kdepim-runtime-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdepim-runtime-version.h @ONLY)
+ 
+-set(KF5_MIN_VERSION "5.75.0")
++set(KF5_MIN_VERSION "5.74.0")
+ 
+ find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
+ set(CMAKE_MODULE_PATH ${kdepim-runtime_SOURCE_DIR}/cmake/ ${ECM_MODULE_PATH})
+@@ -71,26 +71,26 @@ set(QT_REQUIRED_VERSION "5.13.0")
  
  set(KDEPIMRUNTIME_LIB_VERSION "${KDEPIM_RUNTIME_VERSION_NUMBER}")
  set(KDEPIMRUNTIME_LIB_SOVERSION "5")
@@ -39,9 +48,10 @@ index 17767ba13..503594352 100644
 -set(AKONADICONTACT_LIB_VERSION "5.15.40")
 -set(AKONADINOTE_LIB_VERSION "5.15.40")
 -set(PIMCOMMON_LIB_VERSION "5.15.40")
--set(KGAPI_LIB_VERSION "5.15.40")
--set(LIBKDEPIM_LIB_VERSION_LIB "5.15.40")
+-set(KGAPI_LIB_VERSION "5.15.41")
+-set(LIBKDEPIM_LIB_VERSION "5.15.40")
 -set(KLDAP_LIB_VERSION "5.15.40")
+-set(GRANTLEETHEME_LIB_VERSION "5.15.40")
 +set(IDENTITYMANAGEMENT_LIB_VERSION "5.15.0")
 +set(KMAILTRANSPORT_LIB_VERSION "5.15.0")
 +set(CALENDARUTILS_LIB_VERSION "5.15.0")
@@ -57,8 +67,9 @@ index 17767ba13..503594352 100644
 +set(AKONADINOTE_LIB_VERSION "5.15.0")
 +set(PIMCOMMON_LIB_VERSION "5.15.0")
 +set(KGAPI_LIB_VERSION "5.15.0")
-+set(LIBKDEPIM_LIB_VERSION_LIB "5.15.0")
++set(LIBKDEPIM_LIB_VERSION "5.15.0")
 +set(KLDAP_LIB_VERSION "5.15.0")
++set(GRANTLEETHEME_LIB_VERSION "5.15.0")
  
  set( SharedMimeInfo_MINIMUM_VERSION "1.3" )
  find_package(SharedMimeInfo ${SharedMimeInfo_MINIMUM_VERSION} REQUIRED)
diff --git a/PKGBUILD b/PKGBUILD
index 884771b0eccd..afed2b0152ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,17 @@
 
 pkgname=kdepim-runtime-etesync-git
 _pkgname=kdepim-runtime-etesync
-pkgver=v20.04.1.r205.g166ef579c
+pkgver=v20.04.1.r301.gbbfadc713
 pkgrel=1
 pkgdesc='Extends the functionality of kdepim (with etesync modules)'
 arch=(x86_64)
 url='https://kontact.kde.org'
 license=(GPL LGPL FDL)
-depends=(libkolabxml kdav akonadi-calendar knotifyconfig kalarmcal kmbox pimcommon akonadi-notes akonadi libakonadi qca qt5-networkauth etesync-git)
+depends=(libkolabxml kdav akonadi-calendar knotifyconfig kalarmcal kmbox pimcommon akonadi-notes akonadi libakonadi qca qt5-networkauth etebase)
 makedepends=(extra-cmake-modules kdoctools boost git)
 provides=(kdepim-runtime)
 conflicts=(kdepim-runtime)
-source=("${_pkgname}::git+https://invent.kde.org/sjolly/kdepim-runtime.git#branch=etesyncResource"
+source=("${_pkgname}::git+https://invent.kde.org/sjolly/kdepim-runtime.git#branch=etesync2resource"
         "0001-XXX-Ease-version-requirements.patch")
 sha512sums=('SKIP'
         'SKIP')