ace/ace-overlay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jami test update

Browse Source
This commit is contained in:
ace
2026-02-27 18:08:19 +03:00
parent 5db1b4a362
commit cabd3d8bfa
37 changed files with 13031 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net-voip/jami-client-qt/Manifest
View File

@@ -3,6 +3,7 @@ AUX fix-link.patch 341 BLAKE2B 93739792a2d17ecfd22ba7dbd985ae7c3c653d6a68d56323a
AUX missing-cmake-include.patch 423 BLAKE2B 60f30ab98480ecb3e5655a41b51db435b57599a06cd52c383b5d05fcbbaf99650011af201ddf93b43d6c25e071b75dd31a164594d64953e55ed7e3a96b6e923c SHA512 209a06200311ef0c990e680d51f6cc55d8c8940b6a93a2c8f5a6b347aaec1a3f25b366e591c8297f561704d27cea69a6f161e10edc1fc072cc639127545a1665
AUX qt-6.6.patch 360 BLAKE2B ec421a35872612a4a17789b5c428da5913b9bf00b4a0dbfe10fe6dad80efa9181a280ab6a5762ced3a3443f8745a44a30fa6b1e028e61d40eb090290af7e7332 SHA512 33037667a59042b843dff77b36ac704344c79b3de5272280d6dfa9766319b97669bf655c19b9424d4b99d1a6cfc1cdc40590f71097a3a6c6e75b4572f16958d3
AUX unbundle-qwindowkit.patch 547 BLAKE2B 831bea9b28939627de9bc24759750c71e64e009c89ec10de554e4c73273615304650546d9614725e82b4fc7660fbdd3fd1c00240c913a87ffc187548b398d83d SHA512 807317f664b342645df0ecd2c3fb64c1ff62022bd8f42c4aba54108b86e5f147c668440d906eeb93f9a9b47102ed2797c40e407eeb482b118f0bae6f4c682fd6
AUX unbundle-qwindowkit2.patch 619 BLAKE2B 566e22b6b294fbc5e615e1e4c6c4efd7b87a0f71a828e495ad3d1368676967ba8046a8ecb6cb6d9bce17e5937530daeb024b37caffd3e335e37269ec77791b82 SHA512 f098306b8337f2a74d03dfc224ef3007349462e287e31ee12d5264cb6e8f0d3356c848bba3704936e707e0573574b38144c3d1b55c65a31acc87474785f6d380
AUX zxing-cpp-3.patch 853 BLAKE2B e7af374a7f79095b275d387ef9ea0bf4c09282706baf49cebcb564a965212ac420c6e148556e88cff676805f0c806e070bdb8602b87af6ea7f5d1f3dc70813a4 SHA512 1e2387fd056a13fdb8eb6f17a91d818f0334628dd0a6ae21f0c254aa465002646fd795f4dab7da771dd0c4057d4d38a42683e9a1e19e0afd056d5f703b97f3fe
EBUILD jami-client-qt-20251003.0.ebuild 1764 BLAKE2B f74f46bf4c2a05b0c57fcda535df70a168bc6b1ebd31a157b76263bcf70054d5b95b1d90c4b51577a514c0593acc69eb681c353696ee673e8d8e89d768537378 SHA512 57600f1db9820d6f17957e3a0f714788df89ad19679b6d65bbaa58ed8152d47c04c1e10bfc3d19f3d275048e25eadc678331e7ccd87b0eb4bb91f3c7be49c2a9
EBUILD jami-client-qt-9999.ebuild 1751 BLAKE2B 654f1ff2ce712733b2ceb7758e40bab948b673de12f8c4bf6329379aee456831cc1a6c789b8413d4456a486749704aafec6c3cce2a77b6f0fe0346b69927de5d SHA512 8acdee230b76065dcebbf4b7d6c3b043fbb33c9265ca91a45b56857278df766e351282d6e425f0168dc4a49a10640ce266a173076158b2d57883cb4ab43f094c
EBUILD jami-client-qt-20260206.0.ebuild 1725 BLAKE2B 35687f9feea69913c9556c253f065bcf35786e5883950380f4b498b0c1922a034a11f72dc43468b5789c6d17a91888fca67294a56f250af6ffb2a2fc264ca84f SHA512 4f44c62487e281521634ca5283ced88b8f4ef9655811721db0a3e504bb346f979d221131d5e0a4b702414a9c8600dbd34bbfcb61e0ee330f0828c14d31bfc3e6
EBUILD jami-client-qt-9999.ebuild 1736 BLAKE2B 096f760bfa6cb5714b43b204fdbaf94e018eb6530067dd19e145fa3f164d37616a0cb0eea2f0ed2c5cac7bd343a1786440837c327932aa5254887be7a300fb1c SHA512 da56f9ec648f2123032f1f87b48e96c9a5ba10d3ecc1964f542623eeff6cfa255a9a0c962748e7e7a680d3c4aeafd4a34a2fe134ff7df415b158cec36af0dfef

20
net-voip/jami-client-qt/files/unbundle-qwindowkit2.patch
View File

@@ -1,20 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c046b597..89c64b95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,14 +100,7 @@ if(NOT WIN32)
endif()
# qwindowkit (frameless window)
-add_fetch_content(
- TARGET qwindowkit
- URL https://github.com/stdware/qwindowkit.git
- BRANCH 758b00cb6c2d924be3a1ea137ec366dc33a5132d
- PATCHES ${QWINDOWKIT_PATCHES}
- OPTIONS ${QWINDOWKIT_OPTIONS}
-)
-list(APPEND CLIENT_INCLUDE_DIRS ${QWindowKit_BINARY_DIR}/include)
+find_package(QWindowKit)
list(APPEND CLIENT_LIBS QWindowKit::Quick)
# If ENABLE_CRASHREPORTS is enabled, we will use crashpad_cmake for now.

31
net-voip/jami-client-qt/files/zxing-cpp-3.patch Normal file
View File

@@ -0,0 +1,31 @@
diff --git a/src/app/qrcodescannermodel.cpp b/src/app/qrcodescannermodel.cpp
index cea49eab..aac3ea35 100644
--- a/src/app/qrcodescannermodel.cpp
+++ b/src/app/qrcodescannermodel.cpp
@@ -17,9 +17,8 @@
#include "qrcodescannermodel.h"
-#include <Barcode.h>
-#include <MultiFormatReader.h>
-#include <ReadBarcode.h>
+#include <ZXing/Barcode.h>
+#include <ZXing/ReadBarcode.h>
#include <QDebug>
diff --git a/src/app/utils.cpp b/src/app/utils.cpp
index b02a21e5..c2ddb383 100644
--- a/src/app/utils.cpp
+++ b/src/app/utils.cpp
@@ -47,8 +47,8 @@
#include <windows.h>
#endif
-#include <BitMatrix.h>
-#include <MultiFormatWriter.h>
+#include <ZXing/BitMatrix.h>
+#include <ZXing/MultiFormatWriter.h>
// Removes the given argument from the command line arguments, and invokes the callback
// function with the removed argument if it was found.

85
net-voip/jami-client-qt/jami-client-qt-20260206.0.ebuild Normal file
View File

@@ -0,0 +1,85 @@
# Copyright 2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake flag-o-matic git-r3
DESCRIPTION="Jami clent QT"
HOMEPAGE="https://git.jami.net/savoirfairelinux/jami-client-qt"
if [[ "${PV}" == 9999* ]]; then
EGIT_REPO_URI="https://git.jami.net/savoirfairelinux/jami-client-qt"
KEYWORDS=""
else
EGIT_REPO_URI="https://git.jami.net/savoirfairelinux/jami-client-qt"
KEYWORDS=""
EGIT_COMMIT="stable/${PV}"
fi
LICENSE="GPL-3"
SLOT="0"
IUSE="doc"
DEPEND="
net-voip/jami-daemon
net-libs/libnma
x11-libs/libnotify
media-gfx/qrencode
dev-libs/libayatana-appindicator
dev-qt/qtbase
dev-qt/qtdeclarative
dev-qt/qtgraphicaleffects
dev-qt/qtmultimedia[qml(+)]
dev-qt/qtnetworkauth
dev-qt/qtsvg
dev-qt/qttools
dev-qt/qtwebengine[qml(+)]
dev-qt/qt5compat
dev-qt/qtpositioning
dev-qt/qtwebsockets[qml(+)]
dev-qt/qwindowkit
media-libs/zxing-cpp
media-libs/zint
app-text/htmltidy
app-text/hunspell
"
BDEPEND="doc? ( app-text/doxygen )"
RDEPEND="
${DEPEND}
"
src_prepare() {
eapply "${FILESDIR}"/drop-qt-version-check.patch
eapply "${FILESDIR}"/qt-6.6.patch
eapply "${FILESDIR}"/fix-link.patch
eapply "${FILESDIR}"/missing-cmake-include.patch
eapply "${FILESDIR}"/unbundle-qwindowkit.patch
if has_version ">=media-libs/zxing-cpp-3.0.2"; then
eapply "${FILESDIR}"/zxing-cpp-3.patch
fi
cmake_src_prepare
}
src_configure() {
append-cxxflags -I/usr/include/jami
append-ldflags -ljami
local mycmakeargs=(
-DCMAKE_BUILD_TYPE=None
-DENABLE_LIBWRAP=ON
-DJAMICORE_AS_SUBDIR=OFF
-DWITH_DAEMON_SUBMODULE=OFF
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
-Wno-dev
)
cmake_src_configure
}
src_install() {
cmake_src_install
}

15
net-voip/jami-client-qt/jami-client-qt-9999.ebuild
View File

@@ -3,18 +3,18 @@
EAPI=8
inherit cmake flag-o-matic
inherit cmake flag-o-matic git-r3
DESCRIPTION="Jami clent QT"
HOMEPAGE="https://git.jami.net/savoirfairelinux/jami-client-qt"
if [[ "${PV}" == 9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/savoirfairelinux/${PN}"
EGIT_COMMIT="2e71d00c0500ffe2241e9171f7423a52a0efa96e"
EGIT_REPO_URI="https://git.jami.net/savoirfairelinux/jami-client-qt"
KEYWORDS=""
else
SRC_URI="https://github.com/savoirfairelinux/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
EGIT_REPO_URI="https://git.jami.net/savoirfairelinux/jami-client-qt"
KEYWORDS="~amd64 ~x86"
EGIT_COMMIT="stable/${PV}"
fi
LICENSE="GPL-3"
@@ -59,6 +59,9 @@ src_prepare() {
eapply "${FILESDIR}"/fix-link.patch
eapply "${FILESDIR}"/missing-cmake-include.patch
eapply "${FILESDIR}"/unbundle-qwindowkit.patch
if has_version ">=media-libs/zxing-cpp-3.0.2"; then
eapply "${FILESDIR}"/zxing-cpp-3.patch
fi
cmake_src_prepare
}
@@ -67,8 +70,6 @@ src_configure() {
append-ldflags -ljami
local mycmakeargs=(
#-DCMAKE_INSTALL_PREFIX=/usr
#-DLIBJAMI_INCLUDE_DIR=/usr/lib64
-DCMAKE_BUILD_TYPE=None
-DENABLE_LIBWRAP=ON
-DJAMICORE_AS_SUBDIR=OFF