Carl Smedstad pushed to branch main at Arch Linux / Packaging / Packages /
jami-daemon
Commits:
1f16f815 by Carl Smedstad at 2024-09-08T17:34:44+02:00
upgpkg: 20240322-4: fmt 11.0.2 rebuild
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + fmt-v11.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = jami-daemon
pkgdesc = Free and universal communication platform which preserves the
users’ privacy and freedoms (daemon component)
pkgver = 20240322
- pkgrel = 3
+ pkgrel = 4
url = https://jami.net
arch = x86_64
groups = jami
@@ -45,10 +45,12 @@ pkgbase = jami-daemon
source =
dhtnet-024c46fb1f14276d4adf15764ed97b733890826e.tar.gz::https://review.jami.net/plugins/gitiles/dhtnet/+archive/024c46fb1f14276d4adf15764ed97b733890826e.tar.gz
source = libgit2-1.8.patch
source = ffmpeg-7.patch
+ source = fmt-v11.patch
sha512sums =
fe6bb7d9b78d2da6ec5be971a5e0e663379f541adba5a9103bba2c7252b6f0b347983f3a0c29300acc9bf0758779a7c7f55ab6b67eb0b1620c46600bf0535068
sha512sums =
7d481f4dcbe7232ff5a63cae46206943b64ac2d30f3b4598a9caf863322c1cfcd93c6c1232e2fa8f4e747f54f70b71a9b8f42f7e90d98fdd02124088afbdd37d
sha512sums = SKIP
sha512sums =
eef5c72149baaf9765917046a6e0dd8daffa422b69d1df15037cb0a0a756f632ddfb5f0b2299116554615972787cee2b9e2cd171063324d5d9a60c2e54038006
sha512sums =
2a895a82e8fad356445ed1a8adf860154e268f89c0812b3bfac8bb37fd45198ed8b076e81b2cc2cdd635d27cb0496a8d88ae982dcdc46fa42d7799b913695731
+ sha512sums =
f6a720ba4c6a119b638a159b8825af6e1427c55c394f01b7b74b5568bc74b6d3e79068fcde7e57cf8e97dfc926432f227ab65c04d128e7428e991dd73d920a8b
pkgname = jami-daemon
=====================================
PKGBUILD
=====================================
@@ -3,7 +3,7 @@
pkgname=jami-daemon
pkgver=20240322
-pkgrel=3
+pkgrel=4
pkgdesc="Free and universal communication platform which preserves the users’
privacy and freedoms (daemon component)"
arch=(x86_64)
url="https://jami.net";
@@ -22,14 +22,16 @@
source=(git+https://git.jami.net/savoirfairelinux/${pkgname}.git#commit=${_commi
https://github.com/savoirfairelinux/pjproject/archive/${_pjprojectver}/pjproject-${_pjprojectver}.tar.gz
dhtnet-$_dhtnetver.tar.gz::https://review.jami.net/plugins/gitiles/dhtnet/+archive/$_dhtnetver.tar.gz
libgit2-1.8.patch
- ffmpeg-7.patch)
+ ffmpeg-7.patch
+ fmt-v11.patch)
noextract=(pjproject-${_pjprojectver}.tar.gz
dhtnet-${_dhtnetver}.tar.gz)
sha512sums=('fe6bb7d9b78d2da6ec5be971a5e0e663379f541adba5a9103bba2c7252b6f0b347983f3a0c29300acc9bf0758779a7c7f55ab6b67eb0b1620c46600bf0535068'
'7d481f4dcbe7232ff5a63cae46206943b64ac2d30f3b4598a9caf863322c1cfcd93c6c1232e2fa8f4e747f54f70b71a9b8f42f7e90d98fdd02124088afbdd37d'
'SKIP'
'eef5c72149baaf9765917046a6e0dd8daffa422b69d1df15037cb0a0a756f632ddfb5f0b2299116554615972787cee2b9e2cd171063324d5d9a60c2e54038006'
-
'2a895a82e8fad356445ed1a8adf860154e268f89c0812b3bfac8bb37fd45198ed8b076e81b2cc2cdd635d27cb0496a8d88ae982dcdc46fa42d7799b913695731')
+
'2a895a82e8fad356445ed1a8adf860154e268f89c0812b3bfac8bb37fd45198ed8b076e81b2cc2cdd635d27cb0496a8d88ae982dcdc46fa42d7799b913695731'
+
'f6a720ba4c6a119b638a159b8825af6e1427c55c394f01b7b74b5568bc74b6d3e79068fcde7e57cf8e97dfc926432f227ab65c04d128e7428e991dd73d920a8b')
pkgver() {
cd ${pkgname}
@@ -40,10 +42,11 @@ prepare() {
cd ${pkgname}
cp ../pjproject-${_pjprojectver}.tar.gz contrib/tarballs
cp ../dhtnet-$_dhtnetver.tar.gz contrib/tarballs/
- mkdir contrib/native
+ mkdir -p contrib/native
patch -p1 -i ../libgit2-1.8.patch # Fix build with libgit2 1.8
patch -p1 -i ../ffmpeg-7.patch # Fix build with ffmpeg 7
+ patch -p1 -i ../fmt-v11.patch # Fix build with fmt v11
}
build() {
@@ -53,6 +56,11 @@ build() {
--disable-all \
--enable-pjproject \
--enable-dhtnet
+
+ # fmt v11 compatibility
+ make dhtnet
+ sed -io 's/fmt::ptr(pimpl_)/fmt::ptr(pimpl_.get())/g'
dhtnet/src/ice_transport.cpp
+
make DEPS_pjproject= DEPS_dhtnet=pjproject
cd "${srcdir}"
=====================================
fmt-v11.patch
=====================================
@@ -0,0 +1,12 @@
+diff --git a/src/account_config.cpp b/src/account_config.cpp
+index fa9723f6e..01a8e8c4c 100644
+--- a/src/account_config.cpp
++++ b/src/account_config.cpp
+@@ -22,6 +22,7 @@
+ #include "config/account_config_utils.h"
+
+ #include <fmt/compile.h>
++#include <fmt/ranges.h>
+
+ namespace jami {
+
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/jami-daemon/-/commit/1f16f81524ac6370ca302e0ff1d0f3934e53ec5f
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/jami-daemon/-/commit/1f16f81524ac6370ca302e0ff1d0f3934e53ec5f
You're receiving this email because of your account on gitlab.archlinux.org.
