summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSkycoder422019-03-09 18:33:50 +0100
committerSkycoder422019-03-09 18:33:50 +0100
commit504f026cb03142197dc5aae1714da9f7ddd52390 (patch)
tree054f00925837adfcd51b7886b892e160adfa9587
parentaa4378892d971048fb218373b75438860b3b728d (diff)
downloadaur-504f026cb03142197dc5aae1714da9f7ddd52390.tar.gz
Patched to work with qt5-service>=2.0.0
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
-rw-r--r--qtservice.patch21
3 files changed, 30 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f3368b2895c..b6259871227 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = keepass-transfer
pkgdesc = A collection of tools to securely transfer passwords to your browser
pkgver = 3.0.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/Skycoder42/KeepassTransfer
arch = i686
arch = x86_64
@@ -13,14 +13,16 @@ pkgbase = keepass-transfer
depends = qt5-base
depends = qt5-svg
depends = qt5-mvvmwidgets
- depends = qt5-service
+ depends = qt5-service>=2.0.0
depends = keepassxc-client-library
depends = keepassxc
optdepends = repkg: Automatically rebuild the package on dependency updates
optdepends = keepassxc: Import credentials from KeePassXC for easy password transfers
source = keepass-transfer-3.0.0::git+https://github.com/Skycoder42/KeepassTransfer.git#tag=3.0.0
+ source = qtservice.patch
source = keepass-transfer.rule
sha256sums = SKIP
+ sha256sums = 3859a5e32b3dc273d11901126a8e7a428c081bc84fe9ea3c167a898c87f87cb0
sha256sums = 1b8b79d7dea81de3866da764c67e12b80ffe66064acdcbcf53b9f2fac55c2e21
pkgname = keepass-transfer
diff --git a/PKGBUILD b/PKGBUILD
index e52ec77fc97..171acf08e1f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,26 @@
# Maintainer: Felix Barz <skycoder42.de@gmx.de>
pkgname=keepass-transfer
pkgver=3.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="A collection of tools to securely transfer passwords to your browser"
arch=('i686' 'x86_64')
url="https://github.com/Skycoder42/KeepassTransfer"
license=('BSD')
-depends=('qt5-base' 'qt5-svg' 'qt5-mvvmwidgets' 'qt5-service' 'keepassxc-client-library' 'keepassxc')
+depends=('qt5-base' 'qt5-svg' 'qt5-mvvmwidgets' 'qt5-service>=2.0.0' 'keepassxc-client-library' 'keepassxc')
makedepends=('git' 'qt5-tools' 'pkgconfig' 'qpmx-qpmsource')
optdepends=("repkg: Automatically rebuild the package on dependency updates"
"keepassxc: Import credentials from KeePassXC for easy password transfers")
_pkgfqn=$pkgname-$pkgver
source=("$_pkgfqn::git+https://github.com/Skycoder42/KeepassTransfer.git#tag=$pkgver"
+ "qtservice.patch"
"$pkgname.rule")
sha256sums=('SKIP'
+ '3859a5e32b3dc273d11901126a8e7a428c081bc84fe9ea3c167a898c87f87cb0'
'1b8b79d7dea81de3866da764c67e12b80ffe66064acdcbcf53b9f2fac55c2e21')
prepare() {
cd "$_pkgfqn"
+ git apply ../qtservice.patch
git submodule update --init --recursive
cd ..
mkdir -p build
diff --git a/qtservice.patch b/qtservice.patch
new file mode 100644
index 00000000000..3eecfec3a02
--- /dev/null
+++ b/qtservice.patch
@@ -0,0 +1,21 @@
+diff --git a/server/kptservice.cpp b/server/kptservice.cpp
+index 4cd5bb9..f959e6c 100644
+--- a/server/kptservice.cpp
++++ b/server/kptservice.cpp
+@@ -33,13 +33,13 @@ QtService::Service::CommandResult KPTService::onStart()
+ static_cast<quint16>(_settings->value(QStringLiteral("server/port"), 27352).toUInt()));
+ }
+ if(!ok)
+- return OperationFailed;
++ return CommandResult::Failed;
+
+- return OperationCompleted;
++ return CommandResult::Completed;
+ }
+
+ QtService::Service::CommandResult KPTService::onStop(int &exitCode)
+ {
+ exitCode = EXIT_SUCCESS;
+- return OperationCompleted;
++ return CommandResult::Completed;
+ }