From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH] DRAFT: gnu: jami: Update to 20250610.0. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 Jun 2025 05:45:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78790@debbugs.gnu.org Cc: Homo X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174987986419544 (code B ref -1); Sat, 14 Jun 2025 05:45:05 +0000 Received: (at submit) by debbugs.gnu.org; 14 Jun 2025 05:44:24 +0000 Received: from localhost ([127.0.0.1]:59121 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQJgd-00053x-0N for submit@debbugs.gnu.org; Sat, 14 Jun 2025 01:44:23 -0400 Received: from lists.gnu.org ([2001:470:142::17]:37008) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uQJgT-00050n-CB for submit@debbugs.gnu.org; Sat, 14 Jun 2025 01:44:12 -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 1uQJgL-0001rB-D2 for guix-patches@gnu.org; Sat, 14 Jun 2025 01:43:57 -0400 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uQJgH-0005O5-SN for guix-patches@gnu.org; Sat, 14 Jun 2025 01:43:56 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B298925CE1; Sat, 14 Jun 2025 07:43:49 +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 n6RlalenqUjh; Sat, 14 Jun 2025 07:43:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1749879826; bh=bZPetMNpBa5sXLljoN7+2hBq/9Kdg65MN5q/11MInRM=; h=From:To:Cc:Subject:Date; b=l3xvRUCNumWwQCHG1HoyaLOWbS6iazqxL+wCEROuCOrYyT3nCCqdr1yn+xqseVX46 tNv4WibkEaCZ/kOjUax1SyVTCwpNgsLXXeHZgNMJKKL5Hgsc84hfJa61rZcXAHk271 h5qETfw6PIRUvfiOs2iWYtsoQT9Or723kSd0zrSvCJhKkttLoyG5dg1+GW24PsDMvm ar4StQM7PuwQDRKuvwqeEUQCp1/7baVz0soNNYQWBPOEfszT5TvpM0JkrJjJtudlWt vsAn+Evfxz3WZbAa4nlrTOLYF4+AALwOiWzmy2NOx5a4BCaW4yUIii8AjHWNB27w6i XtAPobdBWE4Uw== From: Homo Date: Sat, 14 Jun 2025 08:43:15 +0300 Message-ID: <20250614054315.3451-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=gay@disroot.org; helo=layka.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This update is messy, as it requires recursively updating dependencies and introducing new package zint. Everything compiles, but Jami crashes with error: client [1749878968252][FTL][7f5e2bdfe0c0]: Failed to load QML component: QUrl("qrc:/MainApplicationWindow.qml") Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org] 1.7 URIBL_BLACK Contains an URL listed in the URIBL blacklist [URIs: cmake.in] 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom; id=gay%40disroot.org; ip=2001%3A470%3A142%3A%3A17; r=debbugs.gnu.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.6 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This update is messy, as it requires recursively updating dependencies and introducing new package zint. Everything compiles, but Jami crashes with error: client [1749878968252][FTL][7f5e2bdfe0c0]: Failed to load QML component: QUrl("qrc:/MainApplicationWindow.qml") Content analysis details: (1.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.7 URIBL_BLACK Contains an URL listed in the URIBL blacklist [URIs: cmake.in] 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom;id=gay%40disroot.org;ip=2001%3A470%3A142%3A%3A17;r=debbugs.gnu.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager This update is messy, as it requires recursively updating dependencies and introducing new package zint. Everything compiles, but Jami crashes with error: client [1749878968252][FTL][7f5e2bdfe0c0]: Failed to load QML component: QUrl("qrc:/MainApplicationWindow.qml") Change-Id: Ife106a4e5fcd64b2dbb8ca4735e788e70b20aade --- gnu/local.mk | 2 +- gnu/packages/aidc.scm | 68 +++++++++++++++---- gnu/packages/cpp.scm | 4 +- gnu/packages/jami.scm | 24 ++++--- gnu/packages/networking.scm | 38 ++++++----- gnu/packages/patches/jami-qwindowkit.patch | 2 +- .../patches/jami-unbundle-dependencies.patch | 25 ++++++- .../libjami-libgit2-compatibility.patch | 23 ------- ...zint-fix-installation-of-cmake-files.patch | 39 +++++++++++ gnu/packages/telephony.scm | 6 +- 10 files changed, 160 insertions(+), 71 deletions(-) delete mode 100644 gnu/packages/patches/libjami-libgit2-compatibility.patch create mode 100644 gnu/packages/patches/zint-fix-installation-of-cmake-files.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9d75f7bbc2..77db4ca65c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1746,7 +1746,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 \ @@ -2479,6 +2478,7 @@ dist_patch_DATA = \ %D%/packages/patches/zig-0.14-fix-runpath.patch \ %D%/packages/patches/zig-0.14-use-baseline-cpu-by-default.patch \ %D%/packages/patches/zig-0.14-use-system-paths.patch \ + %D%/packages/patches/zint-fix-installation-of-cmake-files.patch \ %D%/packages/patches/zsh-egrep-failing-test.patch \ %D%/packages/patches/zuo-bin-sh.patch diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index a4816472d7..964b6ea511 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -32,6 +32,7 @@ (define-module (gnu packages aidc) #:use-module (guix utils) #:use-module (gnu packages autotools) #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages elf) #:use-module (gnu packages imagemagick) #:use-module (gnu packages gettext) @@ -49,30 +50,71 @@ (define-module (gnu packages aidc) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk)) +(define-public zint + (package + (name "zint") + (version "2.15.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zint/zint") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0arnpdqspyy3bxafm3lqc020bhwq3vazfnja2fk2s8c7mr9wimgr")) + (patches (search-patches "zint-fix-installation-of-cmake-files.patch")))) + (build-system cmake-build-system) + (arguments '(#:tests? #f ;no tests + #:configure-flags '("-DZINT_QT6=ON"))) + (native-inputs (list pkg-config qttools)) + (inputs (list qtbase qtsvg)) + (propagated-inputs (list libpng zlib)) + (synopsis "Barcode encoding library and tools") + (description "Zint is a suite of programs to allow easy encoding of data in any of the +wide range of public domain barcode standards and to allow integration of +this capability into your own programs.") + (home-page "https://github.com/zint/zint") + (license license:gpl3+))) + (define-public zxing-cpp - ;; Use the master branch as it includes unreleased build system improvements - ;; allowing to use system libraries (instead of attempting to fetch them - ;; from the Internet). - (let ((revision "0") - (commit "00783db7aa3bcf8620a301854ac71c0ceaaca0c1")) (package (name "zxing-cpp") - (version (git-version "1.2.0" revision commit)) + (version "2.3.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nu-book/zxing-cpp") - (commit commit))) + (url "https://github.com/zxing-cpp/zxing-cpp") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1yl2cpaqiv1g4nq9v0xfj1vd5faz55k4541vz6hsffvcxgn9nmc5")))) + "1hdr73fllnsp3zpmrhw6cjla39lihwg1khgvddsf4v57a0lmiy3f")))) (build-system cmake-build-system) - (native-inputs (list fmt-8 googletest)) + ;; Disable examples and tests to avoid bundled dependencies. + (arguments + (list + #:tests? #f + #:configure-flags + #~(list "-DZXING_READERS=ON" + "-DZXING_WRITERS=BOTH" + "-DZXING_BLACKBOX_TESTS=OFF" + "-DZXING_DEPENDENCIES=LOCAL" + "-DZXING_EXAMPLES=OFF" + "-DZXING_USE_BUNDLED_ZINT=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-headers + (lambda* (#:key source #:allow-other-keys) + (invoke "sh" "-c" + (string-append "cp " source "/core/src/*.h " + #$output "/include/ZXing/"))))))) + (native-inputs (list fmt-8 googletest pkg-config)) + (inputs (list zint)) (synopsis "C++ port of ZXing") (description "ZXing-CPP is a barcode scanning library.") - (home-page "https://github.com/nu-book/zxing-cpp") - (license license:asl2.0)))) + (home-page "https://github.com/zxing-cpp/zxing-cpp") + (license license:asl2.0))) ;;; This older variant is kept for gst-plugins-bad (see: ;;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1684). @@ -83,7 +125,7 @@ (define-public zxing-cpp-1.2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nu-book/zxing-cpp") + (url "https://github.com/zxing-cpp/zxing-cpp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 461070c520..68c5ebc342 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -498,7 +498,7 @@ (define-public edlib (define-public expected-lite (package (name "expected-lite") - (version "0.6.3") + (version "0.8.0") (source (origin (method git-fetch) (uri (git-reference @@ -507,7 +507,7 @@ (define-public expected-lite (file-name (git-file-name name version)) (sha256 (base32 - "0d58nqh2fwdzdpln2wlnf898wyfxdnskq6ff33azbg92d5ibzys2")))) + "0dqa6ivqqyg5c2xyp1dakqnm4mf1m4g8bsi5jscgvv82pi3zxdzh")))) (build-system cmake-build-system) (home-page "https://github.com/martinmoene/expected-lite") (synopsis "Expected objects in C++11 and later") diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index db45c9973e..5648c8fd43 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,7 +292,7 @@ (define-public jami (file-name (git-file-name name version)) (sha256 (base32 - "1wqi50n80khyngj48brc8wg3m6jq471h9gm62yxpj4f8z5j81ncd")) + "11hydcclfllvdsd08fdmsqxldgk957rr0xyjqgr9hdh7y0l95a9a")) (patches (search-patches "jami-enable-testing.patch" "jami-libjami-headers-search.patch" @@ -360,7 +362,8 @@ (define-public jami ;; "ctest" "-R" "Qml_Tests" ctest-args) ))))))) (native-inputs - (list googletest + (list git + googletest pkg-config python qthttpserver @@ -370,6 +373,7 @@ (define-public jami (inputs (list ffmpeg-jami glib ;for integration with GNOME + hunspell libjami libnotify libxcb @@ -385,7 +389,7 @@ (define-public jami qtsvg qwindowkit tidy-html ;used by src/app/htmlparser.h - 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/networking.scm b/gnu/packages/networking.scm index 85a4e48e8e..7a73547ac7 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3854,16 +3854,16 @@ (define-public restbed (define-public restinio (package (name "restinio") - (version "0.7.2") + (version "0.7.7") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/Stiffstream/restinio") - (commit (string-append "v." version)))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "03ajv1d034z6sjf2xapy8zq1mq2xkz5dqvn51vz2p26ws5axbzrn")))) + "0nzkh9kxk6mz570w4pygmfnyila5mkxcgzifi73wshd4yp7q3f3d")))) (build-system cmake-build-system) (arguments (list @@ -3882,7 +3882,6 @@ (define-public restinio (chdir "dev")))))) (native-inputs (list catch2-3 - expected-lite json-dto)) (inputs (list openssl @@ -3890,6 +3889,7 @@ (define-public restinio (propagated-inputs ;; These are all #include'd by restinio's .hpp header files. (list asio + expected-lite fmt llhttp pcre @@ -3935,22 +3935,18 @@ (define-public restinio-0.6 (replace "llhttp" http-parser))))) (define-public opendht - ;; Temporarily use the latest commit, as the latest release lacks a 'detach' - ;; procedure used by a recent DhtNet, required by Jami. - (let ((commit "318d02c55a7061a771a632ff2224b0d195a80d42") - (revision "0")) (package (name "opendht") - (version (git-version "3.1.11" revision commit)) + (version "3.4.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/savoirfairelinux/opendht") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0d4m9bxvwa1pz8r0sfrjjyml4yp5v7n4vy8ad7k4hcryyvd5npb0")))) + "069y4mgygjsfp5szfbqr7l30g7fbcqqj62h11byyq9k24rl7ilsq")))) (outputs '("out" "python" "tools" "debug")) (build-system gnu-build-system) (arguments @@ -4001,6 +3997,12 @@ (define-public opendht (("extra_link_args=\\[(.*)\\]" _ args) (string-append "extra_link_args=[" args ", '-Wl,-rpath=" #$output "/lib']"))))) + (add-after 'unpack 'pkgconfig-disable-iouring + (lambda _ + ;; This one causes configure error in dhtnet. + (substitute* "opendht.pc.in" + (("@iouring_lib@") + "")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -4030,12 +4032,13 @@ (define-public opendht readline)) (propagated-inputs (list msgpack-cxx ;included in several installed headers - restinio-0.6 ;included in opendht/http.h + restinio ;included in opendht/http.h ;; The following are listed in the 'Requires.private' field of ;; opendht.pc: argon2 gnutls jsoncpp + llhttp nettle openssl ;required for the DHT proxy python)) @@ -4072,12 +4075,12 @@ (define-public opendht @item dhtchat A very simple IM client working over the DHT. @end table") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public dhtnet ;; There is no tag nor release; use the latest available commit. - (let ((revision "3") - (commit "77331098ff663a5ac54fae7d0bedafe076c575a1")) + (let ((revision "4") + (commit "6c5ee3a21556d668d047cdedb5c4b746c3c6bdb2")) (package (name "dhtnet") ;; The base version is taken from the CMakeLists.txt file (see: @@ -4091,14 +4094,15 @@ (define-public dhtnet (file-name (git-file-name name version)) (sha256 (base32 - "1ch736misnlv2aqalj3n62gnz5xlhmip9xfv1aimp0aqinfc94p7")))) + "0np0h19gcibn9d4hyn9vjvlxjc6ma8cg8j1qxh1cam5c9i49h1xv")))) (outputs (list "out" "debug")) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DBUILD_DEPENDENCIES=OFF" "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_TESTING=ON") + "-DBUILD_TESTING=ON" + "-DDNC_SYSTEMD=OFF") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'delete-problematic-tests 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 diff --git a/gnu/packages/patches/zint-fix-installation-of-cmake-files.patch b/gnu/packages/patches/zint-fix-installation-of-cmake-files.patch new file mode 100644 index 0000000000..7bbe0b2350 --- /dev/null +++ b/gnu/packages/patches/zint-fix-installation-of-cmake-files.patch @@ -0,0 +1,39 @@ +From ba86d5d0826d221075329aaf67f1f4f8f868550f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= +Date: Fri, 11 Apr 2025 03:24:38 +0200 +Subject: [PATCH] Fix installation of cmake files + +When binaries, libs and development files like include or cmake files +are installed to different target directories then those where before +relatively installed to the binary and not in the correct directory +where other development related files where installed. + +Tested inside of nixpkgs with zxing using the system library of zint. +--- + CMakeLists.txt | 2 +- + backend/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6f7cf220..ecfe53c3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -201,4 +201,4 @@ if(ZINT_UNINSTALL) + endif() + + configure_file("zint-config.cmake.in" "zint-config.cmake" @ONLY) +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zint-config.cmake" DESTINATION "${CMAKE_INSTALL_DATADIR}/zint") ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zint-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/zint") +diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt +index 45538515..1e7e40b3 100644 +--- a/backend/CMakeLists.txt ++++ b/backend/CMakeLists.txt +@@ -131,7 +131,7 @@ endif() + if(ZINT_STATIC) + install(TARGETS zint-static EXPORT zint-targets ${INSTALL_TARGETS_DEFAULT_ARGS}) + endif() +-install(EXPORT zint-targets NAMESPACE zint:: DESTINATION "${CMAKE_INSTALL_DATADIR}/zint") ++install(EXPORT zint-targets NAMESPACE zint:: DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/zint") + install(FILES zint.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT Devel) + + if(ZINT_TEST) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 2cba0296e6..a6a43a37df 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -863,8 +863,8 @@ (define-public pjproject (license license:gpl2+))) (define-public pjproject-jami - (let ((commit "797f1a38cc1066acc4adc9561aa1288afabe72d5") - (revision "2")) + (let ((commit "8fc165b833eea6e3c88d67a541385424b129fd3f") + (revision "3")) (package (inherit pjproject) (name "pjproject-jami") @@ -885,7 +885,7 @@ (define-public pjproject-jami (file-name (git-file-name name version)) (sha256 (base32 - "1ssiffc48qg43c45fbpx86i1gbi969b8y34922z62irxbljdnc4m")))) + "146gwpkhia9d7lqk3czlrwy0m3b8d9mhi2l05gffs0i0hljrj3mq")))) (arguments (substitute-keyword-arguments (package-arguments pjproject) ((#:configure-flags _ ''()) -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH] DRAFT: gnu: jami: Update to 20250610.0. References: <20250614054315.3451-1-gay@disroot.org> In-Reply-To: <20250614054315.3451-1-gay@disroot.org> Resent-From: gay@disroot.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 Jun 2025 16:09:03 +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 Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.17499173126894 (code B ref 78790); Sat, 14 Jun 2025 16:09:03 +0000 Received: (at 78790) by debbugs.gnu.org; 14 Jun 2025 16:08:32 +0000 Received: from localhost ([127.0.0.1]:41720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQTQl-0001n7-QD for submit@debbugs.gnu.org; Sat, 14 Jun 2025 12:08:32 -0400 Received: from layka.disroot.org ([178.21.23.139]:56264) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQTQi-0001mg-Fr for 78790@debbugs.gnu.org; Sat, 14 Jun 2025 12:08:29 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id AE30725BF4 for <78790@debbugs.gnu.org>; Sat, 14 Jun 2025 18:08:26 +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 QAQ-DLyK-4Sr for <78790@debbugs.gnu.org>; Sat, 14 Jun 2025 18:08:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1749917306; bh=NYwbNwVXKBYfeBJf+kPXpLIieJmXPqlWkIkn+FcaNuI=; h=Date:From:To:Subject; b=DDxTdjt53R1imMTvzJm82FzwbAtPyGxWEkRox2i4QFIas19fxeCeYUN9cy+SWsi5f Na3t9uEZMCUif5/XBS96068J5v+pJUIi4CSFHipMDA5Ejl1dKGNdb8dOLi/snBJ5Ky OK29YmmLMVbm6yuRUMawTW5gm+hG83xj4L6xf0+53q6jCqCv/QNIhyKNwvuvx/qpXj SBUlfwEaQO3pMYWC8lbw7YXnPGxvzrjaLhEzarmka3xh2lwilS4Rv++s+VNbSwCLRc cPu7igZ9y1JEHKuKXqMDNvADJntvBdxCW2hDaR2t53gkdwckAXwP3e7CYlDwxpUaz1 UFdyMADtCGiOg== MIME-Version: 1.0 Date: Sat, 14 Jun 2025 19:08:26 +0300 From: gay@disroot.org Message-ID: X-Sender: gay@disroot.org Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Interestingly doing "guix shell qtwebengine" fixes the crash, either this is a bug or it's absolutely required dependency. From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH] DRAFT: gnu: jami: Update to 20250610.0. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 Jun 2025 19:12:01 +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: Homo Cc: 78790@debbugs.gnu.org Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.17499282837799 (code B ref 78790); Sat, 14 Jun 2025 19:12:01 +0000 Received: (at 78790) by debbugs.gnu.org; 14 Jun 2025 19:11:23 +0000 Received: from localhost ([127.0.0.1]:44554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQWHi-00021f-Sf for submit@debbugs.gnu.org; Sat, 14 Jun 2025 15:11:23 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:33920) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uQWHf-00020e-RY for 78790@debbugs.gnu.org; Sat, 14 Jun 2025 15:11:20 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id D2E1365E; Sat, 14 Jun 2025 21:11:13 +0200 (CEST) Authentication-Results: hera.aquilenet.fr; none X-Virus-Scanned: Debian amavis at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP id 2gStLS6_yY7N; Sat, 14 Jun 2025 21:11:11 +0200 (CEST) Received: from jurong (176-179-191-150.abo.bbox.fr [176.179.191.150]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 5E66D28B; Sat, 14 Jun 2025 21:11:11 +0200 (CEST) Date: Sat, 14 Jun 2025 21:11:09 +0200 From: Andreas Enge Message-ID: References: <20250614054315.3451-1-gay@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250614054315.3451-1-gay@disroot.org> X-Rspamd-Server: hera X-Rspamd-Queue-Id: D2E1365E X-Spamd-Result: default: False [-5.51 / 15.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM(-2.91)[-0.971]; MID_RHS_NOT_FQDN(0.50)[]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[] X-Rspamd-Action: no action X-Spamd-Bar: ----- X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, your patches rang a bell, and indeed the zint package also appears in https://issues.guix.gnu.org/78643 I have just pushed the version there, using the qt build system instead of the cmake build system, hoping that this would solve some problems. The same issue also proposes an update to zxing-cpp, but which causes build failures in depending packages. Notice that it is our policy that package additions, updates and so on all require a separate commit (so your original patches would have required many commits!), and please have a look at our commit log conventions. Andreas From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH] DRAFT: gnu: jami: Update to 20250610.0. Resent-From: gay@disroot.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 Jun 2025 21:36:01 +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: Andreas Enge , 78790@debbugs.gnu.org Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.174993694525875 (code B ref 78790); Sat, 14 Jun 2025 21:36:01 +0000 Received: (at 78790) by debbugs.gnu.org; 14 Jun 2025 21:35:45 +0000 Received: from localhost ([127.0.0.1]:46092 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQYXN-0006iW-NV for submit@debbugs.gnu.org; Sat, 14 Jun 2025 17:35:44 -0400 Received: from layka.disroot.org ([178.21.23.139]:52236) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQYXK-0006ht-Kk for 78790@debbugs.gnu.org; Sat, 14 Jun 2025 17:35:39 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id DFE5F25E95; Sat, 14 Jun 2025 23:35:36 +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 XJ16AXZUPL2i; Sat, 14 Jun 2025 23:35:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1749936936; bh=SlAFwXJwUelGuNd9ujmjWbOo3euJjUOztS/+TAYESiE=; h=Date:From:To:Subject:In-Reply-To:References; b=hVIuCYoVErnU1GQYoTLCyQEapVkHtbi1+SYKVf1X0YgTsdEV6a8rXKRcq0TJNns3O if0uHnShwVd2tiaf4vg3sKx9YP0qNyTVkO3KVW42gTcVAAV0dYcnbWG8Y/IXZYTthd ydr/18FbHtPkkk9At+Wrv/Oe1gzVCj1ewgjdO2mXopgCnzvAjorEdT9XTUiiLOI3Wg +OgYl33q67zP/+AyW48Zd1soVAlTTmePdmAUud1aRRHJEjhJXC5DFBfWzfUScl05AK e3XRfH61N/i/rt2AKiTew/NnDtIkVgD4aNX67tmhVK+Car9oYXGST/kj9VNkzp0SoZ BXb+Kmf5d0Xlg== MIME-Version: 1.0 Date: Sun, 15 Jun 2025 00:35:35 +0300 From: gay@disroot.org In-Reply-To: References: <20250614054315.3451-1-gay@disroot.org> Message-ID: X-Sender: gay@disroot.org Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) Hi, sorry for misunderstanding, I'm aware of conventions as I have contributed before, this messy patch is not meant for merge, it needs fixes and I didn't test whether individual upgrades don't break old version of jami or any other depending package, on top of that opendht upgrade in this patch is lacking liburing because it's difficult to switch from autotools to cmake, then in zxing-cpp cmake doesn't install all important headers like MultiFormatReader.h, so I resorted to blindly copying all headers, in jami binding to guile is broken and qtwebengine is required dependency even when disabled. In short, I have no idea how to fix those bugs, so hopefully someone can pick this up. But good news is that this new version is not affected by https://issues.guix.gnu.org/76231 BTW, zint you committed might not be detected by cmake without this patch https://raw.githubusercontent.com/NixOS/nixpkgs/refs/heads/nixos-unstable/pkgs/by-name/zi/zint/fix-installation-of-cmake-files.patch From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH] DRAFT: gnu: jami: Update to 20250610.0. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 14:50: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: gay@disroot.org Cc: 78790@debbugs.gnu.org Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.174999896025764 (code B ref 78790); Sun, 15 Jun 2025 14:50:02 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 14:49:20 +0000 Received: from localhost ([127.0.0.1]:58369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQoff-0006hT-KE for submit@debbugs.gnu.org; Sun, 15 Jun 2025 10:49:19 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:56088) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uQofc-0006gz-RE for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 10:49:18 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id B502E2BB; Sun, 15 Jun 2025 16:49:09 +0200 (CEST) Authentication-Results: hera.aquilenet.fr; none X-Virus-Scanned: Debian amavis at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP id bxZiWgElcGDn; Sun, 15 Jun 2025 16:49:09 +0200 (CEST) Received: from jurong (176-179-191-150.abo.bbox.fr [176.179.191.150]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 933A8181; Sun, 15 Jun 2025 16:49:07 +0200 (CEST) Date: Sun, 15 Jun 2025 16:49:05 +0200 From: Andreas Enge Message-ID: References: <20250614054315.3451-1-gay@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Server: hera X-Rspamd-Queue-Id: B502E2BB X-Spamd-Result: default: False [-5.49 / 15.00]; NEURAL_HAM(-2.98)[-0.994]; BAYES_HAM(-2.91)[99.61%]; MID_RHS_NOT_FQDN(0.50)[]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_TWO(0.00)[2]; TO_DN_NONE(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[] X-Rspamd-Action: no action X-Spamd-Bar: ----- X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Sun, Jun 15, 2025 at 12:35:35AM +0300 schrieb gay@disroot.org: > Hi, sorry for misunderstanding, I'm aware of conventions as I have > contributed before, this messy patch is not meant for merge, it needs fixes Okay, no problem; but I am not convinced that opening an issue is the best course of action in such a case. With QA acting upon such patch series, they become the debbugs equivalent of a pull request. Chances are we will forget about it and close it some time from now as non actionable... However, if you end up with concrete changes to merge to master, please do not hesitate to update this issue or to open a new issue with them. Andreas From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH 1/8] gnu: expected-lite: Update to 0.8.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: Sun, 15 Jun 2025 20:27: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.17500192059695 (code B ref 78790); Sun, 15 Jun 2025 20:27:02 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 20:26:45 +0000 Received: from localhost ([127.0.0.1]:33283 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQtwC-0002W4-5E for submit@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:44 -0400 Received: from layka.disroot.org ([178.21.23.139]:43602) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQtw9-0002Vd-HA for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:42 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 901DB25F98; Sun, 15 Jun 2025 22:26:39 +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 mc0fcUDJT3cJ; Sun, 15 Jun 2025 22:26:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750019198; bh=nKCpKldP/lMuGpI04ODSY2citXXUhwLa4b8cpYxaYvI=; h=From:To:Cc:Subject:Date; b=JYgRFvPq6b88v0JiAlGxwTgS6CKXbuKbeluxRu+lDdaDShS+NPJWR0TueHlJ0xJXv +1FwCNUBO3IcgF2yjquhT1+p7xeZ/qBTZIwdtbG3VeoqgGKLNZZY9EjVJe7JsOLWUV 5shDZIbPNSWE+SSJ2DA1mKNhJ3ixRISUasaob2zBNhoGAuvBgQZY4y7WQ3g3fNCrgS vTGMxD20jX2kprGSYV1mK+CxUGHGTPIhSvv/Yl8pcBLVUXJszsdq1pY6u5lZcSgGUC DTO32MV9EElPRXX2qicrMs32CUF/cxxtpObhbIemIJade31OpliB5bXndcKuDHc7o+ S36n2lOuKmhGw== From: Homo Date: Sun, 15 Jun 2025 23:26:10 +0300 Message-ID: <20250615202617.7162-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/cpp.scm (expected-lite): Update to 0.8.0. Change-Id: I50c896df694a41e5d0a2282d2112108eefc46e50 --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 461070c520..68c5ebc342 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -498,7 +498,7 @@ (define-public edlib (define-public expected-lite (package (name "expected-lite") - (version "0.6.3") + (version "0.8.0") (source (origin (method git-fetch) (uri (git-reference @@ -507,7 +507,7 @@ (define-public expected-lite (file-name (git-file-name name version)) (sha256 (base32 - "0d58nqh2fwdzdpln2wlnf898wyfxdnskq6ff33azbg92d5ibzys2")))) + "0dqa6ivqqyg5c2xyp1dakqnm4mf1m4g8bsi5jscgvv82pi3zxdzh")))) (build-system cmake-build-system) (home-page "https://github.com/martinmoene/expected-lite") (synopsis "Expected objects in C++11 and later") -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH 2/8] gnu: restinio: Update to 0.7.7. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 20:27: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.17500192089727 (code B ref 78790); Sun, 15 Jun 2025 20:27:02 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 20:26:48 +0000 Received: from localhost ([127.0.0.1]:33288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQtwF-0002Wo-Se for submit@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:48 -0400 Received: from layka.disroot.org ([178.21.23.139]:43618) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQtw9-0002Vf-HB for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:42 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 5269E25DAC; Sun, 15 Jun 2025 22:26:40 +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 jm4ydrCVKAvZ; Sun, 15 Jun 2025 22:26:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750019199; bh=ZyynaqRjImfxZNdNSal6iPj8pzI3QKMKo/IZ979LVAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hGhXFaIyCsI/1/SauwIwarTIXLup44Txs/sy3dQZWUqCm/NQTGMeDOzzuBQyQSU2o QxJ8XbdGUxyjE5iOJ51GNYe1Aj0AomfxlpgyKm1eqq3BIqmwP8kIgG7Y0FoZGIyVBM kkK3qESAkpqDOqydywpbvsMBGHwspAIHUpUbCYD/HfTqF6kSqjuZYAejMd0NSlR1BQ svsJeI+AIOPfQo0OxrXOohONn2MyimSAdi+IpRLpTJBbnNHalF5GkTKZbOlBrJYWY1 gaAHP5Qskrhn/dYmvqFrd44WmbXitcjDjztJzHobEyO7gE9idRRx9/v+fh+vteCNLP gU+WcGUaQMXUA== From: Homo Date: Sun, 15 Jun 2025 23:26:11 +0300 Message-ID: <20250615202617.7162-2-gay@disroot.org> In-Reply-To: <20250615202617.7162-1-gay@disroot.org> References: <20250615202617.7162-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/networking.scm (restinio): Update to 0.7.7. [native-inputs]: Move expected-lite to... [propagated-inputs]: ... here. Change-Id: Ifba66e16382c3ded9349f97e885960b0fb6fd286 --- gnu/packages/networking.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 66a266c823..6ef265e0eb 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3854,7 +3854,7 @@ (define-public restbed (define-public restinio (package (name "restinio") - (version "0.7.2") + (version "0.7.7") (source (origin (method git-fetch) (uri (git-reference @@ -3863,7 +3863,7 @@ (define-public restinio (file-name (git-file-name name version)) (sha256 (base32 - "03ajv1d034z6sjf2xapy8zq1mq2xkz5dqvn51vz2p26ws5axbzrn")))) + "0nzkh9kxk6mz570w4pygmfnyila5mkxcgzifi73wshd4yp7q3f3d")))) (build-system cmake-build-system) (arguments (list @@ -3882,7 +3882,6 @@ (define-public restinio (chdir "dev")))))) (native-inputs (list catch2-3 - expected-lite json-dto)) (inputs (list openssl @@ -3890,6 +3889,7 @@ (define-public restinio (propagated-inputs ;; These are all #include'd by restinio's .hpp header files. (list asio + expected-lite fmt llhttp pcre -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH 3/8] gnu: pjproject-jami: Update to 2.13.1-3.8fc165b. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 20:27:03 +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.17500192089735 (code B ref 78790); Sun, 15 Jun 2025 20:27:03 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 20:26:48 +0000 Received: from localhost ([127.0.0.1]:33290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQtwG-0002Ws-9q for submit@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:48 -0400 Received: from layka.disroot.org ([178.21.23.139]:43624) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQtwA-0002Vj-Gk for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:42 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A072526099; Sun, 15 Jun 2025 22:26:41 +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 ILjRq4FEBD3Y; Sun, 15 Jun 2025 22:26:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750019201; bh=1Z2tIwZVfb+DVgym5Ui1fzMdblJlpYWf5gQS9xjyMkc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=as027TZa97V5ZEToHhHp7H2Id89qftyUXXf2ARSffcYrGWyhfPjWWk1zV+Hj1MCqu sINGoUCp/0kTin9Tb8bybZbK41ZieCcXqlWtxu22pVcJGzwvY6gLnDU1xk1z5bm1Gc 6r2fThfOQlGsYBc0eRnGBtOJESX1NUQygp5ZroC+hRHM9Xg8iKYaK641le0lct9lRx 0+71yMU3u6gKo148uOE0phnfJ/1qwLonitEvqkOEqCoXvcmN1Xro7ZHNu5mhViw32k JR7Qvh2Ja+8tQtujkAOqrDMWOh0stsEi/zuFq2qfwv7FFT4wneWMx+nsiuRw9VsBHy sQCfyxL/4O7Rw== From: Homo Date: Sun, 15 Jun 2025 23:26:12 +0300 Message-ID: <20250615202617.7162-3-gay@disroot.org> In-Reply-To: <20250615202617.7162-1-gay@disroot.org> References: <20250615202617.7162-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/telephony (pjproject-jami): Update to 2.13.1-3.8fc165b. Change-Id: I7694ad474e55214a68071ef88996129123c64a96 --- gnu/packages/telephony.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 2cba0296e6..a6a43a37df 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -863,8 +863,8 @@ (define-public pjproject (license license:gpl2+))) (define-public pjproject-jami - (let ((commit "797f1a38cc1066acc4adc9561aa1288afabe72d5") - (revision "2")) + (let ((commit "8fc165b833eea6e3c88d67a541385424b129fd3f") + (revision "3")) (package (inherit pjproject) (name "pjproject-jami") @@ -885,7 +885,7 @@ (define-public pjproject-jami (file-name (git-file-name name version)) (sha256 (base32 - "1ssiffc48qg43c45fbpx86i1gbi969b8y34922z62irxbljdnc4m")))) + "146gwpkhia9d7lqk3czlrwy0m3b8d9mhi2l05gffs0i0hljrj3mq")))) (arguments (substitute-keyword-arguments (package-arguments pjproject) ((#:configure-flags _ ''()) -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH 4/8] gnu: opendht: Update to 3.4.0. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 20:27:03 +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.17500192099743 (code B ref 78790); Sun, 15 Jun 2025 20:27:03 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 20:26:49 +0000 Received: from localhost ([127.0.0.1]:33292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQtwG-0002Wy-Ol for submit@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:49 -0400 Received: from layka.disroot.org ([178.21.23.139]:43630) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQtwB-0002Vv-JX for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:44 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B10A0260BC; Sun, 15 Jun 2025 22:26:42 +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 gCFNLnuHeL2h; Sun, 15 Jun 2025 22:26:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750019201; bh=KoQe9XZnpMp2KmyCmSQead5AvcHxfgLxKdXbT8vUaNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=O6lg9IvVUe8lZWSFXY1xq9XCUVsop18HpCzxtI5z5jgSydN8NTEN9JadEXmG1ggBT sfV4Sa2VWid+gQwlsLszdAbNbVKhC7YRoI6oNPZMBI1gI6HWO2oZlVUqXfxKz9pT3M 1jK5yoniulGZyAliHY3y4kKbLJL5x3GAQzIHpCmgPVgeJB6FP9u4ojV2ku6GDvRJfN FEX8QJtJ0PG6XfOdWBUTpo5svSAdohG54v3P66Cvxe6fyMcZgVgE0SkKDcTzH//2rh J2X6kGWbh2jjPLUfV1hJTMcVBFA5fKexLg3CuSwAophQpSoh60CweCzekVW4GU0/5+ qpHFlVMAECTfQ== From: Homo Date: Sun, 15 Jun 2025 23:26:13 +0300 Message-ID: <20250615202617.7162-4-gay@disroot.org> In-Reply-To: <20250615202617.7162-1-gay@disroot.org> References: <20250615202617.7162-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/networking.scm (opendht): Update to 3.4.0. [version]: Do not use git-version. [inputs]: Replace restinio-0.6 by restinio. Add llhttp. [arguments] <#:phases> {pkgconfig-disable-iouring}: New phase. Change-Id: I6fed7fe1c8ba0d75d0dca8406010f7c8dd89609e --- gnu/packages/networking.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 6ef265e0eb..594991efea 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3935,22 +3935,18 @@ (define-public restinio-0.6 (replace "llhttp" http-parser))))) (define-public opendht - ;; Temporarily use the latest commit, as the latest release lacks a 'detach' - ;; procedure used by a recent DhtNet, required by Jami. - (let ((commit "318d02c55a7061a771a632ff2224b0d195a80d42") - (revision "0")) (package (name "opendht") - (version (git-version "3.1.11" revision commit)) + (version "3.4.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/savoirfairelinux/opendht") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0d4m9bxvwa1pz8r0sfrjjyml4yp5v7n4vy8ad7k4hcryyvd5npb0")))) + "069y4mgygjsfp5szfbqr7l30g7fbcqqj62h11byyq9k24rl7ilsq")))) (outputs '("out" "python" "tools" "debug")) (build-system gnu-build-system) (arguments @@ -4001,6 +3997,13 @@ (define-public opendht (("extra_link_args=\\[(.*)\\]" _ args) (string-append "extra_link_args=[" args ", '-Wl,-rpath=" #$output "/lib']"))))) + ;; TODO: build with liburing, requires cmake or meson. + (add-after 'unpack 'pkgconfig-disable-iouring + (lambda _ + ;; This one causes configure error in dhtnet. + (substitute* "opendht.pc.in" + (("@iouring_lib@") + "")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -4030,12 +4033,13 @@ (define-public opendht readline)) (propagated-inputs (list msgpack-cxx ;included in several installed headers - restinio-0.6 ;included in opendht/http.h + restinio ;included in opendht/http.h ;; The following are listed in the 'Requires.private' field of ;; opendht.pc: argon2 gnutls jsoncpp + llhttp nettle openssl ;required for the DHT proxy python)) @@ -4072,7 +4076,7 @@ (define-public opendht @item dhtchat A very simple IM client working over the DHT. @end table") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public dhtnet ;; There is no tag nor release; use the latest available commit. -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH 5/8] gnu: dhtnet: Update to 0.0.1-4.6c5ee3a. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 20:27:04 +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.17500192099753 (code B ref 78790); Sun, 15 Jun 2025 20:27:04 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 20:26:49 +0000 Received: from localhost ([127.0.0.1]:33294 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQtwH-0002X5-4S for submit@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:49 -0400 Received: from layka.disroot.org ([178.21.23.139]:43646) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQtwB-0002W2-Vm for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:44 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1BE3E25DAC; Sun, 15 Jun 2025 22:26:43 +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 gdtW7dmg0Frq; Sun, 15 Jun 2025 22:26:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750019202; bh=jt2IPAOAGwGBnxjw6ekk8dM+jgPM7ZpDNDYgVL4n7/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=I7VEZ6wTVT5Mck5djH4dzHUu8di9tZGEQ0YRv/U9g4sHe9kGY3KBOhcR259YzozgL MaBZVX3UajoCOgJ0hG5DeItPmXKSRvUxAKtBxlkPzSiPrHyt1Fz9jPv7y6yBMvT1F6 qrM24GCZsTVU10iIuIFX10n8RpGzHH3Z7fWe7slI10jruRTgjpcTotUMAPu9Yzgx6F 5n2kEE/x0JFTBzlk7nl3CuZKBOIAQjcN8Rh1yvhVlbku+U6tVZ6BTyLDk17gIPjgVa 0jm47wqxdbLzOY3GlW/2KrNiQPXxZZc4gNjxDdU5a/t0k7wG72Qr0iTLyqc39+TeqV 34S31QdzNXHUQ== From: Homo Date: Sun, 15 Jun 2025 23:26:14 +0300 Message-ID: <20250615202617.7162-5-gay@disroot.org> In-Reply-To: <20250615202617.7162-1-gay@disroot.org> References: <20250615202617.7162-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/networking.scm (dhtnet): Update to 0.0.1-4.6c5ee3a. [arguments] <#:configure-flags>: Add -DDNC_SYSTEMD=OFF. Change-Id: I57187bd254cf2dc5f9a4ba874b80411acf2f44d9 --- gnu/packages/networking.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 594991efea..f1609a9aa4 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4080,8 +4080,8 @@ (define-public opendht (define-public dhtnet ;; There is no tag nor release; use the latest available commit. - (let ((revision "3") - (commit "77331098ff663a5ac54fae7d0bedafe076c575a1")) + (let ((revision "4") + (commit "6c5ee3a21556d668d047cdedb5c4b746c3c6bdb2")) (package (name "dhtnet") ;; The base version is taken from the CMakeLists.txt file (see: @@ -4095,14 +4095,15 @@ (define-public dhtnet (file-name (git-file-name name version)) (sha256 (base32 - "1ch736misnlv2aqalj3n62gnz5xlhmip9xfv1aimp0aqinfc94p7")))) + "0np0h19gcibn9d4hyn9vjvlxjc6ma8cg8j1qxh1cam5c9i49h1xv")))) (outputs (list "out" "debug")) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DBUILD_DEPENDENCIES=OFF" "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_TESTING=ON") + "-DBUILD_TESTING=ON" + "-DDNC_SYSTEMD=OFF") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'delete-problematic-tests -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH 6/8] gnu: zxing-cpp: Update to 2.3.0. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 20:27:05 +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.17500192109763 (code B ref 78790); Sun, 15 Jun 2025 20:27:05 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 20:26:50 +0000 Received: from localhost ([127.0.0.1]:33296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQtwH-0002XH-Jx for submit@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:50 -0400 Received: from layka.disroot.org ([178.21.23.139]:43662) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQtwD-0002WE-32 for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:46 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3912C2607C; Sun, 15 Jun 2025 22:26:44 +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 XiUuX9tgI9ps; Sun, 15 Jun 2025 22:26:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750019203; bh=9FfSpS+UpLy2Mc1E/2UogwD5O3PinTjXc8WrXinlH4E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WAR6VyNW4EdZyaGrYKTYzd+d7sDHZeJbnOiL/Zvsh1r5ONWfLjjkeIoqZBAeQM3gT X066+Q5T20bo9b06duniViqMJPpalYS8aFuYWVwit1PcmjeyBCDI5C4C4ggMbN9Exz dksfvIIGmgxNNs9HkRkyJeOAyPexjwsdN9ooKwBZevu5Uxd76UCRZJVs+vHnouhiTi lsGMvl2nFYMQhB5ldRUFMkGDIpaOkLUQx5C2YjWP5Mj+IQzP+5tpTvI3PWeykuf8p2 syZEjkn8gHEiVZN7o4KeiQrkE9R4GGEghOsBJRG0KaJIN/A5bEuoYFVyr1AQJY08HK Er4opfYJ1qSVg== From: Homo Date: Sun, 15 Jun 2025 23:26:15 +0300 Message-ID: <20250615202617.7162-6-gay@disroot.org> In-Reply-To: <20250615202617.7162-1-gay@disroot.org> References: <20250615202617.7162-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/aidc.scm (zxing-cpp): Update to 2.3.0. [version]: Do not use git-version. [source]: Update URL. [native-inputs]: Add pkg-config. [inputs]: Add libpng, zint and zlib. [arguments] <#:configure-flags>: Add -DZXING_READERS=ON, -DZXING_WRITERS=BOTH, -DZXING_DEPENDENCIES=LOCAL, -DZXING_EXAMPLES=OFF, -DZXING_USE_BUNDLED_ZINT=OFF and -DZXING_UNIT_TESTS=ON. <#:phases> (install-headers): New phase. (zxing-cpp-1.2a): New variable. (zxing-cpp-1.2) [source]: Update URL. * gnu/packages/linphone.scm (liblinphone)[inputs]: Replace zxing-cpp with zxing-cpp-1.2a. * gnu/packages/messaging.scm (kaidan)[inputs]: Likewise. Change-Id: Ib03af79feef03f9c9e1a5b97d39b7d6c18d3ff1d --- gnu/packages/aidc.scm | 53 +++++++++++++++++++++++++++++++------- gnu/packages/linphone.scm | 2 +- gnu/packages/messaging.scm | 2 +- 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index c48e800b77..bd55ce74ff 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -32,6 +32,7 @@ (define-module (gnu packages aidc) #:use-module (guix utils) #:use-module (gnu packages autotools) #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages elf) #:use-module (gnu packages imagemagick) #:use-module (gnu packages gettext) @@ -83,29 +84,63 @@ (define-public zint (license (list license:bsd-3 license:gpl3+)))) (define-public zxing-cpp + (package + (name "zxing-cpp") + (version "2.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zxing-cpp/zxing-cpp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hdr73fllnsp3zpmrhw6cjla39lihwg1khgvddsf4v57a0lmiy3f")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list "-DZXING_READERS=ON" + "-DZXING_WRITERS=BOTH" + "-DZXING_DEPENDENCIES=LOCAL" + "-DZXING_EXAMPLES=OFF" ;requires stb.pc + "-DZXING_USE_BUNDLED_ZINT=OFF" + "-DZXING_UNIT_TESTS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-headers + (lambda* (#:key source #:allow-other-keys) + (invoke "sh" "-c" + (string-append "cp " source "/core/src/*.h " + #$output "/include/ZXing/"))))))) + (native-inputs (list fmt-8 googletest pkg-config)) + (inputs (list libpng zint zlib)) + (synopsis "C++ port of ZXing") + (description "ZXing-CPP is a barcode scanning library.") + (home-page "https://github.com/zxing-cpp/zxing-cpp") + (license license:asl2.0))) + +;;; This older variant is kept for kaidan, liblinphone and yosys-clang. +(define-public zxing-cpp-1.2a ;; Use the master branch as it includes unreleased build system improvements ;; allowing to use system libraries (instead of attempting to fetch them ;; from the Internet). (let ((revision "0") (commit "00783db7aa3bcf8620a301854ac71c0ceaaca0c1")) - (package + (package/inherit zxing-cpp (name "zxing-cpp") (version (git-version "1.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nu-book/zxing-cpp") + (url "https://github.com/zxing-cpp/zxing-cpp") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 "1yl2cpaqiv1g4nq9v0xfj1vd5faz55k4541vz6hsffvcxgn9nmc5")))) - (build-system cmake-build-system) - (native-inputs (list fmt-8 googletest)) - (synopsis "C++ port of ZXing") - (description "ZXing-CPP is a barcode scanning library.") - (home-page "https://github.com/nu-book/zxing-cpp") - (license license:asl2.0)))) + (arguments '(#:configure-flags '())) + (native-inputs (list fmt-8 googletest))))) ;;; This older variant is kept for gst-plugins-bad (see: ;;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1684). @@ -116,7 +151,7 @@ (define-public zxing-cpp-1.2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nu-book/zxing-cpp") + (url "https://github.com/zxing-cpp/zxing-cpp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 239c18c595..24cd6bbcc8 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -802,7 +802,7 @@ (define-public liblinphone sqlite xsd zlib - zxing-cpp)) + zxing-cpp-1.2a)) (synopsis "Belledonne Communications Softphone Library") (description "Liblinphone is a high-level SIP library integrating all calling and instant messaging features into an unified diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c2928c0042..bddc4786cd 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1515,7 +1515,7 @@ (define-public kaidan qqc2-desktop-style qxmpp sonnet - zxing-cpp)) + zxing-cpp-1.2a)) (home-page "https://www.kaidan.im/") (synopsis "Qt-based XMPP/Jabber Client") (description "Kaidan is a chat client. It uses the open communication -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH 7/8] gnu: jami: Update to 20250610.0. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 20:27:06 +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.17500192129776 (code B ref 78790); Sun, 15 Jun 2025 20:27:06 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 20:26:52 +0000 Received: from localhost ([127.0.0.1]:33298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQtwJ-0002XX-Dg for submit@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:52 -0400 Received: from layka.disroot.org ([178.21.23.139]:45828) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQtwE-0002WR-Mg for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:47 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id D13BB25DB2; Sun, 15 Jun 2025 22:26:45 +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 Hjytkk-o1Sfn; Sun, 15 Jun 2025 22:26:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750019203; bh=kv3kbc567gi2444H+CA46aJpeTF31A4kToRE9PgVS/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VcF9VowagIoQDsYxX8Sl7nAqzR4BtvB/O93Be2/4CzG/Vb2xCoOsaeRKhH6lzgaOl sS+78Dqvfli2UwhMqb/7mROxKqLOfqxxwek+F8xRiZdGzuTogf0TFx6iMh2/m5J3oW ASxx0PsWrka5JPFpqBMPOtDS3pwauaKnBia5XHu5rAPuvDy7EPhqUKKnD1PUjNlfnG 4snTIsAaSgCupyyfKTRCZ4GFCFLhKjpFkLy8P1kkZmQpsme2PAoF7Pwxc2/Oa2aQjS dpu3iluRDOBQc2c36+/nRGHAfCYn/ea55jIfuiGE3jKWHYOvWotLH96//nbEJLaDCO rPOcpU0xZwOCw== From: Homo Date: Sun, 15 Jun 2025 23:26:16 +0300 Message-ID: <20250615202617.7162-7-gay@disroot.org> In-Reply-To: <20250615202617.7162-1-gay@disroot.org> References: <20250615202617.7162-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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. [native-inputs]: Add git. [inputs]: Add hunspell and zxing-cpp. [propagated-inputs]: Add qtwebengine. * gnu/packages/patches/jami-qwindowkit.patch, gnu/packages/patches/jami-unbundle-dependencies.patch: Update for jami 20250610.0. * gnu/local.mk: Unregister patch. * gnu/packages/patches/libjami-libgit2-compatibility.patch: Remove file. Change-Id: I118454aa7c214271725358928b751f4d43cac2db --- gnu/local.mk | 1 - gnu/packages/jami.scm | 26 ++++++++++++------- gnu/packages/patches/jami-qwindowkit.patch | 2 +- .../patches/jami-unbundle-dependencies.patch | 25 +++++++++++++++++- .../libjami-libgit2-compatibility.patch | 23 ---------------- 5 files changed, 41 insertions(+), 36 deletions(-) delete mode 100644 gnu/packages/patches/libjami-libgit2-compatibility.patch diff --git a/gnu/local.mk b/gnu/local.mk index a3feb7bc72..68ba49fa3f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1748,7 +1748,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..56f50ec37a 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,7 +292,7 @@ (define-public jami (file-name (git-file-name name version)) (sha256 (base32 - "1wqi50n80khyngj48brc8wg3m6jq471h9gm62yxpj4f8z5j81ncd")) + "11hydcclfllvdsd08fdmsqxldgk957rr0xyjqgr9hdh7y0l95a9a")) (patches (search-patches "jami-enable-testing.patch" "jami-libjami-headers-search.patch" @@ -360,7 +362,8 @@ (define-public jami ;; "ctest" "-R" "Qml_Tests" ctest-args) ))))))) (native-inputs - (list googletest + (list git + googletest pkg-config python qthttpserver @@ -370,6 +373,7 @@ (define-public jami (inputs (list ffmpeg-jami glib ;for integration with GNOME + hunspell libjami libnotify libxcb @@ -385,7 +389,9 @@ (define-public jami qtsvg qwindowkit tidy-html ;used by src/app/htmlparser.h - vulkan-loader)) + vulkan-loader + zxing-cpp)) + (propagated-inputs (list qtwebengine)) ;bug (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-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 -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH 8/8] gnu: Remove restinio-0.6. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 20:27:07 +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.17500192129783 (code B ref 78790); Sun, 15 Jun 2025 20:27:07 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 20:26:52 +0000 Received: from localhost ([127.0.0.1]:33300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQtwK-0002Xd-5s for submit@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:52 -0400 Received: from layka.disroot.org ([178.21.23.139]:45834) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQtwF-0002WX-7y for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 16:26:47 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4511B25F98; Sun, 15 Jun 2025 22:26:46 +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 Hdv4GmrDKs9I; Sun, 15 Jun 2025 22:26:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750019205; bh=MdwBVkizOpbzCA7VXqYXReQPNmfH3qNIBdeuASpmbSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fOfPotK/lkNU8Mf0XBati0GXQPbS/kaIAJge9iV7Q2ItKj8ooqIib6m1EE5405f0T XNwQpEK32e8PmRsBE3BSZbIh/pM426fiL4a/NjKDDlwOYi5n0T7WFULPSj+Y6WG2x2 kxfvUjRpn12IrRsjYtA5ie6heUgCJGeX7+jxP47Us+rLqOor1gU+Ez6ndvzangiXWR zIEzlJnAO9Ho5fJVqcwpPEYRXppzuP6H2YpibBBjwvtbKlN54qBMReKgilXNI2rDhg gINsu2PFLuKPVwrXnipky7bsLgyRG5j9ltwv5hy6CbAOFeKgAGYnFwlT2LHHZPj7Q2 fohw9kIHsd2/A== From: Homo Date: Sun, 15 Jun 2025 23:26:17 +0300 Message-ID: <20250615202617.7162-8-gay@disroot.org> In-Reply-To: <20250615202617.7162-1-gay@disroot.org> References: <20250615202617.7162-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/networking.scm (restinio-0.6): Delete variable. Change-Id: Ic4dd1b99ddeb17027ae6e732190a4e8a818e9a40 --- gnu/packages/networking.scm | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f1609a9aa4..ddcbf424d6 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3902,38 +3902,6 @@ (define-public restinio and targeted primarily for asynchronous processing of HTTP-requests.") (license license:bsd-3))) -(define-public restinio-0.6 - (package - (inherit restinio) - (name "restinio") - (version "0.6.19") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Stiffstream/restinio") - (commit (string-append "v." version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1qrb1qr075r5059w984c4slgpsiwv94j6fmi9naa5l48dbi1p7jz")))) - (arguments - (list - #:configure-flags #~(list "-DRESTINIO_FIND_DEPS=ON" - "-DRESTINIO_INSTALL=ON" - "-DRESTINIO_TEST=ON" - "-DRESTINIO_USE_EXTERNAL_HTTP_PARSER=ON" - "-DRESTINIO_USE_EXTERNAL_SOBJECTIZER=ON") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "dev")))))) - (native-inputs (list catch2 clara json-dto)) - ;; These are all #include'd by restinio's .hpp header files. - (propagated-inputs - (modify-inputs (package-propagated-inputs restinio) - (replace "llhttp" http-parser))))) - (define-public opendht (package (name "opendht") -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH] DRAFT: gnu: jami: Update to 20250610.0. Resent-From: gay@disroot.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Jun 2025 21:17: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: Andreas Enge , 78790@debbugs.gnu.org Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.175002218626348 (code B ref 78790); Sun, 15 Jun 2025 21:17:02 +0000 Received: (at 78790) by debbugs.gnu.org; 15 Jun 2025 21:16:26 +0000 Received: from localhost ([127.0.0.1]:33950 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uQuiH-0006qp-Hz for submit@debbugs.gnu.org; Sun, 15 Jun 2025 17:16:26 -0400 Received: from layka.disroot.org ([178.21.23.139]:34270) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uQuiF-0006qA-8g for 78790@debbugs.gnu.org; Sun, 15 Jun 2025 17:16:24 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4476C25F77; Sun, 15 Jun 2025 23:16:21 +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 uE0WB7uL2uzF; Sun, 15 Jun 2025 23:16:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750022180; bh=35FoHt724owQhSZYBPZwFo09tkF46ecnod9sjGVlDyw=; h=Date:From:To:Subject:In-Reply-To:References; b=TWzx7VhROaSQEjVL9VpW6S9GL2+a175yac6OQ4gNekEoouKHUvn738WJnt1aIlbi+ OWF/tFD0PBRiUqRASoxNXWKFW8q1zQ5r46sedHNep7EgJ+AyW2PoCY8l39t39m64TR gs/VuIn+XgKQEEMoJaMeNzYNh3Ig/a9s5thACKSVnlzynmzPSNj5vshzowNiQefuPT 6g0urTzUgxw+QdZ4BtJMM69WvcVELqkvMce8GohzWNoc6V9LE6sw94+Iz/XMGeUg3F oNKzj6YbaEO6d/UJ6GpJuuX7g55Cwu2yORbQh7yilTHuBqdsgInrUqYe5TGESTNNzW hgutNSEAMHqJw== MIME-Version: 1.0 Date: Mon, 16 Jun 2025 00:16:20 +0300 From: gay@disroot.org In-Reply-To: References: <20250614054315.3451-1-gay@disroot.org> Message-ID: <905cfa7f70c5973ef3ebd05f3f6cb0d4@disroot.org> X-Sender: gay@disroot.org Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Alright, mostly these separate patches should be good to go if they don't break dependants, but I didn't test that because my laptop is taking too long to build anything, issues with opendht and zxing-cpp might not be critical, but for privacy reasons I'd still prefer to wait for someone to step in here and dehardcode webengine from jami. From unknown Sun Jun 22 07:42:14 2025 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== From: Homo Date: Wed, 18 Jun 2025 03:24:18 +0300 Message-ID: <20250618002438.1732-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v2] gnu: jami: Update to 20250610.0. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 08:29: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: Homo Cc: Giovanni Biscuolo , 78790@debbugs.gnu.org, Maxim Cournoyer Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.175023531221798 (code B ref 78790); Wed, 18 Jun 2025 08:29:02 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 08:28:32 +0000 Received: from localhost ([127.0.0.1]:45240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRo9o-0005fU-3J for submit@debbugs.gnu.org; Wed, 18 Jun 2025 04:28:32 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:40906) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uRo9k-0005eb-KR for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 04:28:29 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 8C406156; Wed, 18 Jun 2025 10:28:21 +0200 (CEST) Authentication-Results: hera.aquilenet.fr; none X-Virus-Scanned: Debian amavis at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP id 4t89DzdOsh87; Wed, 18 Jun 2025 10:28:21 +0200 (CEST) Received: from jurong (176-179-191-150.abo.bbox.fr [176.179.191.150]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 9B23D131; Wed, 18 Jun 2025 10:28:20 +0200 (CEST) Date: Wed, 18 Jun 2025 10:28:19 +0200 From: Andreas Enge Message-ID: References: <20250618002438.1732-1-gay@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250618002438.1732-1-gay@disroot.org> X-Rspamd-Server: hera X-Rspamd-Queue-Id: 8C406156 X-Spamd-Result: default: False [-1.14 / 15.00]; NEURAL_HAM(-2.97)[-0.988]; SUSPICIOUS_RECIPS(1.50)[]; MID_RHS_NOT_FQDN(0.50)[]; MIME_GOOD(-0.10)[text/plain]; BAYES_HAM(-0.08)[63.33%]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TAGGED_RCPT(0.00)[]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; RCPT_COUNT_THREE(0.00)[4]; FREEMAIL_CC(0.00)[debbugs.gnu.org,gmail.com,xelera.eu] X-Rspamd-Action: no action X-Spamd-Bar: - X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, cc-ing two persons who might be interested in a review of this submission. Andreas From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v2] gnu: jami: Update to 20250610.0. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 08:58:01 +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: Homo Cc: Giovanni Biscuolo , 78790@debbugs.gnu.org, Maxim Cournoyer Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.17502370711870 (code B ref 78790); Wed, 18 Jun 2025 08:58:01 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 08:57:51 +0000 Received: from localhost ([127.0.0.1]:45620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRocA-0000U5-Sx for submit@debbugs.gnu.org; Wed, 18 Jun 2025 04:57:51 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:35618) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uRoc7-0000TF-MZ for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 04:57:48 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id C95AD236; Wed, 18 Jun 2025 10:57:41 +0200 (CEST) Authentication-Results: hera.aquilenet.fr; none X-Virus-Scanned: Debian amavis at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP id GvkI48Q1mfSu; Wed, 18 Jun 2025 10:57:41 +0200 (CEST) Received: from jurong (176-179-191-150.abo.bbox.fr [176.179.191.150]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 05EC0185; Wed, 18 Jun 2025 10:57:40 +0200 (CEST) Date: Wed, 18 Jun 2025 10:57:39 +0200 From: Andreas Enge Message-ID: References: <20250618002438.1732-1-gay@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Server: hera X-Rspamd-Queue-Id: C95AD236 X-Spamd-Result: default: False [-3.80 / 15.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM(-2.70)[-0.901]; SUSPICIOUS_RECIPS(1.50)[]; MID_RHS_NOT_FQDN(0.50)[]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TAGGED_RCPT(0.00)[]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; RCPT_COUNT_THREE(0.00)[4]; FREEMAIL_CC(0.00)[debbugs.gnu.org,gmail.com,xelera.eu] X-Rspamd-Action: no action X-Spamd-Bar: --- X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) libjami fails to build on QA: https://qa.guix.gnu.org/issue/78790 Did you try the builds locally? Andreas From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v2] gnu: jami: Update to 20250610.0. Resent-From: gay@disroot.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 11:44: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: Andreas Enge , 78790@debbugs.gnu.org, Maxim Cournoyer , Giovanni Biscuolo Received: via spool by 78790-submit@debbugs.gnu.org id=B78790.175024701519798 (code B ref 78790); Wed, 18 Jun 2025 11:44:02 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:43:35 +0000 Received: from localhost ([127.0.0.1]:47906 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrCY-00059F-Mm for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:43:34 -0400 Received: from layka.disroot.org ([178.21.23.139]:36954) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrCV-00058W-V7 for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:43:32 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id AF37F25C7A; Wed, 18 Jun 2025 13:43:29 +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 RMly1YCRU3Yt; Wed, 18 Jun 2025 13:43:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247009; bh=VMXbNFeI0NF7xBWTFlF4vM0ZrEP1Bgx4fqqL0ymaZfU=; h=Date:From:To:Subject:In-Reply-To:References; b=hardQPpbHBD3S2Iak5UocojZy4JQqiy8P/aH9wXO2UqCTsWtj5YYXa/h/bIcmRpTk W/wXDw8lnVbJe6ZHRk2vTVMt6E9zb0uSZkzmcns9C2M4jvb6lRrehMr6QrfVitoGS0 QuxWEhR9vMXQHn3SVSrkxZs07ExeYvP8VaU3bvJMjdS1AS/4mpleQOGoHiv0IYgAvR TB1Q1snf2SomS1Kk/BjsJtjTo6qmle9HOVLUSO1vH58I8ZVEEeSMqSSx9KOrmAfcZu gC1+sEUvO6rE4wxOzmQr2TZ/GGn1UEcG+CsoX7k8KBz1sRBp0qNFkEjz6c0MMq/jvO +9UzQlQvfJ9hA== MIME-Version: 1.0 Date: Wed, 18 Jun 2025 14:43:29 +0300 From: gay@disroot.org In-Reply-To: References: <20250618002438.1732-1-gay@disroot.org> Message-ID: <22320dc033fdb0be2bd7aba51e225030@disroot.org> X-Sender: gay@disroot.org Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, yes, I built it before submitting and run it right now, looking at that link updates I submitted as series of patches before v2 to expected-lite, restinio, pjproject-jami, opendht, dhtnet and zxing-cpp were not applied, it is absolutely necessary to apply those patches first before updating libjami and jami, it demands recursively updating dependencies. From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 2/8] gnu: restinio: Update to 0.7.7. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 11:56: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.175024773224941 (code B ref 78790); Wed, 18 Jun 2025 11:56:02 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:32 +0000 Received: from localhost ([127.0.0.1]:48111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrO6-0006Ti-Me for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:31 -0400 Received: from layka.disroot.org ([178.21.23.139]:46488) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO4-0006TG-MH for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:29 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 400A425CA7; Wed, 18 Jun 2025 13:55:27 +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 DDY15QmtY8XB; Wed, 18 Jun 2025 13:55:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247726; bh=ZyynaqRjImfxZNdNSal6iPj8pzI3QKMKo/IZ979LVAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QDOh6f3AvQzJSgabyiGkve6gAV0cRQKp03Z75ihA4esmXEN1ehkCU35Dt8DA0DkAm NJ2NtLYuMw57A4pzJ9MYDaSZtHeVUVwHaIhJ+H2dmr17+UlbvJ1d1nAm4mywrPQTwR lXszz/O5FVbAPEw7wI5PuWoumOoOuo7/xcgcTmLRvObOzMB1YU+0iBQEKVXiKFFFT1 P04mfDWuFHvF5SUw53Hsip1a6eDNL2VlLF96HrXHVrOEs0kvCrL85CtW2H5xVlTaFx kFwb79sG4MAjt0dc3qw/maQKmZZYnib7zz8XzbJVQYr/hpD0M8AM3/lg/f1e1E9h2d tSlbx3Y4IerIQ== From: Homo Date: Wed, 18 Jun 2025 14:54:34 +0300 Message-ID: <20250618115507.4993-2-gay@disroot.org> In-Reply-To: <20250618115507.4993-1-gay@disroot.org> References: <20250618115507.4993-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/networking.scm (restinio): Update to 0.7.7. [native-inputs]: Move expected-lite to... [propagated-inputs]: ... here. Change-Id: Ifba66e16382c3ded9349f97e885960b0fb6fd286 --- gnu/packages/networking.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 66a266c823..6ef265e0eb 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3854,7 +3854,7 @@ (define-public restbed (define-public restinio (package (name "restinio") - (version "0.7.2") + (version "0.7.7") (source (origin (method git-fetch) (uri (git-reference @@ -3863,7 +3863,7 @@ (define-public restinio (file-name (git-file-name name version)) (sha256 (base32 - "03ajv1d034z6sjf2xapy8zq1mq2xkz5dqvn51vz2p26ws5axbzrn")))) + "0nzkh9kxk6mz570w4pygmfnyila5mkxcgzifi73wshd4yp7q3f3d")))) (build-system cmake-build-system) (arguments (list @@ -3882,7 +3882,6 @@ (define-public restinio (chdir "dev")))))) (native-inputs (list catch2-3 - expected-lite json-dto)) (inputs (list openssl @@ -3890,6 +3889,7 @@ (define-public restinio (propagated-inputs ;; These are all #include'd by restinio's .hpp header files. (list asio + expected-lite fmt llhttp pcre -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 3/8] gnu: pjproject-jami: Update to 2.13.1-3.8fc165b. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 11:56:03 +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.175024774125027 (code B ref 78790); Wed, 18 Jun 2025 11:56:03 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:41 +0000 Received: from localhost ([127.0.0.1]:48117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrOG-0006VY-Su for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:41 -0400 Received: from layka.disroot.org ([178.21.23.139]:46500) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO4-0006TJ-P0 for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:29 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id BC72B25C17; Wed, 18 Jun 2025 13:55:27 +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 8Ef-nmQhs15B; Wed, 18 Jun 2025 13:55:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247727; bh=1Z2tIwZVfb+DVgym5Ui1fzMdblJlpYWf5gQS9xjyMkc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jieHkaooGqTuVfZKCpAUOwnDmJWoS9nqu+eoamanDvG5l3Rih/fLGXe9DPX72NXIp dXAlLj/K7tDuTqc2N3VjJdahFUhx8T/v3iMkogzZ+o+C10l4EB+abH50XSbnG1ZqUT vZ7O4eoAZT0raJ2hSg5qy9eRTUYfpwLTvrZSm6EXBQqYxOqj59wpfiWZW503d3IrDx x7gqTW1QI9eTkzXYDzKwWdnRd8NmcoRXi3aDiDGKMvwmUbFPI0KDDvLulV/Os5AMI3 YrJQ/WmSSVMHInyQK501xrb2tk1i63/4SoC8RLdMzPeEX2GsNNtX5tY1m5lvaeAp2u LIovE4pugB9EA== From: Homo Date: Wed, 18 Jun 2025 14:54:35 +0300 Message-ID: <20250618115507.4993-3-gay@disroot.org> In-Reply-To: <20250618115507.4993-1-gay@disroot.org> References: <20250618115507.4993-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/telephony (pjproject-jami): Update to 2.13.1-3.8fc165b. Change-Id: I7694ad474e55214a68071ef88996129123c64a96 --- gnu/packages/telephony.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 2cba0296e6..a6a43a37df 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -863,8 +863,8 @@ (define-public pjproject (license license:gpl2+))) (define-public pjproject-jami - (let ((commit "797f1a38cc1066acc4adc9561aa1288afabe72d5") - (revision "2")) + (let ((commit "8fc165b833eea6e3c88d67a541385424b129fd3f") + (revision "3")) (package (inherit pjproject) (name "pjproject-jami") @@ -885,7 +885,7 @@ (define-public pjproject-jami (file-name (git-file-name name version)) (sha256 (base32 - "1ssiffc48qg43c45fbpx86i1gbi969b8y34922z62irxbljdnc4m")))) + "146gwpkhia9d7lqk3czlrwy0m3b8d9mhi2l05gffs0i0hljrj3mq")))) (arguments (substitute-keyword-arguments (package-arguments pjproject) ((#:configure-flags _ ''()) -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 5/8] gnu: dhtnet: Update to 0.0.1-4.6c5ee3a. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 11:56:03 +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.175024774125034 (code B ref 78790); Wed, 18 Jun 2025 11:56:03 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:41 +0000 Received: from localhost ([127.0.0.1]:48119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrOH-0006Vc-7y for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:41 -0400 Received: from layka.disroot.org ([178.21.23.139]:46518) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO5-0006TM-PV for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:31 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C0BE225D34; Wed, 18 Jun 2025 13:55:28 +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 3aULWGUJwE0S; Wed, 18 Jun 2025 13:55:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247728; bh=jt2IPAOAGwGBnxjw6ekk8dM+jgPM7ZpDNDYgVL4n7/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eXH9GuIC0yG9WSngBRoDoA9yzFzVTdzTL1aEC2YN0P9rM6crRHqskSu+Bbzd6W/8g DVdJgAHG/C2L1MreUwJGRy09M+cujquv/X89VZQ/2V50xM+ovLjR6nqOOx9qRSQI/J S8JeAxqbJxoyZBgj0sZG8oNqvedz9TZ7ygDafRrlBpWCTpWZ4+ztEfMd0DPb5THCrk W4Oit3KPnGlzzxacrOIeytRF3vMgkwe/mvo572IvYtAQQ16cOf5tSRLPb72u9gMcYy cQHf64f/REAOFWdUytEEM1Sc7utZVxPKogHyDMDUxUD5jJg9nquzF2L0qrbyLlhoge RaesA5qd4f2IQ== From: Homo Date: Wed, 18 Jun 2025 14:54:37 +0300 Message-ID: <20250618115507.4993-5-gay@disroot.org> In-Reply-To: <20250618115507.4993-1-gay@disroot.org> References: <20250618115507.4993-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/networking.scm (dhtnet): Update to 0.0.1-4.6c5ee3a. [arguments] <#:configure-flags>: Add -DDNC_SYSTEMD=OFF. Change-Id: I57187bd254cf2dc5f9a4ba874b80411acf2f44d9 --- gnu/packages/networking.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 594991efea..f1609a9aa4 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4080,8 +4080,8 @@ (define-public opendht (define-public dhtnet ;; There is no tag nor release; use the latest available commit. - (let ((revision "3") - (commit "77331098ff663a5ac54fae7d0bedafe076c575a1")) + (let ((revision "4") + (commit "6c5ee3a21556d668d047cdedb5c4b746c3c6bdb2")) (package (name "dhtnet") ;; The base version is taken from the CMakeLists.txt file (see: @@ -4095,14 +4095,15 @@ (define-public dhtnet (file-name (git-file-name name version)) (sha256 (base32 - "1ch736misnlv2aqalj3n62gnz5xlhmip9xfv1aimp0aqinfc94p7")))) + "0np0h19gcibn9d4hyn9vjvlxjc6ma8cg8j1qxh1cam5c9i49h1xv")))) (outputs (list "out" "debug")) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DBUILD_DEPENDENCIES=OFF" "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_TESTING=ON") + "-DBUILD_TESTING=ON" + "-DDNC_SYSTEMD=OFF") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'delete-problematic-tests -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 1/8] gnu: expected-lite: Update to 0.8.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 11:56:03 +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.175024774225043 (code B ref 78790); Wed, 18 Jun 2025 11:56:03 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:42 +0000 Received: from localhost ([127.0.0.1]:48121 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrOH-0006Vj-JC for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:41 -0400 Received: from layka.disroot.org ([178.21.23.139]:46482) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO4-0006TC-Vs for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:31 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E071325C0F; Wed, 18 Jun 2025 13:55:26 +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 gqIbp7h1p8GW; Wed, 18 Jun 2025 13:55:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247726; bh=nKCpKldP/lMuGpI04ODSY2citXXUhwLa4b8cpYxaYvI=; h=From:To:Cc:Subject:Date; b=ea1eWcviNqG6v+BmHa5J2lzVORStz4AoQfPX129dFYWMNgoNkNqkYQyrh90edyPZz 9HmQJmO070DmLRBYdsluXC4HdA5Vj+nJ1R5+1fBBCAoLaxiZFLpUpay/DwIVKMJByu EiT54AXYRC34RCvlQyo1sHFP0wHN9jhuaNjPpOb9OAFyz5Pf9eYc1xp+XHzH9uuZC+ uh4SjGs/c4991WM/T0614YMyOITy7g7IyLdViNtF7ZARE9RLCOXiiVOMUY/S8Vlafo sGjGSBdH3J8gM2pM2TVeQjjGIVQ1AmTiACT+xrDN01GOCSvuauYyVUmg8NpkJb9O/8 zyHwzIxPWxE0w== From: Homo Date: Wed, 18 Jun 2025 14:54:33 +0300 Message-ID: <20250618115507.4993-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/cpp.scm (expected-lite): Update to 0.8.0. Change-Id: I50c896df694a41e5d0a2282d2112108eefc46e50 --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 461070c520..68c5ebc342 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -498,7 +498,7 @@ (define-public edlib (define-public expected-lite (package (name "expected-lite") - (version "0.6.3") + (version "0.8.0") (source (origin (method git-fetch) (uri (git-reference @@ -507,7 +507,7 @@ (define-public expected-lite (file-name (git-file-name name version)) (sha256 (base32 - "0d58nqh2fwdzdpln2wlnf898wyfxdnskq6ff33azbg92d5ibzys2")))) + "0dqa6ivqqyg5c2xyp1dakqnm4mf1m4g8bsi5jscgvv82pi3zxdzh")))) (build-system cmake-build-system) (home-page "https://github.com/martinmoene/expected-lite") (synopsis "Expected objects in C++11 and later") -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 4/8] gnu: opendht: Update to 3.4.0. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 11:56:04 +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.175024774325059 (code B ref 78790); Wed, 18 Jun 2025 11:56:04 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:43 +0000 Received: from localhost ([127.0.0.1]:48123 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrOH-0006Vs-Vl for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:42 -0400 Received: from layka.disroot.org ([178.21.23.139]:46502) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO5-0006TK-CB for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:31 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7830F25F0C; Wed, 18 Jun 2025 13:55:28 +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 nMi7vO3gaWQj; Wed, 18 Jun 2025 13:55:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247727; bh=KoQe9XZnpMp2KmyCmSQead5AvcHxfgLxKdXbT8vUaNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NK0Qc7uQVWWXPJi6485KuQbAnGVeCBxLpK8Aw4/MLqPgLtUVobDqTlpdpLkFWJ8lI HXK1RvfkzP5sm+hQrkhURKqN1AdH2e3WWZrsIq7OjYSJ1mImWLuKl8oHxhqSY4VmDE NnQLcCRItA4mn63eIvGQTcoYMRgE1f9zpN+1bfdE2lnW0vY3NcptLqKwp5wspwJwTS PrEPdRHHuTy6uReIgYidUFuNG7Y5AMK0VDgSOU6QedtaP+M3EnobhT3Gwf1dg4zZgS PJehdXEGW/zxZhKGYzdhSXU84/aAh7HZBEoL29OQbv3ZimoVgnf2EJjJ5F9dS5MQ43 ts2mSenAQ7oWA== From: Homo Date: Wed, 18 Jun 2025 14:54:36 +0300 Message-ID: <20250618115507.4993-4-gay@disroot.org> In-Reply-To: <20250618115507.4993-1-gay@disroot.org> References: <20250618115507.4993-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/networking.scm (opendht): Update to 3.4.0. [version]: Do not use git-version. [inputs]: Replace restinio-0.6 by restinio. Add llhttp. [arguments] <#:phases> {pkgconfig-disable-iouring}: New phase. Change-Id: I6fed7fe1c8ba0d75d0dca8406010f7c8dd89609e --- gnu/packages/networking.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 6ef265e0eb..594991efea 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3935,22 +3935,18 @@ (define-public restinio-0.6 (replace "llhttp" http-parser))))) (define-public opendht - ;; Temporarily use the latest commit, as the latest release lacks a 'detach' - ;; procedure used by a recent DhtNet, required by Jami. - (let ((commit "318d02c55a7061a771a632ff2224b0d195a80d42") - (revision "0")) (package (name "opendht") - (version (git-version "3.1.11" revision commit)) + (version "3.4.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/savoirfairelinux/opendht") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0d4m9bxvwa1pz8r0sfrjjyml4yp5v7n4vy8ad7k4hcryyvd5npb0")))) + "069y4mgygjsfp5szfbqr7l30g7fbcqqj62h11byyq9k24rl7ilsq")))) (outputs '("out" "python" "tools" "debug")) (build-system gnu-build-system) (arguments @@ -4001,6 +3997,13 @@ (define-public opendht (("extra_link_args=\\[(.*)\\]" _ args) (string-append "extra_link_args=[" args ", '-Wl,-rpath=" #$output "/lib']"))))) + ;; TODO: build with liburing, requires cmake or meson. + (add-after 'unpack 'pkgconfig-disable-iouring + (lambda _ + ;; This one causes configure error in dhtnet. + (substitute* "opendht.pc.in" + (("@iouring_lib@") + "")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -4030,12 +4033,13 @@ (define-public opendht readline)) (propagated-inputs (list msgpack-cxx ;included in several installed headers - restinio-0.6 ;included in opendht/http.h + restinio ;included in opendht/http.h ;; The following are listed in the 'Requires.private' field of ;; opendht.pc: argon2 gnutls jsoncpp + llhttp nettle openssl ;required for the DHT proxy python)) @@ -4072,7 +4076,7 @@ (define-public opendht @item dhtchat A very simple IM client working over the DHT. @end table") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public dhtnet ;; There is no tag nor release; use the latest available commit. -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 8/8] gnu: Remove restinio-0.6. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 11:56:04 +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.175024774325069 (code B ref 78790); Wed, 18 Jun 2025 11:56:04 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:43 +0000 Received: from localhost ([127.0.0.1]:48125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrOI-0006W8-VZ for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:43 -0400 Received: from layka.disroot.org ([178.21.23.139]:46544) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO7-0006Th-GO for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:33 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7C80925C17; Wed, 18 Jun 2025 13:55:30 +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 gueamznd9XsE; Wed, 18 Jun 2025 13:55:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247729; bh=XYVJsxSSYGXPGrSa25MavtW9aQ0nJGMJpZ8gGhb5Gs4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bAgda9eivyPphWuZ+HgyjpMgGEaF642ZM+Y1ukLXVX7Vk6Et2juhuRCAs7JTdTbOK 1PoGic+s29X7yLqCAE9PWboJQw67lUI8D7/kEf4mNJN4d97iW6vpramyVuftWrMJ1s g18Fd1cMkEQsKIXHn6WIhYNZdVL2hd9g1U5JJb0dsg32vwhBYTwpmxBPHQk2vrTU8E TXK1d1fuVEgYqctBf3jBesNh2m+98f97c4hyb76RoRx9ugegC8zYudVQ7Ir4HPbFpN bzyeOexfV4QbqsxMoZOYl033J/wS1QRO7A/OSTD0l7/yjJYOhpG/DyNcBi8+R8FbMo 0sh2W3QlkVnxw== From: Homo Date: Wed, 18 Jun 2025 14:54:40 +0300 Message-ID: <20250618115507.4993-8-gay@disroot.org> In-Reply-To: <20250618115507.4993-1-gay@disroot.org> References: <20250618115507.4993-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/networking.scm (restinio-0.6): Delete variable. Change-Id: Ib889810f129ee276303222c1b35b3789bfa2cbde --- gnu/packages/networking.scm | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f1609a9aa4..ddcbf424d6 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3902,38 +3902,6 @@ (define-public restinio and targeted primarily for asynchronous processing of HTTP-requests.") (license license:bsd-3))) -(define-public restinio-0.6 - (package - (inherit restinio) - (name "restinio") - (version "0.6.19") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Stiffstream/restinio") - (commit (string-append "v." version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1qrb1qr075r5059w984c4slgpsiwv94j6fmi9naa5l48dbi1p7jz")))) - (arguments - (list - #:configure-flags #~(list "-DRESTINIO_FIND_DEPS=ON" - "-DRESTINIO_INSTALL=ON" - "-DRESTINIO_TEST=ON" - "-DRESTINIO_USE_EXTERNAL_HTTP_PARSER=ON" - "-DRESTINIO_USE_EXTERNAL_SOBJECTIZER=ON") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "dev")))))) - (native-inputs (list catch2 clara json-dto)) - ;; These are all #include'd by restinio's .hpp header files. - (propagated-inputs - (modify-inputs (package-propagated-inputs restinio) - (replace "llhttp" http-parser))))) - (define-public opendht (package (name "opendht") -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 7/8] gnu: jami: Update to 20250610.0. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 11:56:05 +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.175024775325110 (code B ref 78790); Wed, 18 Jun 2025 11:56:05 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:53 +0000 Received: from localhost ([127.0.0.1]:48132 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrOS-0006Wu-Sc for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:53 -0400 Received: from layka.disroot.org ([178.21.23.139]:46552) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO8-0006U2-Hu for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:36 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 75BE12614B; Wed, 18 Jun 2025 13:55:31 +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 RSzxfpZ0CrmR; Wed, 18 Jun 2025 13:55:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247729; bh=g4dlyKZPw4sI8LPIZziZ44bbkF6i8bX8FX/W7zmtARE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=M63sej2/IPnAEqUJwuDPZEqjWAoiIUEjZK3OYFL71uKMrX4mngRuOX/zuQfVoVTbY Y4LGlwvjbg4FWLyTi3g33JAxO87TRSiP5jPtHAhtW6ErjklxfpG/pJ8D9pvJmwqfXD Gt1WhvAxguIVTl5/8r+MFn59uyuIPq1AZxG+A/hk4ZyVNabTJJXh4zRT4EkIeDYtRT i9QOWHkcqTEJe7fME9HT8/tcYOl7P7VgLSLQ9dMOj65wdvy5VLnW2+hny1OoiWcOKX frZdjwWI/dfn8Hd0KHSj+pJhRO66ED9IsObLfd8zcY8JiHYEKwK4hAdHTJhByvzE9W J9LJYU22X2DBw== From: Homo Date: Wed, 18 Jun 2025 14:54:39 +0300 Message-ID: <20250618115507.4993-7-gay@disroot.org> In-Reply-To: <20250618115507.4993-1-gay@disroot.org> References: <20250618115507.4993-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 -- 2.49.0 From unknown Sun Jun 22 07:42:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78790] [PATCH v3 6/8] gnu: zxing-cpp: Update to 2.3.0. Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 11:56:05 +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.175024775425116 (code B ref 78790); Wed, 18 Jun 2025 11:56:05 +0000 Received: (at 78790) by debbugs.gnu.org; 18 Jun 2025 11:55:54 +0000 Received: from localhost ([127.0.0.1]:48135 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRrOT-0006Wx-PE for submit@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:54 -0400 Received: from layka.disroot.org ([178.21.23.139]:46528) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uRrO6-0006Td-R1 for 78790@debbugs.gnu.org; Wed, 18 Jun 2025 07:55:34 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id DC02C2611E; Wed, 18 Jun 2025 13:55:29 +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 ljobkhZCsgY7; Wed, 18 Jun 2025 13:55:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1750247728; bh=9FfSpS+UpLy2Mc1E/2UogwD5O3PinTjXc8WrXinlH4E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DQYMJeHJDIIsQVSSyvmqQZxnjjuBlqaSYUwrtHAxujXyB0JkTsBy1C4z1tHdU7MB4 nWRqjaHjxcI7wxvVyniLHhfqVY6Zru+4w91USC/jjsEU/byku2Z89Q6BHByxqdAvzN HTJoPsy0r1IE7jwS+PeY0bzz5D9W+28W2erBlEmmEodLf1/hp4MntzZMmDatcVj+Ub X+mN0zABuWGCwAIgaUGRPmEXMHkNjNU09DYRsrPLVZZHFkAWD1dHSZm2chz3VDpZXA W88n1rw4XS+5JmOl5mgz3T3CRLVaeNA+Zyne6VkpXPdG7gE7ORlExO+XlRfF5vaEbw knFWX1J4S1Pcg== From: Homo Date: Wed, 18 Jun 2025 14:54:38 +0300 Message-ID: <20250618115507.4993-6-gay@disroot.org> In-Reply-To: <20250618115507.4993-1-gay@disroot.org> References: <20250618115507.4993-1-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/aidc.scm (zxing-cpp): Update to 2.3.0. [version]: Do not use git-version. [source]: Update URL. [native-inputs]: Add pkg-config. [inputs]: Add libpng, zint and zlib. [arguments] <#:configure-flags>: Add -DZXING_READERS=ON, -DZXING_WRITERS=BOTH, -DZXING_DEPENDENCIES=LOCAL, -DZXING_EXAMPLES=OFF, -DZXING_USE_BUNDLED_ZINT=OFF and -DZXING_UNIT_TESTS=ON. <#:phases> (install-headers): New phase. (zxing-cpp-1.2a): New variable. (zxing-cpp-1.2) [source]: Update URL. * gnu/packages/linphone.scm (liblinphone)[inputs]: Replace zxing-cpp with zxing-cpp-1.2a. * gnu/packages/messaging.scm (kaidan)[inputs]: Likewise. Change-Id: Ib03af79feef03f9c9e1a5b97d39b7d6c18d3ff1d --- gnu/packages/aidc.scm | 53 +++++++++++++++++++++++++++++++------- gnu/packages/linphone.scm | 2 +- gnu/packages/messaging.scm | 2 +- 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index c48e800b77..bd55ce74ff 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -32,6 +32,7 @@ (define-module (gnu packages aidc) #:use-module (guix utils) #:use-module (gnu packages autotools) #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages elf) #:use-module (gnu packages imagemagick) #:use-module (gnu packages gettext) @@ -83,29 +84,63 @@ (define-public zint (license (list license:bsd-3 license:gpl3+)))) (define-public zxing-cpp + (package + (name "zxing-cpp") + (version "2.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zxing-cpp/zxing-cpp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hdr73fllnsp3zpmrhw6cjla39lihwg1khgvddsf4v57a0lmiy3f")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list "-DZXING_READERS=ON" + "-DZXING_WRITERS=BOTH" + "-DZXING_DEPENDENCIES=LOCAL" + "-DZXING_EXAMPLES=OFF" ;requires stb.pc + "-DZXING_USE_BUNDLED_ZINT=OFF" + "-DZXING_UNIT_TESTS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-headers + (lambda* (#:key source #:allow-other-keys) + (invoke "sh" "-c" + (string-append "cp " source "/core/src/*.h " + #$output "/include/ZXing/"))))))) + (native-inputs (list fmt-8 googletest pkg-config)) + (inputs (list libpng zint zlib)) + (synopsis "C++ port of ZXing") + (description "ZXing-CPP is a barcode scanning library.") + (home-page "https://github.com/zxing-cpp/zxing-cpp") + (license license:asl2.0))) + +;;; This older variant is kept for kaidan, liblinphone and yosys-clang. +(define-public zxing-cpp-1.2a ;; Use the master branch as it includes unreleased build system improvements ;; allowing to use system libraries (instead of attempting to fetch them ;; from the Internet). (let ((revision "0") (commit "00783db7aa3bcf8620a301854ac71c0ceaaca0c1")) - (package + (package/inherit zxing-cpp (name "zxing-cpp") (version (git-version "1.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nu-book/zxing-cpp") + (url "https://github.com/zxing-cpp/zxing-cpp") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 "1yl2cpaqiv1g4nq9v0xfj1vd5faz55k4541vz6hsffvcxgn9nmc5")))) - (build-system cmake-build-system) - (native-inputs (list fmt-8 googletest)) - (synopsis "C++ port of ZXing") - (description "ZXing-CPP is a barcode scanning library.") - (home-page "https://github.com/nu-book/zxing-cpp") - (license license:asl2.0)))) + (arguments '(#:configure-flags '())) + (native-inputs (list fmt-8 googletest))))) ;;; This older variant is kept for gst-plugins-bad (see: ;;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1684). @@ -116,7 +151,7 @@ (define-public zxing-cpp-1.2 (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nu-book/zxing-cpp") + (url "https://github.com/zxing-cpp/zxing-cpp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 239c18c595..24cd6bbcc8 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -802,7 +802,7 @@ (define-public liblinphone sqlite xsd zlib - zxing-cpp)) + zxing-cpp-1.2a)) (synopsis "Belledonne Communications Softphone Library") (description "Liblinphone is a high-level SIP library integrating all calling and instant messaging features into an unified diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c2928c0042..bddc4786cd 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1515,7 +1515,7 @@ (define-public kaidan qqc2-desktop-style qxmpp sonnet - zxing-cpp)) + zxing-cpp-1.2a)) (home-page "https://www.kaidan.im/") (synopsis "Qt-based XMPP/Jabber Client") (description "Kaidan is a chat client. It uses the open communication -- 2.49.0