[arch-commits] Commit in jami-qt/trunk (PKGBUILD drop-qt-version-check.patch)

[Antonio Rojas]

    Date: Thursday, June 16, 2022 @ 21:31:33
  Author: arojas
Revision: 1238231

Drop useless Qt version check (FS#75093)

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

-----------------------------+
 PKGBUILD                    |   14 +++++++++++---
 drop-qt-version-check.patch |   17 +++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-16 21:31:32 UTC (rev 1238230)
+++ PKGBUILD	2022-06-16 21:31:33 UTC (rev 1238231)
@@ -2,7 +2,7 @@
 
 pkgname=jami-qt
 pkgver=20220511
-pkgrel=2
+pkgrel=3
 pkgdesc="Free and universal communication platform which preserves the users’ privacy and freedoms (Qt client)"
 arch=(x86_64)
 url="https://jami.net"
@@ -15,8 +15,10 @@
 replaces=(jami-gnome)
 conflicts=(jami-gnome)
 _commit=820ef3092c65076900f2acb08204a712816f8ad5
-source=(git+https://git.jami.net/savoirfairelinux/jami-client-qt.git#commit=${_commit})
-md5sums=(SKIP)
+source=(git+https://git.jami.net/savoirfairelinux/jami-client-qt.git#commit=${_commit}
+        drop-qt-version-check.patch)
+md5sums=('SKIP'
+         'dca36b057d34c8b965d2d06dfb09afd9')
 
 pkgver() {
   cd jami-client-qt
@@ -23,6 +25,12 @@
   TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD
 }
 
+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
+}
+
 build() {
   cmake -B build -S jami-client-qt \
     -DCMAKE_INSTALL_PREFIX=/usr \

Added: drop-qt-version-check.patch
===================================================================
--- drop-qt-version-check.patch	                        (rev 0)
+++ drop-qt-version-check.patch	2022-06-16 21:31:33 UTC (rev 1238231)
@@ -0,0 +1,17 @@
+diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp
+index fdf96462..d6ee4634 100644
+--- a/src/mainapplication.cpp
++++ b/src/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(); });
+ }