Date: Friday, April 21, 2023 @ 11:04:24 Author: arojas Revision: 1448122
upgpkg: jami-qt 20230323-1: Update to 20230323 Modified: jami-qt/trunk/PKGBUILD Deleted: jami-qt/trunk/fix-libavutil-linking.patch -----------------------------+ PKGBUILD | 22 +++++++++++++--------- fix-libavutil-linking.patch | 40 ---------------------------------------- 2 files changed, 13 insertions(+), 49 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-04-21 11:03:18 UTC (rev 1448121) +++ PKGBUILD 2023-04-21 11:04:24 UTC (rev 1448122) @@ -1,8 +1,8 @@ # Maintainer: Bruno Pagani <[email protected]> pkgname=jami-qt -pkgver=20220726 -pkgrel=2 +pkgver=20230323 +pkgrel=1 pkgdesc="Free and universal communication platform which preserves the users’ privacy and freedoms (Qt client)" arch=(x86_64) url="https://jami.net"; @@ -14,12 +14,14 @@ makedepends=(git cmake python qt6-networkauth qt6-tools) replaces=(jami-gnome jami-libclient) conflicts=(jami-gnome jami-libclient) -_commit=e481bb4eb0380276f6f1097d256ffdd51b87967b +_commit=1510ccaede0726a4e002be0445fef06a840dbde6 +_sfpmcommit=a2a0c72e4db38e1c5478bd3e0f67ff99fae11f00 source=(git+https://git.jami.net/savoirfairelinux/jami-client-qt.git#commit=${_commit} - drop-qt-version-check.patch - fix-libavutil-linking.patch) -sha256sums=(SKIP d0118269d637b984f13755a5c3548b2509215789aeda2c3b9ac7850c2bd7cf3e - 03bd2fd7b23b109bef2cb9d94d2d19613c26a7e3d05bf356cb808a79fa6d1658) + git+https://github.com/atraczyk/SortFilterProxyModel#commit=${_sfpmcommit} + drop-qt-version-check.patch) +sha256sums=('SKIP' + 'SKIP' + 'd0118269d637b984f13755a5c3548b2509215789aeda2c3b9ac7850c2bd7cf3e') pkgver() { cd jami-client-qt @@ -29,8 +31,10 @@ prepare() { # Drop strict Qt version check. Qt is ABI stable and jami is not using any private API patch -p1 -d jami-client-qt < drop-qt-version-check.patch - # https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/762 | https://review.jami.net/c/jami-client-qt/+/21688 - patch -p1 -d jami-client-qt < fix-libavutil-linking.patch + + cd jami-client-qt + rm -r 3rdparty/SortFilterProxyModel + mv "$srcdir"/SortFilterProxyModel 3rdparty } build() { Deleted: fix-libavutil-linking.patch =================================================================== --- fix-libavutil-linking.patch 2023-04-21 11:03:18 UTC (rev 1448121) +++ fix-libavutil-linking.patch 2023-04-21 11:04:24 UTC (rev 1448122) @@ -1,40 +0,0 @@ -From 6deb9b4724afe97fd13ae5270353604bb9e93d4f Mon Sep 17 00:00:00 2001 -From: Vladimir Stoiakin <[email protected]> -Date: Fri, 01 Jul 2022 21:03:09 +0300 -Subject: [PATCH] build: add dependency on libavutil for GNU/Linux - -Change-Id: I3d43fd9f5782f5ebf7db9b2cef6b5d294e7aa36c ---- - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6b88bf3..9c1e838 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -359,6 +359,7 @@ - endif() - - pkg_check_modules(XCB xcb) -+ pkg_check_modules(LIBAVUTIL libavutil>=55.75.100) - - include_directories( - ${LIBCLIENT_SRC_DIR} -@@ -366,7 +367,8 @@ - ${LIBNOTIFY_INCLUDE_DIRS} - ${LIBGDKPIXBUF_INCLUDE_DIRS} - ${GLIB_INCLUDE_DIRS} -- ${XCB_INCLUDE_DIRS}) -+ ${XCB_INCLUDE_DIRS} -+ ${LIBAVUTIL_INCLUDE_DIRS}) - - set(JAMI_DATA_PREFIX "${CMAKE_INSTALL_PREFIX}/share") - -@@ -548,7 +550,8 @@ - ${LIBGDKPIXBUF_LIBRARIES} - ${GLIB_LIBRARIES} - ${GIO_LIBRARIES} -- ${XCB_LIBRARIES}) -+ ${XCB_LIBRARIES} -+ ${LIBAVUTIL_LIBRARIES}) - - # Installation rules - install(
