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,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.