summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2022-11-06 13:07:41 +0100
committerPiotr Gorski2022-11-06 13:07:41 +0100
commitcfe0686d9e4579f3e484fc11e3217e5e892c691b (patch)
tree25ca2ef8cafbf7d9321a6f04e6706296673eaa8d
parentf42f4f632639fbee6c31d8a63bb5b8a104b3471f (diff)
downloadaur-cfe0686d9e4579f3e484fc11e3217e5e892c691b.tar.gz
Fix submodule error
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
2 files changed, 9 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 25c19ecb2fed..d87eebd43ef1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = psi-plus-git
pkgdesc = Psi+ is a powerful XMPP client (Qt, C++) designed for the XMPP power users (built with Qt 5.x)
- pkgver = 1.5.1477.r4437.gaf4b5b29
+ pkgver = 1.5.1644.r4604.gc6c4413f
pkgrel = 1
url = https://psi-plus.com
arch = x86_64
@@ -18,8 +18,8 @@ pkgbase = psi-plus-git
depends = hunspell
depends = qtkeychain
depends = http-parser
- provides = psi-plus=1.5.1477.r4437.gaf4b5b29
- provides = psi-plus-qt5-git=1.5.1477.r4437.gaf4b5b29
+ provides = psi-plus=1.5.1644.r4604.gc6c4413f
+ provides = psi-plus-qt5-git=1.5.1644.r4604.gc6c4413f
conflicts = psi-plus
conflicts = psi-plus-qt5-git
conflicts = psi-plus-webkit-qt5-git
diff --git a/PKGBUILD b/PKGBUILD
index 3767cf8c0f0b..b29951c02645 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Alexey D. <lq07829icatm@rambler.ru>
pkgname=psi-plus-git
-pkgver=1.5.1477.r4437.gaf4b5b29
+pkgver=1.5.1644.r4604.gc6c4413f
pkgrel=1
pkgdesc="Psi+ is a powerful XMPP client (Qt, C++) designed for the XMPP power users (built with Qt 5.x)"
url="https://psi-plus.com"
@@ -37,7 +37,11 @@ prepare() {
git config submodule.iris.url "$srcdir/iris"
git config submodule.src/libpsi.url "$srcdir/libpsi"
# git submodule update
- git submodule update --remote
+ # From git 2.38.1-1, "git submodule" in PKGBUILD does not work
+ # unless we change the git config "protocol.file.allow" [1,2].
+ # [1] https://bugs.archlinux.org/task/76255
+ # [2] https://bbs.archlinux.org/viewtopic.php?pid=2063104#p2063104
+ git -c protocol.file.allow=always submodule update --init --recursive
# set version
cd $srcdir/psi/admin