Date: Tuesday, May 16, 2023 @ 21:27:08
Author: arojas
Revision: 1462793
archrelease: copy trunk to community-x86_64
Added:
jami-qt/repos/community-x86_64/PKGBUILD
(from rev 1462792, jami-qt/trunk/PKGBUILD)
jami-qt/repos/community-x86_64/drop-qt-version-check.patch
(from rev 1462792, jami-qt/trunk/drop-qt-version-check.patch)
Deleted:
jami-qt/repos/community-x86_64/PKGBUILD
jami-qt/repos/community-x86_64/drop-qt-version-check.patch
-----------------------------+
PKGBUILD | 105 +++++++++++++++++++++---------------------
drop-qt-version-check.patch | 30 ++++++------
2 files changed, 69 insertions(+), 66 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-05-16 21:27:01 UTC (rev 1462792)
+++ PKGBUILD 2023-05-16 21:27:08 UTC (rev 1462793)
@@ -1,51 +0,0 @@
-# Maintainer: Bruno Pagani <[email protected]>
-
-pkgname=jami-qt
-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";
-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=1510ccaede0726a4e002be0445fef06a840dbde6
-_sfpmcommit=a2a0c72e4db38e1c5478bd3e0f67ff99fae11f00
-source=(git+https://git.jami.net/savoirfairelinux/jami-client-qt.git#commit=${_commit}
-
git+https://github.com/atraczyk/SortFilterProxyModel#commit=${_sfpmcommit}
- drop-qt-version-check.patch)
-sha256sums=('SKIP'
- 'SKIP'
- 'd0118269d637b984f13755a5c3548b2509215789aeda2c3b9ac7850c2bd7cf3e')
-
-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
-
- cd jami-client-qt
- rm -r 3rdparty/SortFilterProxyModel
- mv "$srcdir"/SortFilterProxyModel 3rdparty
-}
-
-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-x86_64/PKGBUILD (from rev 1462792,
jami-qt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-05-16 21:27:08 UTC (rev 1462793)
@@ -0,0 +1,54 @@
+# Maintainer: Bruno Pagani <[email protected]>
+
+pkgname=jami-qt
+pkgver=20230323
+pkgrel=2
+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 qt6-shadertools)
+makedepends=(git cmake python qt6-networkauth qt6-tools)
+replaces=(jami-gnome jami-libclient)
+conflicts=(jami-gnome jami-libclient)
+_commit=1510ccaede0726a4e002be0445fef06a840dbde6
+_sfpmcommit=a2a0c72e4db38e1c5478bd3e0f67ff99fae11f00
+source=(git+https://git.jami.net/savoirfairelinux/jami-client-qt.git#commit=${_commit}
+
git+https://github.com/atraczyk/SortFilterProxyModel#commit=${_sfpmcommit}
+ drop-qt-version-check.patch)
+sha256sums=('SKIP'
+ 'SKIP'
+ 'd0118269d637b984f13755a5c3548b2509215789aeda2c3b9ac7850c2bd7cf3e')
+
+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
+
+ cd jami-client-qt
+ rm -r 3rdparty/SortFilterProxyModel
+ mv "$srcdir"/SortFilterProxyModel 3rdparty
+
+# Fix crashes with Qt>=6.4
+ git cherry-pick -n 9b876c198e024153c1019f28fb792e853a515c69
+}
+
+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
+}
Deleted: drop-qt-version-check.patch
===================================================================
--- drop-qt-version-check.patch 2023-05-16 21:27:01 UTC (rev 1462792)
+++ drop-qt-version-check.patch 2023-05-16 21:27:08 UTC (rev 1462793)
@@ -1,15 +0,0 @@
---- 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-x86_64/drop-qt-version-check.patch (from rev
1462792, jami-qt/trunk/drop-qt-version-check.patch)
===================================================================
--- drop-qt-version-check.patch (rev 0)
+++ drop-qt-version-check.patch 2023-05-16 21:27:08 UTC (rev 1462793)
@@ -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(); });
+ }
