Patched to work with qt5-service>=2.0.0

4 files changed, 98 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0dca37303cd6..9ae63a7ea1f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = syrem
 	pkgdesc = A simple reminder application for desktop and mobile, with synchronized reminders
 	pkgver = 3.0.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/Skycoder42/Syrem
 	arch = i686
 	arch = x86_64
@@ -16,15 +16,17 @@ pkgbase = syrem
 	depends = qt5-datasync
 	depends = qt5-mvvmwidgets
 	depends = qt5-mvvmdatasyncwidgets
-	depends = qt5-service
+	depends = qt5-service>=2.0.0
 	optdepends = knotifications: Adds support for KDE notifications, which are more advanced (recompile required)
 	optdepends = repkg: Automatically rebuild the package on dependency updates
 	provides = remind-me
 	conflicts = remind-me
 	source = syrem-3.0.0::git+https://github.com/Skycoder42/Syrem.git#tag=3.0.0
+	source = qtservice.patch
 	source = syrem.rule
 	sha256sums = SKIP
-	sha256sums = 194396e4a4e7c6e0ffcc38e0b76f15b01fd111134e530bf295999ef126480cd3
+	sha256sums = db5a25f08e206e44f47027a9a0d9f863d876383aa85b14c98b6a7928841edfbb
+	sha256sums = 38c7bde0526c138c22b54b98b3b3482e1f2d9dfc14a6a27f3f64d9b3f931a40c
 
 pkgname = syrem
 
diff --git a/PKGBUILD b/PKGBUILD
index 87db1594de9d..ec5fca802dae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Felix Barz <skycoder42.de@gmx.de>
 pkgname=syrem
 pkgver=3.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A simple reminder application for desktop and mobile, with synchronized reminders"
 arch=('i686' 'x86_64')
 url="https://github.com/Skycoder42/Syrem"
 license=('BSD')
-depends=('qt5-base' 'qt5-svg' 'qt5-datasync' 'qt5-mvvmwidgets' 'qt5-mvvmdatasyncwidgets' 'qt5-service')
+depends=('qt5-base' 'qt5-svg' 'qt5-datasync' 'qt5-mvvmwidgets' 'qt5-mvvmdatasyncwidgets' 'qt5-service>=2.0.0')
 makedepends=('qt5-tools' 'git' 'qpmx-qpmsource' 'qt5-mvvmdatasyncquick' 'python>=3.6.0')
 optdepends=("knotifications: Adds support for KDE notifications, which are more advanced (recompile required)"
 			"repkg: Automatically rebuild the package on dependency updates")
@@ -14,12 +14,16 @@ provides=('remind-me')
 conflicts=('remind-me')
 _pkgfqn=$pkgname-$pkgver
 source=("$_pkgfqn::git+https://github.com/Skycoder42/Syrem.git#tag=$pkgver"
+		"qtservice.patch"
 		"$pkgname.rule")
 sha256sums=('SKIP'
-            '194396e4a4e7c6e0ffcc38e0b76f15b01fd111134e530bf295999ef126480cd3')
+            'db5a25f08e206e44f47027a9a0d9f863d876383aa85b14c98b6a7928841edfbb'
+            '38c7bde0526c138c22b54b98b3b3482e1f2d9dfc14a6a27f3f64d9b3f931a40c')
 
 prepare() {
   mkdir -p build
+  cd "$_pkgfqn"
+  git apply ../qtservice.patch
 }
 
 build() {
diff --git a/qtservice.patch b/qtservice.patch
new file mode 100644
index 000000000000..7590463dbec1
--- /dev/null
+++ b/qtservice.patch
@@ -0,0 +1,85 @@
+diff --git a/lib/libsyrem.cpp b/lib/libsyrem.cpp
+index 07a7986..91d855d 100644
+--- a/lib/libsyrem.cpp
++++ b/lib/libsyrem.cpp
+@@ -5,6 +5,7 @@
+ #include <QTranslator>
+ #include <QLibraryInfo>
+ #include <QStandardPaths>
++#include <QQueue>
+ 
+ #include "schedule.h"
+ #include "dateparser.h"
+diff --git a/lib/reminder.cpp b/lib/reminder.cpp
+index ae3eca9..10a05c1 100644
+--- a/lib/reminder.cpp
++++ b/lib/reminder.cpp
+@@ -189,6 +189,18 @@ void Reminder::setExpression(QString expression)
+ 	_data->expression = std::move(expression);
+ }
+ 
++bool Reminder::operator==(const Reminder &other) const
++{
++	return _data == other._data || (
++		_data->id == other._data->id &&
++		_data->versionCode == other._data->versionCode &&
++		_data->text == other._data->text &&
++		_data->important == other._data->important &&
++		_data->schedule == other._data->schedule &&
++		_data->snooze == other._data->snooze &&
++		_data->expression == other._data->expression);
++}
++
+ void Reminder::setVersionCode(quint32 versionCode)
+ {
+ 	_data->versionCode = versionCode;
+@@ -203,3 +215,16 @@ void Reminder::setSnooze(QDateTime snooze)
+ {
+ 	_data->snooze = std::move(snooze);
+ }
++
++
++
++uint qHash(const Reminder &reminder, uint seed)
++{
++	return qHash(reminder._data->id, seed) ^
++			qHash(reminder._data->versionCode, seed) ^
++			qHash(reminder._data->text, seed) ^
++			qHash(reminder._data->important, seed) ^
++			qHash(reminder._data->schedule, seed) ^
++			qHash(reminder._data->snooze, seed) ^
++			qHash(reminder._data->expression, seed);
++}
+diff --git a/lib/reminder.h b/lib/reminder.h
+index be234f4..29f8a28 100644
+--- a/lib/reminder.h
++++ b/lib/reminder.h
+@@ -7,6 +7,7 @@
+ #include <QSharedPointer>
+ #include <QUrl>
+ #include <QUuid>
++#include <QHash>
+ #include <QtDataSync/DataTypeStore>
+ 
+ #include "libsyrem_global.h"
+@@ -79,7 +80,11 @@ public:
+ 	void setSchedule(QSharedPointer<Schedule> schedule);
+ 	void setExpression(QString expression);
+ 
++	bool operator==(const Reminder &other) const;
++
+ private:
++	friend LIB_SYREM_EXPORT uint qHash(const Reminder &reminder, uint seed);
++
+ 	QSharedDataPointer<ReminderData> _data;
+ 	mutable struct {
+ 		bool set = false;
+@@ -91,6 +96,8 @@ private:
+ 	void setSnooze(QDateTime snooze);
+ };
+ 
++LIB_SYREM_EXPORT uint qHash(const Reminder &reminder, uint seed);
++
+ Q_DECLARE_METATYPE(Reminder)
+ 
+ #endif // REMINDER_H
diff --git a/syrem.rule b/syrem.rule
index 11ec576a9d64..7bc0d662ae3f 100644
--- a/syrem.rule
+++ b/syrem.rule
@@ -1 +1 @@
-qt5-base{{^(\d+\.\d+\.\d+).*$}} qt5-datasync{{^(\d+\.\d+\.\d+).*$}} qt5-mvvmwidgets{{^(\d+\.\d+\.\d+).*$}} qt5-mvvmdatasyncwidgets{{^(\d+\.\d+\.\d+).*$}} qt5-service{{^(\d+\.\d+\.\d+).*$}} knotifications{{^(\d+\.\d+\.\d+).*$}}
+qt5-base=v qt5-datasync=v qt5-mvvmwidgets=v qt5-mvvmdatasyncwidgets=v} qt5-service=v knotifications=v