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

[Jan de Groot]

    Date: Wednesday, April 29, 2020 @ 11:40:16
  Author: jgc
Revision: 622242

Add upstream patch to allow signal 2.3.3

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

--------------------+
 PKGBUILD           |   14 +++++++++++---
 signal-2.3.3.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-29 11:40:12 UTC (rev 622241)
+++ PKGBUILD	2020-04-29 11:40:16 UTC (rev 622242)
@@ -10,12 +10,20 @@
 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})
-sha256sums=('100542fcf05781f37f5a871489affe0a82f205cd15e3d0d3cdfd717fa1149835' 'SKIP')
+source=(${url}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz{,.asc}
+	signal-2.3.3.patch)
+sha256sums=('100542fcf05781f37f5a871489affe0a82f205cd15e3d0d3cdfd717fa1149835'
+            'SKIP'
+            '0f46b133b0e11a71d167b66f94e8dfd6f5677344c83f8fda903dd382e83bc673')
 validpgpkeys=(A32134DD19952FB12EC43E4501FABCC83FEA225E)
 
+prepare() {
+    cd ${pkgname}-${pkgver}
+    patch -Np1 -i ../signal-2.3.3.patch
+}
+
 build() {
-    cmake -G Ninja -B build -S ${pkgname}-${pkgver} \
+    cmake -G Ninja -B buIld -S ${pkgname}-${pkgver} \
         -DCMAKE_INSTALL_PREFIX=/usr
     ninja -C build
 }

Added: signal-2.3.3.patch
===================================================================
--- signal-2.3.3.patch	                        (rev 0)
+++ signal-2.3.3.patch	2020-04-29 11:40:16 UTC (rev 622242)
@@ -0,0 +1,34 @@
+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)