summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD22
-rw-r--r--gitmodule-paths.patch11
3 files changed, 24 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 86238ec77d8a..b8f4da036250 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = libpurple-lurch
pkgdesc = Plugin for libpurple (Pidgin, Adium, etc) implementing OMEMO (using axolotl)
pkgver = 0.6.8
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/gkdr/lurch
arch = i686
arch = x86_64
@@ -13,11 +13,16 @@ pkgbase = libpurple-lurch
depends = libxml2
depends = sqlite
depends = libgcrypt
+ depends = libsignal-protocol-c
optdepends = libpurple-carbons: message carbons support
source = git+https://github.com/gkdr/lurch.git#tag=v0.6.8
- source = gitmodule-paths.patch
+ source = git+https://github.com/gkdr/axc
+ source = git+https://github.com/gkdr/libomemo
+ source = git+https://github.com/WhisperSystems/libsignal-protocol-c.git
+ b2sums = SKIP
+ b2sums = SKIP
+ b2sums = SKIP
b2sums = SKIP
- b2sums = bb6a60e8a57b6e9645bfdc9e26e960afbb4f1fea1228f8ce0040ce49cac788e2b04e99c71a3b7a219a14d8c3fb7da1e132f91d8772d7657b314eda0c9d039f2d
pkgname = libpurple-lurch
diff --git a/PKGBUILD b/PKGBUILD
index f1d10158cebc..78ebb4baeade 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,33 @@
pkgname=libpurple-lurch
pkgver=0.6.8
-pkgrel=2
+pkgrel=3
pkgdesc='Plugin for libpurple (Pidgin, Adium, etc) implementing OMEMO (using axolotl)'
arch=('i686' 'x86_64')
url='https://github.com/gkdr/lurch'
license=('GPL')
makedepends=('cmake' 'git')
-depends=('libpurple' 'mxml' 'libxml2' 'sqlite' 'libgcrypt')
+depends=('libpurple' 'mxml' 'libxml2' 'sqlite' 'libgcrypt' 'libsignal-protocol-c')
optdepends=('libpurple-carbons: message carbons support')
source=("git+https://github.com/gkdr/lurch.git#tag=v${pkgver}"
- gitmodule-paths.patch)
+ 'git+https://github.com/gkdr/axc'
+ 'git+https://github.com/gkdr/libomemo'
+ 'git+https://github.com/WhisperSystems/libsignal-protocol-c.git')
b2sums=('SKIP'
- 'bb6a60e8a57b6e9645bfdc9e26e960afbb4f1fea1228f8ce0040ce49cac788e2b04e99c71a3b7a219a14d8c3fb7da1e132f91d8772d7657b314eda0c9d039f2d')
+ 'SKIP'
+ 'SKIP'
+ 'SKIP')
prepare() {
cd ${pkgname##libpurple-}
- patch -p0 < "${srcdir}"/gitmodule-paths.patch
- git submodule update --init --recursive
+ git submodule init
+ git config submodule.'lib/axc'.url "${srcdir}"/axc
+ git config submodule.'lib/libomemo'.url "${srcdir}"/libomemo
+ git submodule update --recursive
+ cd lib/axc
+ git config submodule.'lib/libsignal-protocol-c'.url "${srcdir}"/libsignal-protocol-c
+ cd "${srcdir}"/${pkgname##libpurple-}
+ git submodule update --recursive
}
build() {
diff --git a/gitmodule-paths.patch b/gitmodule-paths.patch
deleted file mode 100644
index a88abcef2971..000000000000
--- a/gitmodule-paths.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- .gitmodules 2019-10-28 18:10:13.773236077 +0100
-+++ gitmod 2019-10-28 18:10:09.083220306 +0100
-@@ -1,6 +1,6 @@
- [submodule "lib/axc"]
- path = lib/axc
-- url = ../axc
-+ url = https://github.com/gkdr/axc
- [submodule "lib/libomemo"]
- path = lib/libomemo
-- url = ../libomemo
-+ url = https://github.com/gkdr/libomemo