[arch-commits] Commit in dino/trunk (PKGBUILD signal-2.3.3.patch)

[Bruno Pagani]

    Date: Saturday, November 14, 2020 @ 21:56:36
  Author: archange
Revision: 754203

upgpkg: dino 0.2.0-1

Modified:
  dino/trunk/PKGBUILD
Deleted:
  dino/trunk/signal-2.3.3.patch

--------------------+
 PKGBUILD           |   17 +++++------------
 signal-2.3.3.patch |   34 ----------------------------------
 2 files changed, 5 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-14 21:44:49 UTC (rev 754202)
+++ PKGBUILD	2020-11-14 21:56:36 UTC (rev 754203)
@@ -1,8 +1,8 @@
 # Maintainer: Bruno Pagani <archange at archlinux.org>
 
 pkgname=dino
-pkgver=0.1.0
-pkgrel=4
+pkgver=0.2.0
+pkgrel=1
 pkgdesc="Modern XMPP (Jabber) chat client written in Vala"
 arch=(x86_64)
 url="https://github.com/dino/dino"
@@ -10,18 +10,11 @@
 depends=(glib2 glib-networking gtk3 gpgme libgee libgcrypt libsignal-protocol-c
          libsoup sqlite qrencode)
 makedepends=(git cmake vala ninja)
-source=(${url}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz{,.asc}
-	signal-2.3.3.patch)
-sha256sums=('100542fcf05781f37f5a871489affe0a82f205cd15e3d0d3cdfd717fa1149835'
-            'SKIP'
-            '0f46b133b0e11a71d167b66f94e8dfd6f5677344c83f8fda903dd382e83bc673')
+source=(${url}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz{,.asc})
+sha256sums=('565b95d9fc697412edc898225890f95d26d42a3594e12680cbd7d038d7812f46'
+            'SKIP')
 validpgpkeys=(A32134DD19952FB12EC43E4501FABCC83FEA225E)
 
-prepare() {
-    cd ${pkgname}-${pkgver}
-    patch -Np1 -i ../signal-2.3.3.patch
-}
-
 build() {
     cmake -G Ninja -B build -S ${pkgname}-${pkgver} \
         -DCMAKE_INSTALL_PREFIX=/usr

Deleted: signal-2.3.3.patch
===================================================================
--- signal-2.3.3.patch	2020-11-14 21:44:49 UTC (rev 754202)
+++ signal-2.3.3.patch	2020-11-14 21:56:36 UTC (rev 754203)
@@ -1,34 +0,0 @@
-From fbd70ceaac5ebbddfa21a580c61165bf5b861303 Mon Sep 17 00:00:00 2001
-From: Marvin W <git at larma.de>
-Date: Mon, 13 Apr 2020 18:16:52 +0200
-Subject: [PATCH] Bump libsignal-protocol-c version to 2.3.3
-
----
- .gitmodules                                  | 2 +-
- plugins/signal-protocol/CMakeLists.txt       | 2 +-
- plugins/signal-protocol/libsignal-protocol-c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/.gitmodules b/.gitmodules
-index 02c33f98..b5480660 100644
---- a/.gitmodules
-+++ b/.gitmodules
-@@ -1,4 +1,4 @@
- [submodule "libsignal-protocol-c"]
- 	path = plugins/signal-protocol/libsignal-protocol-c
- 	url = https://github.com/WhisperSystems/libsignal-protocol-c.git
--	branch = v2.3.2
-+	branch = v2.3.3
-diff --git a/plugins/signal-protocol/CMakeLists.txt b/plugins/signal-protocol/CMakeLists.txt
-index 0ae84111..400de03c 100644
---- a/plugins/signal-protocol/CMakeLists.txt
-+++ b/plugins/signal-protocol/CMakeLists.txt
-@@ -32,7 +32,7 @@ if(NOT BUILD_LIBSIGNAL_IN_TREE)
-     # libsignal-protocol-c has a history of breaking compatibility on the patch level
-     # we'll have to check compatibility for every new release
-     # distro maintainers may update this dependency after compatibility tests
--    find_package(SignalProtocol 2.3.2 EXACT REQUIRED)
-+    find_package(SignalProtocol 2.3.2 REQUIRED)
- else()
-     add_subdirectory(libsignal-protocol-c EXCLUDE_FROM_ALL)
-     set_property(TARGET curve25519 PROPERTY POSITION_INDEPENDENT_CODE ON)