[arch-commits] Commit in jami-qt/repos (4 files)

[Bruno Pagani]

    Date: Thursday, July 28, 2022 @ 10:52:37
  Author: archange
Revision: 1258977

archrelease: copy trunk to community-testing-x86_64

Added:
  jami-qt/repos/community-testing-x86_64/
  jami-qt/repos/community-testing-x86_64/PKGBUILD
    (from rev 1258976, jami-qt/trunk/PKGBUILD)
  jami-qt/repos/community-testing-x86_64/drop-qt-version-check.patch
    (from rev 1258976, jami-qt/trunk/drop-qt-version-check.patch)
  jami-qt/repos/community-testing-x86_64/fix-libavutil-linking.patch
    (from rev 1258976, jami-qt/trunk/fix-libavutil-linking.patch)

-----------------------------+
 PKGBUILD                    |   47 ++++++++++++++++++++++++++++++++++++++++++
 drop-qt-version-check.patch |   15 +++++++++++++
 fix-libavutil-linking.patch |   40 +++++++++++++++++++++++++++++++++++
 3 files changed, 102 insertions(+)

Copied: jami-qt/repos/community-testing-x86_64/PKGBUILD (from rev 1258976, jami-qt/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2022-07-28 10:52:37 UTC (rev 1258977)
@@ -0,0 +1,47 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+
+pkgname=jami-qt
+pkgver=20220726
+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-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 jami-libclient)
+conflicts=(jami-gnome jami-libclient)
+_commit=e481bb4eb0380276f6f1097d256ffdd51b87967b
+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)
+
+pkgver() {
+  cd jami-client-qt
+  TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD
+}
+
+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
+}
+
+build() {
+  cmake -B build -S jami-client-qt \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=None \
+    -DENABLE_LIBWRAP=ON \
+    -Wno-dev
+  make -C build
+}
+
+package() {
+  make -C build DESTDIR="${pkgdir}" install
+}

Copied: jami-qt/repos/community-testing-x86_64/drop-qt-version-check.patch (from rev 1258976, jami-qt/trunk/drop-qt-version-check.patch)
===================================================================
--- community-testing-x86_64/drop-qt-version-check.patch	                        (rev 0)
+++ community-testing-x86_64/drop-qt-version-check.patch	2022-07-28 10:52:37 UTC (rev 1258977)
@@ -0,0 +1,15 @@
+--- 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)
+ {
+-    const char* qtVersion = qVersion();
+-    qInfo() << "Using Qt runtime version:" << qtVersion;
+-    if (strncmp(qtVersion, QT_VERSION_STR, strnlen(qtVersion, sizeof qtVersion)) != 0) {
+-        qFatal("Qt build version mismatch! %s", QT_VERSION_STR);
+-    }
+-
+     parseArguments();
+     QObject::connect(this, &QApplication::aboutToQuit, [this] { cleanup(); });
+ }

Copied: jami-qt/repos/community-testing-x86_64/fix-libavutil-linking.patch (from rev 1258976, jami-qt/trunk/fix-libavutil-linking.patch)
===================================================================
--- community-testing-x86_64/fix-libavutil-linking.patch	                        (rev 0)
+++ community-testing-x86_64/fix-libavutil-linking.patch	2022-07-28 10:52:37 UTC (rev 1258977)
@@ -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(