From patchwork Wed Jun 18 00:24:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Homo X-Patchwork-Id: 43104 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E910E27BC4A; Wed, 18 Jun 2025 01:26:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CD92F27BC49 for ; Wed, 18 Jun 2025 01:26:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRgcv-0007Nu-RT; Tue, 17 Jun 2025 20:26:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uRgct-0007Nj-Cn for guix-patches@gnu.org; Tue, 17 Jun 2025 20:26:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uRgct-0002ll-3c for guix-patches@gnu.org; Tue, 17 Jun 2025 20:26:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=3mY9CfnN0BXdpo7sFXV5eB5HI6X5aYpFX8CN3Z2Xlmc=; b=Xz2jqNv643i3vhxaEMFIp4/w7euZRk70UL/cwjiwghRTLahaCF0Z8MFxuMd70tqrVpwFKJDbQwHPIAmQvJCHbT+rF/o26ncdNvdJq5CXDZTZeG4W5YCzZ0MMy1VrZTDBID2Rwq84rGQAlQatliIMq2iiJH9fBW3CKZcxqeBWT1BNlt93aLJ61y0xpq2gmfDVBITeNxlUaMB16tXOOg3HqDdBHPWhjnJO6C+4N00cMm34mvhKrmHP2Fdi8zikONhgMk7nc51cGzDbPRHviYuQHrW+GdG1H8phHx51BsWix5Ez14bb23cNfp6dKhPnSnewB/93Vx0fNPUDK8WFTjXwqw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uRgcs-0002u2-TV for guix-patches@gnu.org; Tue, 17 Jun 2025 20:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v2] gnu: jami: Update to 20250610.0. References: <20250614054315.3451-1-gay@disroot.org> In-Reply-To: <20250614054315.3451-1-gay@disroot.org> Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 00:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78790@debbugs.gnu.org Cc: Homo Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.175020630810701 (code B ref 78790); Wed, 18 Jun 2025 00:26:02 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 00:25:08 +0000 Received: from localhost ([127.0.0.1]:38711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRgbz-0002lr-IG for submit@debbugs.gnu.org; Tue, 17 Jun 2025 20:25:08 -0400 Received: from layka.disroot.org ([178.21.23.139]:39416) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRgbv-0002ie-T7 for 78790@debbugs.gnu.org; Tue, 17 Jun 2025 20:25:05 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 51F5220BDA; Wed, 18 Jun 2025 02:25:02 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id C7pJm5desOHT; Wed, 18 Jun 2025 02:25:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750206300; bh=g4dlyKZPw4sI8LPIZziZ44bbkF6i8bX8FX/W7zmtARE=; h=From:To:Cc:Subject:Date; b=EKi7H4fvJHT4dFNeZRtbLX2AnKX7+FXSO7FpJ+zykC+XOx5Dsu5WrBb+PYbLLQp2I Kavda4dBI7axyOCjllPkRSYBED9zqtrlgBf5d4QY+nfHe8BRxHw5s/q/N4GvTdc0Gr YmgRfTnKesG6vmUh/Qel0XeJNjBUtYSdET5IdLI6woWtbHuyioZBkD21Ge2Mx7tDv6 EVREUOlMMHc+4EEFB2dycjxp2ANYOYW7pE8IZ2W6CAbP3i3z9C9ldx8526B598BPM/ i2Tf/vAvs0jNx3dXC8Zw7HElg1MkY3eSNfDwzY8Gcjf0a/og2PVoXOU7HpMMFqeUWg LrMz4tQiXh0sg== Date: Wed, 18 Jun 2025 03:24:18 +0300 Message-ID: <20250618002438.1732-1-gay@disroot.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Homo X-ACL-Warn: , Homo via Guix-patches X-Patchwork-Original-From: Homo via Guix-patches via From: Homo Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Fixes * gnu/packages/patches/jami.scm (libjami): Update to 20250610.0. [source]: Unregister libgit2 patch. [inputs]: Delete guile-3.0. [arguments] <#:configure-flags>: Delete --enable-agent. (jami): Update to 20250610.0. [source]: Add patch. [native-inputs]: Add git. [inputs]: Add hunspell and zxing-cpp. * gnu/packages/patches/jami-qwindowkit.patch, gnu/packages/patches/jami-unbundle-dependencies.patch: Update for jami 20250610.0. * gnu/local.mk: Unregister patch. Register new patch. * gnu/packages/patches/libjami-libgit2-compatibility.patch: Remove file. * gnu/packages/patches/jami-disable-webengine.patch: New file. Change-Id: I118454aa7c214271725358928b751f4d43cac2db --- gnu/local.mk | 2 +- gnu/packages/jami.scm | 26 ++++++----- .../patches/jami-disable-webengine.patch | 43 +++++++++++++++++++ gnu/packages/patches/jami-qwindowkit.patch | 2 +- .../patches/jami-unbundle-dependencies.patch | 25 ++++++++++- .../libjami-libgit2-compatibility.patch | 23 ---------- 6 files changed, 85 insertions(+), 36 deletions(-) create mode 100644 gnu/packages/patches/jami-disable-webengine.patch delete mode 100644 gnu/packages/patches/libjami-libgit2-compatibility.patch diff --git a/gnu/local.mk b/gnu/local.mk index a3feb7bc72..253c191f3d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1625,6 +1625,7 @@ dist_patch_DATA = \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/itk-snap-alt-glibc-compat.patch \ %D%/packages/patches/jamesdsp-fix-bulid-on-pipewire-1.4.0.patch\ + %D%/packages/patches/jami-disable-webengine.patch \ %D%/packages/patches/jami-enable-testing.patch \ %D%/packages/patches/jami-libjami-headers-search.patch \ %D%/packages/patches/jami-qwindowkit.patch \ @@ -1748,7 +1749,6 @@ dist_patch_DATA = \ %D%/packages/patches/libgnomeui-utf8.patch \ %D%/packages/patches/libgrss-CVE-2016-2001.patch \ %D%/packages/patches/libjami-ac-config-files.patch \ - %D%/packages/patches/libjami-libgit2-compatibility.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ %D%/packages/patches/libofa-ftbfs-1.diff \ diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index db45c9973e..d4e776df0c 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -36,6 +36,7 @@ (define-module (gnu packages jami) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages hunspell) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages markup) @@ -78,8 +79,8 @@ (define-module (gnu packages jami) ;;; When updating Jami, make sure that the patches used for ffmpeg-jami are up ;;; to date with those listed in ;;; . -(define %jami-nightly-version "20240524.0") -(define %jami-daemon-commit "fd2f2815448ce4072dcbc3995950788573d63f3b") +(define %jami-nightly-version "20250610.0") +(define %jami-daemon-commit "3280fa373a186c8cd4926849ef94d41bcf97c129") (define webrtc-audio-processing/jami ;; libjami still requires an 0.x version of this package. Remove it when @@ -152,10 +153,9 @@ (define-public libjami (file-name (git-file-name name version)) (sha256 (base32 - "1bw0laj93w4pvlxsr5abz59805ypbmg21z5393yzm82j4d35cfyr")) + "1sxrm0q4p9al6ar3svnni080cnclgf6yi9sy503n60srg47jvs87")) (patches (search-patches - "libjami-ac-config-files.patch" - "libjami-libgit2-compatibility.patch")))) + "libjami-ac-config-files.patch")))) (outputs '("out" "bin" "debug")) ;"bin' contains jamid (build-system gnu-build-system) (arguments @@ -169,7 +169,9 @@ (define-public libjami ;; execution of test plans described in Scheme. It may be useful in ;; user scripts too, until more general purpose Scheme bindings are made ;; available (see: test/agent/README.md). - #:configure-flags #~(list "--enable-agent" "--enable-debug") + ;; BROKEN: Doesn't compiler. + ;#:configure-flags #~(list "--enable-agent" "--enable-debug") + #:configure-flags #~(list "--enable-debug") #:make-flags #~(list"V=1") ;build verbosely #:phases #~(modify-phases %standard-phases @@ -203,7 +205,7 @@ (define-public libjami dhtnet eudev ffmpeg-jami - guile-3.0 + ;guile-3.0 jack-1 jsoncpp libarchive @@ -290,8 +292,9 @@ (define-public jami (file-name (git-file-name name version)) (sha256 (base32 - "1wqi50n80khyngj48brc8wg3m6jq471h9gm62yxpj4f8z5j81ncd")) + "11hydcclfllvdsd08fdmsqxldgk957rr0xyjqgr9hdh7y0l95a9a")) (patches (search-patches + "jami-disable-webengine.patch" "jami-enable-testing.patch" "jami-libjami-headers-search.patch" "jami-qwindowkit.patch" @@ -360,7 +363,8 @@ (define-public jami ;; "ctest" "-R" "Qml_Tests" ctest-args) ))))))) (native-inputs - (list googletest + (list git + googletest pkg-config python qthttpserver @@ -370,6 +374,7 @@ (define-public jami (inputs (list ffmpeg-jami glib ;for integration with GNOME + hunspell libjami libnotify libxcb @@ -385,7 +390,8 @@ (define-public jami qtsvg qwindowkit tidy-html ;used by src/app/htmlparser.h - vulkan-loader)) + vulkan-loader + zxing-cpp)) (home-page "https://jami.net") (synopsis "Qt Jami client") (description "This package provides the Jami Qt client. Jami is a secure diff --git a/gnu/packages/patches/jami-disable-webengine.patch b/gnu/packages/patches/jami-disable-webengine.patch new file mode 100644 index 0000000000..686fd58881 --- /dev/null +++ b/gnu/packages/patches/jami-disable-webengine.patch @@ -0,0 +1,43 @@ +Disable qtwebengine for good. + +--- 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(); + } + diff --git a/gnu/packages/patches/jami-qwindowkit.patch b/gnu/packages/patches/jami-qwindowkit.patch index 65248a6940..3a341a4286 100644 --- a/gnu/packages/patches/jami-qwindowkit.patch +++ b/gnu/packages/patches/jami-qwindowkit.patch @@ -13,7 +13,7 @@ index 6d2dccfb..8dedff50 100644 - TARGET qwindowkit + TARGET QWindowKit URL https://github.com/stdware/qwindowkit.git - BRANCH 79b1f3110754f9c21af2d7dacbd07b1a9dbaf6ef + BRANCH 758b00cb6c2d924be3a1ea137ec366dc33a5132d PATCHES ${QWINDOWKIT_PATCHES} OPTIONS ${QWINDOWKIT_OPTIONS} ) diff --git a/gnu/packages/patches/jami-unbundle-dependencies.patch b/gnu/packages/patches/jami-unbundle-dependencies.patch index 2732087daf..074f8ef07e 100644 --- a/gnu/packages/patches/jami-unbundle-dependencies.patch +++ b/gnu/packages/patches/jami-unbundle-dependencies.patch @@ -1,5 +1,7 @@ Forwarded here: https://lists.gnu.org/archive/html/jami/2024-01/msg00007.html +ZXing-cpp addition to patch is not sent upstream. + From a302dc0a0faf2778331745a1d01bc3071e182d4d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 8 Jan 2024 16:07:05 -0500 @@ -19,7 +21,7 @@ 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 $) # md4c @@ -62,6 +64,27 @@ index e802357f..6d2dccfb 100644 + list(APPEND CLIENT_LINK_DIRS ${tidy_BINARY_DIR}/Release) + list(APPEND CLIENT_INCLUDE_DIRS ${tidy_SOURCE_DIR}/include) + 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 diff --git a/gnu/packages/patches/libjami-libgit2-compatibility.patch b/gnu/packages/patches/libjami-libgit2-compatibility.patch deleted file mode 100644 index 20896deac4..0000000000 --- a/gnu/packages/patches/libjami-libgit2-compatibility.patch +++ /dev/null @@ -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