[arch-commits] Commit in jami-qt/trunk (3 files)

[Bruno Pagani]

    Date: Saturday, July 2, 2022 @ 18:12:12
  Author: archange
Revision: 1243639

upgpkg: jami-qt 20220627-1

Added:
  jami-qt/trunk/fix-libavutil-linking.patch
Modified:
  jami-qt/trunk/PKGBUILD
  jami-qt/trunk/drop-qt-version-check.patch

-----------------------------+
 PKGBUILD                    |   27 +++++++++++++++------------
 drop-qt-version-check.patch |    6 ++----
 fix-libavutil-linking.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-02 17:49:05 UTC (rev 1243638)
+++ PKGBUILD	2022-07-02 18:12:12 UTC (rev 1243639)
@@ -1,24 +1,25 @@
 # Maintainer: Bruno Pagani <archange at archlinux.org>
 
 pkgname=jami-qt
-pkgver=20220511
-pkgrel=3
+pkgver=20220627
+pkgrel=1
 pkgdesc="Free and universal communication platform which preserves the users’ privacy and freedoms (Qt client)"
 arch=(x86_64)
 url="https://jami.net"
 license=(GPL3)
 groups=(jami)
-depends=(jami-libclient glib2 gdk-pixbuf2 libnm libnotify qrencode
+depends=(jami-daemon glib2 gdk-pixbuf2 libnm libnotify qrencode
          qt6-declarative qt6-multimedia qt6-svg qt6-5compat qt6-webengine
          qt6-webchannel)
 makedepends=(git cmake python qt6-networkauth qt6-tools)
-replaces=(jami-gnome)
-conflicts=(jami-gnome)
-_commit=820ef3092c65076900f2acb08204a712816f8ad5
+replaces=(jami-gnome jami-libclient)
+conflicts=(jami-gnome jami-libclient)
+_commit=1a14fd27fe6d99ae130604daaf1cc0d99aec1040
 source=(git+https://git.jami.net/savoirfairelinux/jami-client-qt.git#commit=${_commit}
-        drop-qt-version-check.patch)
-md5sums=('SKIP'
-         'dca36b057d34c8b965d2d06dfb09afd9')
+        drop-qt-version-check.patch
+        fix-libavutil-linking.patch)
+sha256sums=(SKIP d0118269d637b984f13755a5c3548b2509215789aeda2c3b9ac7850c2bd7cf3e
+            03bd2fd7b23b109bef2cb9d94d2d19613c26a7e3d05bf356cb808a79fa6d1658)
 
 pkgver() {
   cd jami-client-qt
@@ -26,9 +27,10 @@
 }
 
 prepare() {
-  cd jami-client-qt
-# Drop strict Qt version check. Qt is ABI stable and jami is not using any private API
-  patch -p1 -i ../drop-qt-version-check.patch
+  # 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
 }
 
 build() {
@@ -35,6 +37,7 @@
   cmake -B build -S jami-client-qt \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=None \
+    -DENABLE_LIBWRAP=ON \
     -Wno-dev
   make -C build
 }

Modified: drop-qt-version-check.patch
===================================================================
--- drop-qt-version-check.patch	2022-07-02 17:49:05 UTC (rev 1243638)
+++ drop-qt-version-check.patch	2022-07-02 18:12:12 UTC (rev 1243639)
@@ -1,7 +1,5 @@
-diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp
-index fdf96462..d6ee4634 100644
---- a/src/mainapplication.cpp
-+++ b/src/mainapplication.cpp
+--- a/src/app/mainapplication.cpp
++++ b/src/app/mainapplication.cpp
 @@ -100,12 +100,6 @@ ScreenInfo::setCurrentFocusWindow(QWindow* window)
  MainApplication::MainApplication(int& argc, char** argv)
      : QApplication(argc, argv)

Added: fix-libavutil-linking.patch
===================================================================
--- fix-libavutil-linking.patch	                        (rev 0)
+++ fix-libavutil-linking.patch	2022-07-02 18:12:12 UTC (rev 1243639)
@@ -0,0 +1,40 @@
+From 6deb9b4724afe97fd13ae5270353604bb9e93d4f Mon Sep 17 00:00:00 2001
+From: Vladimir Stoiakin <VStoiakin at lavabit.com>
+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(