@@ 0,0 1,43 @@
+Upstream-status: https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/2072
+
+--- a/src/app/LayoutManager.qml	2025-06-18 02:28:42.298627257 +0300
++++ b/src/app/LayoutManager.qml	2025-06-18 02:34:07.528403540 +0300
+@@ -17,7 +17,6 @@
+ 
+ import QtQuick
+ import QtQuick.Controls
+-import QtWebEngine
+ 
+ import net.jami.Adapters 1.1
+ import net.jami.Enums 1.1
+@@ -41,9 +40,6 @@ QtObject {
+     // Used to store if a CallStackView component is fullscreened.
+     property bool isCallFullscreen: false
+ 
+-    // Used to store if a WebEngineView component is fullscreened.
+-    property bool isWebFullscreen: false
+-
+     // QWK: Provide spacing for widgets that may be occluded by the system buttons.
+     property QtObject qwkSystemButtonSpacing: QtObject {
+         id: qwkSystemButtonSpacing
+@@ -253,9 +249,6 @@ QtObject {
+             isCallFullscreen = fullScreenItems
+                 .filter(o => o.item.objectName === "callViewLoader")
+                 .length
+-            isWebFullscreen = fullScreenItems
+-                .filter(o => o.item instanceof WebEngineView)
+-                .length
+         }
+ 
+         // Listen for a hangup combined with a fullscreen call state and
+--- a/src/app/mainview/components/CallStackView.qml	2025-06-18 02:36:58.863782993 +0300
++++ b/src/app/mainview/components/CallStackView.qml	2025-06-18 02:38:00.994456741 +0300
+@@ -43,7 +43,7 @@ Item {
+     Shortcut {
+         sequence: "F11"
+         context: Qt.ApplicationShortcut
+-        enabled: CurrentConversation.hasCall && !layoutManager.isWebFullscreen
++        enabled: CurrentConversation.hasCall
+         onActivated: toggleFullScreen();
+     }
+ 


@@ 1,25 1,11 @@
-Forwarded here: https://lists.gnu.org/archive/html/jami/2024-01/msg00007.html
-
-From a302dc0a0faf2778331745a1d01bc3071e182d4d Mon Sep 17 00:00:00 2001
-From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
-Date: Mon, 8 Jan 2024 16:07:05 -0500
-Subject: [PATCH] build: Allow using system-provided md4c and tidy libraries.
-
-* CMakeLists.txt <md4c, tidy>: Search for libraries in the system
-first, falling back to bundled copies in case they aren't found.
-
-Series-to: jami@gnu.org
-Fixes: <https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1506>
-Change-Id: I637959fefce6a21b0ee73a793acb6c3c42dcdce0
----
- CMakeLists.txt | 36 +++++++++++++++++++++++++-----------
- 1 file changed, 25 insertions(+), 11 deletions(-)
+Upstream-status: https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/1506
+Upstream-status: https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/2073
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index e802357f..6d2dccfb 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -600,20 +600,34 @@ add_subdirectory(3rdparty/SortFilterProxyModel)
+@@ -696,29 +696,50 @@ add_subdirectory(3rdparty/SortFilterProx
  set(SFPM_OBJECTS $<TARGET_OBJECTS:SortFilterProxyModel>)
  
  # md4c


@@ 64,6 50,27 @@ index e802357f..6d2dccfb 100644
 +  list(APPEND CLIENT_LIBS tidy-static)
 +endif()
  
+ # ZXing-cpp configuration
+-set(BUILD_EXAMPLES OFF CACHE BOOL "")
+-set(BUILD_BLACKBOX_TESTS OFF CACHE BOOL "")
+-add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)
++pkg_check_modules(zxing IMPORTED_TARGET zxing)
++if(zxing_FOUND)
++  message(STATUS "Using system-provided ZXing-cpp")
++  list(APPEND CLIENT_INCLUDE_DIRS ${zxing_INCLUDE_DIRS})
++  list(APPEND CLIENT_LIBS PkgConfig::zxing)
++else()
++  set(BUILD_EXAMPLES OFF CACHE BOOL "")
++  set(BUILD_BLACKBOX_TESTS OFF CACHE BOOL "")
++  add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)
+ 
+ # Add ZXing-cpp to includes and libraries
+-list(APPEND CLIENT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zxing-cpp/core/src)
+-list(APPEND CLIENT_LIBS ZXing)
++  list(APPEND CLIENT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zxing-cpp/core/src)
++  list(APPEND CLIENT_LIBS ZXing)
++endif()
+ 
  # common executable sources
  qt_add_executable(
 


@@ 1,23 0,0 @@
-Libgit2 1.8.0 went for 'git_commit *const' but 1.8.4 reverted back to
-'const git_commit *'.
-
---- a/src/jamidht/conversationrepository.cpp
-+++ b/src/jamidht/conversationrepository.cpp
-@@ -783,7 +783,7 @@ ConversationRepository::Impl::createMergeCommit(git_index* index, const std::str
-     // Commit
-     git_buf to_sign = {};
-     // Check if the libgit2 library version is 1.8.0 or higher
--#if( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 8 )
-+#if( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 8 && LIBGIT2_VER_REVISION <= 3)
-     // For libgit2 version 1.8.0 and above
-     git_commit* const parents_ptr[2] {parents[0].get(), parents[1].get()};
- #else
-@@ -1870,7 +1870,7 @@ ConversationRepository::Impl::commit(const std::string& msg, bool verifyDevice)
- 
-     git_buf to_sign = {};
-     // Check if the libgit2 library version is 1.8.0 or higher
--#if( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 8 )
-+#if( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 8 && LIBGIT2_VER_REVISION <= 3)
-     // For libgit2 version 1.8.0 and above
-     git_commit* const head_ref[1] = {head_commit.get()};
- #else