This commit is contained in:
ace
2025-12-08 00:42:50 +03:00
parent 7aaf6cb565
commit 3a29f1e8a7
43 changed files with 13471 additions and 0 deletions

View File

@@ -0,0 +1,8 @@
AUX drop-qt-version-check.patch 407 BLAKE2B 2ecc17d02402fff5c2237cd65a27a23d95b483778eb06fbb9a22771ae77d09210ddce467fba531bdd3880916fa47eb0d436e3468b73f5fb5fd8ae20a90c6155e SHA512 52414576304e51f8bbb0f82f2683c346e6e05d17720a1287b7d6a374da808679d09fe2a0534c6a9f416dd2c5d07c8f855797d8e287f3036382e2542991f0dbb9
AUX fix-link.patch 341 BLAKE2B 93739792a2d17ecfd22ba7dbd985ae7c3c653d6a68d56323ac695d55eea8f450e78659ad5a38a2ce984e9a12aa3e6f8a6d37ded57435e17447a168d05594c673 SHA512 599abf002696af0d7654c83143ae15b48e55a89425834774f29edc50ce05296bc3d1a8eac70591aa163e28f2079ffc57a2e3518d806e4180b7855b1854f59bf4
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
EBUILD jami-client-qt-20251003.0.ebuild 1773 BLAKE2B 0ed4961737d87498abd4f847826a52e72cf8412ca09481b568fccbd1901997fb328acc978ce0fa5c6cb0b8baa26df580f4bb251b90835dfaff3f7857ca6fbe7c SHA512 6abd9e3188e2389a77f31de56b7212902b7a01c39603b3efc0e78be5485016043b9e80ffb34dae6c560fb702f82f3f6dd5dd6a4b99fb5ae6dbd8c54cf21e7018
EBUILD jami-client-qt-9999.ebuild 1751 BLAKE2B 654f1ff2ce712733b2ceb7758e40bab948b673de12f8c4bf6329379aee456831cc1a6c789b8413d4456a486749704aafec6c3cce2a77b6f0fe0346b69927de5d SHA512 8acdee230b76065dcebbf4b7d6c3b043fbb33c9265ca91a45b56857278df766e351282d6e425f0168dc4a49a10640ce266a173076158b2d57883cb4ab43f094c

View File

@@ -0,0 +1,12 @@
--- a/src/app/mainapplication.cpp
+++ b/src/app/mainapplication.cpp
@@ -100,9 +100,6 @@ ScreenInfo::setCurrentFocusWindow(QWindow* window)
: QApplication(argc, argv)
{
const char* qtVersion = qVersion();
- if (strncmp(qtVersion, QT_VERSION_STR, strnlen(qtVersion, sizeof qtVersion)) != 0) {
- C_FATAL << "Qt build version mismatch!" << QT_VERSION_STR;
- }
parseArguments();

View File

@@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29bfde9a..ba6b5c45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -805,7 +805,8 @@ elseif (NOT APPLE)
${LIBNOTIFY_LIBRARIES}
${LIBGDKPIXBUF_LIBRARIES}
${GLIB_LIBRARIES}
- ${GIO_LIBRARIES})
+ ${GIO_LIBRARIES}
+ avutil)
install(
TARGETS ${PROJECT_NAME}

View File

@@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29bfde9a..eb817a6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,7 @@ endif()
set(CMAKE_SCRIPTS_DIR ${PROJECT_SOURCE_DIR}/extras/build/cmake)
include(${CMAKE_SCRIPTS_DIR}/extra_tools.cmake)
+include(FindPkgConfig)
option(WITH_DAEMON_SUBMODULE "Build with daemon submodule" ON)
option(JAMICORE_AS_SUBDIR "Build Jami-core as a subdir dependency" ON)

View File

@@ -0,0 +1,13 @@
diff --git a/src/app/instancemanager.cpp b/src/app/instancemanager.cpp
index 79154097..fbd620c4 100644
--- a/src/app/instancemanager.cpp
+++ b/src/app/instancemanager.cpp
@@ -224,7 +224,7 @@ InstanceManager::~InstanceManager()
bool
InstanceManager::tryToRun(const QByteArray& startUri)
{
- return pimpl_->tryToRun(startUri);
+ return true;
}
void

View File

@@ -0,0 +1,19 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29bfde9a..f0fbe76f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,13 +101,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}
-)
+find_package(QWindowKit)
list(APPEND CLIENT_INCLUDE_DIRS ${QWindowKit_BINARY_DIR}/include)
list(APPEND CLIENT_LIBS QWindowKit::Quick)

View File

@@ -0,0 +1,20 @@
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.

View File

@@ -0,0 +1,86 @@
# Copyright 2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake flag-o-matic
DESCRIPTION="Jami clent QT"
HOMEPAGE="https://git.jami.net/savoirfairelinux/jami-client-qt"
if [[ "${PV}" == 9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.jami.net/savoirfairelinux/jami-client-qt"
EGIT_COMMIT="2e71d00c0500ffe2241e9171f7423a52a0efa96e"
KEYWORDS=""
else
EGIT_REPO_URI="https://git.jami.net/savoirfairelinux/jami-client-qt"
KEYWORDS="~amd64 ~x86"
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
cmake_src_prepare
}
src_configure() {
append-cxxflags -I/usr/include/jami
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
-DWITH_DAEMON_SUBMODULE=OFF
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
-Wno-dev
)
cmake_src_configure
}
src_install() {
cmake_src_install
}

View File

@@ -0,0 +1,84 @@
# Copyright 2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake flag-o-matic
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"
else
SRC_URI="https://github.com/savoirfairelinux/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
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
cmake_src_prepare
}
src_configure() {
append-cxxflags -I/usr/include/jami
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
-DWITH_DAEMON_SUBMODULE=OFF
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
-Wno-dev
)
cmake_src_configure
}
src_install() {
cmake_src_install
}