change source, remove qt 5.15.0 patch

3 files changed, 17 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 548170321a15..97225a435c79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = chrome-token-signing
 	pkgdesc = Chrome and Firefox extension for signing with your eID on the web
 	pkgver = 1.1.2.520
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = http://www.id.ee/
 	arch = x86_64
 	arch = i686
 	license = LGPL2.1
 	makedepends = lsb-release
-	depends = qt5-base
+	makedepends = git
+	depends = qt5-base>=5.15.1
 	depends = pcsclite
 	depends = ccid
-	source = https://installer.id.ee/media/ubuntu/pool/main/c/chrome-token-signing/chrome-token-signing_1.1.2.520-1604.tar.xz
-	source = qt-5.15.patch
-	sha256sums = 872d4e735341a1be0bde2199f0918075b9c54eb426d783e84322ee95f130b94b
-	sha256sums = 8d443921bc416fc9397289768e6dbef223fc90da34cdaf30bd50e644c7f88a0d
+	source = chrome-token-signing-1.1.2.520::git+https://github.com/open-eid/chrome-token-signing.git?signed#tag=v1.1.2-1
+	validpgpkeys = D1EBC666EFCBFBD3CFC2EBAA90C0B5E75C3B195D
+	sha256sums = SKIP
 
 pkgname = chrome-token-signing
 
diff --git a/PKGBUILD b/PKGBUILD
index 42c7d50edf23..34a2c4e75a0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,29 @@
 # Maintainer: kevku <kevku@gmx.com>
 pkgname=chrome-token-signing
 pkgver=1.1.2.520
-pkgrel=1
+_rls_tag=v1.1.2-1
+pkgrel=2
 epoch=1
 pkgdesc="Chrome and Firefox extension for signing with your eID on the web"
 arch=('x86_64' 'i686')
 url="http://www.id.ee/"
 license=('LGPL2.1')
-depends=('qt5-base' 'pcsclite' 'ccid')
-makedepends=('lsb-release')
-source=("https://installer.id.ee/media/ubuntu/pool/main/c/$pkgname/${pkgname}_$pkgver-1604.tar.xz"
-        "qt-5.15.patch")
-sha256sums=('872d4e735341a1be0bde2199f0918075b9c54eb426d783e84322ee95f130b94b'
-            '8d443921bc416fc9397289768e6dbef223fc90da34cdaf30bd50e644c7f88a0d')
-
-prepare(){
-    cd "$srcdir/$pkgname/"
-    patch -p1 -i "$srcdir/qt-5.15.patch"
-}
+depends=('qt5-base>=5.15.1' 'pcsclite' 'ccid')
+makedepends=('lsb-release' 'git')
+source=("$pkgname-$pkgver::git+https://github.com/open-eid/chrome-token-signing.git?signed#tag=$_rls_tag")
+sha256sums=("SKIP")
+validpgpkeys=(
+    'D1EBC666EFCBFBD3CFC2EBAA90C0B5E75C3B195D'  # Raul Metsma
+)
 
 build() {
-    cd "$srcdir/$pkgname/"
+    cd "$srcdir/$pkgname-$pkgver"
     export BUILD_NUMBER=${pkgver##*.}
     make -C host-linux
 }
 
 package() {
-    cd "$srcdir/$pkgname/"
+    cd "$srcdir/$pkgname-$pkgver"
     # Istall files
     install -Dm755 ./host-linux/chrome-token-signing -t "$pkgdir/usr/bin"
     install -Dm644 ./host-linux/ee.ria.esteid.json -t "$pkgdir/usr/share/chrome-token-signing"
diff --git a/qt-5.15.patch b/qt-5.15.patch
deleted file mode 100644
index b3f0c8db526e..000000000000
--- a/qt-5.15.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nurd chrome-token-signing/host-linux/Signer.h chrome-token-signing.1/host-linux/Signer.h
---- chrome-token-signing/host-linux/Signer.h	2020-05-21 14:21:05.000000000 +0300
-+++ chrome-token-signing.1/host-linux/Signer.h	2020-06-19 14:51:37.000000000 +0300
-@@ -159,9 +159,10 @@
-     }
- 
- private:
--    static QByteArray toHex(const std::vector<unsigned char> &data)
-+    static QString toHex(const std::vector<unsigned char> &data)
-     {
--        return QByteArray::fromRawData((const char*)data.data(), int(data.size())).toHex();
-+        QByteArray bin = QByteArray::fromRawData((const char*)data.data(), int(data.size())).toHex();
-+        return QString::fromStdString(bin.toStdString());
-     }
- 
-     static std::vector<unsigned char> fromHex(const QString &data)