From patchwork Fri Aug 18 18:12:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52994 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4A1D427BBE9; Fri, 18 Aug 2023 19:18:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 810C627BBE2 for ; Fri, 18 Aug 2023 19:18:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qX42u-0006j5-8K; Fri, 18 Aug 2023 14:18:04 -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 1qX42t-0006id-Ek for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qX42t-0000KM-6i for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qX42t-0003FB-JX for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65371] [PATCH telephony-team 05/10] gnu: msgpack: Deprecate with msgpack-c. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 18:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65371@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 65371-submit@debbugs.gnu.org id=B65371.169238264112339 (code B ref 65371); Fri, 18 Aug 2023 18:18:03 +0000 Received: (at 65371) by debbugs.gnu.org; 18 Aug 2023 18:17:21 +0000 Received: from localhost ([127.0.0.1]:48721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX42C-0003Cn-3E for submit@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:20 -0400 Received: from mail-qk1-x72d.google.com ([2607:f8b0:4864:20::72d]:48567) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX427-0003Bu-Dc for 65371@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:16 -0400 Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-76d77da274eso75373285a.1 for <65371@debbugs.gnu.org>; Fri, 18 Aug 2023 11:17:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692382629; x=1692987429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ia1BXZbJtHxHt/CZ5n2zjWaZHde8RDcV6m0Gh5IarRs=; b=bprrWlewsOZCU8MO+nhiObZmTHDQTdmiB5PO3u45h6uODMVfQtKkZtFDxqeWXgE96V Hq06CTta1xAfRHJyI7MYsK5qO+vvmJhLanLvNmSCae99U6w7u5KYUg9UI6jBzWa4yDEi SD8fti87XTen+WZk1xz+Z8h/dRc1bTFVapheZOr8dIheqpft6/D9/jZbhwDddqumQgam le8Rl/Io4P3AUuj7F8rfwgbaJsFlKyeIHi0xsufI/nwSTN3bRkjAZ4LK4hVLYkKq3n8F De9BhRCvtIVEfDbcOfTxPYP/Ta58CJI/Bc8AnFmDI5M/OodgBT/cXdNa2hUQ2Tv+U7hi LJXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692382629; x=1692987429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ia1BXZbJtHxHt/CZ5n2zjWaZHde8RDcV6m0Gh5IarRs=; b=euW/Grg2Jc8dtLdJnyPgaF8sNkbxGuhcAgYhUzrth0oEay5OX1o+JQWyH2Pwdt2jHO sEfSxoLSamB39BA+wP1cdcbS+lCjr/oQoEjpMxfZMTlpauDVrbMPQDe7j+cYmvUYCcGu YdEXnS2rbPH4qrmg9ejliwSS6ArUNJ2gCvaXAt+f4fyz+JjsMY1ue5n34LuCJzQt03Jq WQGq4f6fZMmE+AZocvWIkxl0o11z39nKxy2vRQeaEjGDeJJPhxSYEOHptyCn6bJAx7MZ tJW9fdSVMusWT2Sm5EBJEHAHY+QWpB4TlokrVqoUlfNdde9JxgI1QHuuLPGBJufvhsKa +pVg== X-Gm-Message-State: AOJu0YzUHosR5GgEBMH6U9vfG7+iFJQtyOfSM0Da00UZ36ywc6IhOS38 nnCNMVg27icAbxmfUJPSZ7Z5KxmdqO8i8w== X-Google-Smtp-Source: AGHT+IE/isIaajlAzY5QxAi0LFXbupADkLhGUp3sVyhnXpc8ldGrUGfriHysMHwxdtkUGe3TH1bMxw== X-Received: by 2002:a05:622a:130f:b0:40a:6b19:654d with SMTP id v15-20020a05622a130f00b0040a6b19654dmr4348535qtk.67.1692382628962; Fri, 18 Aug 2023 11:17:08 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-239.b2b2c.ca. [205.233.124.239]) by smtp.gmail.com with ESMTPSA id z5-20020ac84305000000b00403e80cad67sm687678qtm.41.2023.08.18.11.17.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 11:17:08 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 18 Aug 2023 14:12:56 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/serialization.scm (msgpack-c): New variable. (msgpack-cxx): New variable. (msgpack): Rename to... (msgpack-3): ... this, and inherit from msgpack-c. * gnu/packages/vim.scm (eovim) [inputs]: Replace msgpack with msgpack-3. * gnu/packages/terminals.scm (tmate): Likewise. * gnu/packages/networking.scm (opendht) [propagated-inputs]: Replace msgpack with msgpack-cxx. --- gnu/packages/networking.scm | 2 +- gnu/packages/serialization.scm | 71 +++++++++++++++++++++++++++------- gnu/packages/terminals.scm | 6 +-- gnu/packages/vim.scm | 6 +-- 4 files changed, 62 insertions(+), 23 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 55c938606f..a7cb4f876e 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3847,7 +3847,7 @@ (define-public opendht fmt readline)) (propagated-inputs - (list msgpack ;included in several installed headers + (list msgpack-cxx ;included in several installed headers restinio ;included in opendht/http.h ;; The following are listed in the 'Requires.private' field of ;; opendht.pc: diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 9c114aaf39..9f2aab250e 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2023 Alexey Abramov ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2023 Vinicius Monego +;;; Copyright © 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -222,8 +223,60 @@ (define-public cereal-1.3.0 (list doxygen gcc-10 (package-source cereal))))) +(define-public msgpack-c + (package + (name "msgpack-c") + (version "6.0.0") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://github.com/msgpack/msgpack-c/releases/download/" + "c-" version "/" name "-" version ".tar.gz")) + (sha256 + (base32 "1fmf08babfsjq5qkgw034wk2nw6mayxp1qlkm7h55p2jqvigam1n")) + (snippet + '(let ((p (open-file "msgpack-c.pc.in" "a"))) + (display "Requires: zlib\n" p) + (close-output-port p))))) + (build-system cmake-build-system) + (arguments (list #:configure-flags #~(list "-DMSGPACK_BUILD_TESTS=ON"))) + (native-inputs (list googletest)) + (propagated-inputs (list zlib)) ;zbuffer.h includes zlib.h + (home-page "https://www.msgpack.org") + (synopsis "Binary serialization library") + (description "Msgpack is a library for C that implements binary +serialization.") + (license license:boost1.0))) + +(define-public msgpack-cxx + (package + (inherit msgpack-c) + (name "msgpack-cxx") + (version "6.1.0") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://github.com/msgpack/msgpack-c/releases/download/" + "cpp-" version "/" name "-" version ".tar.gz")) + (sha256 + (base32 "1rrrf3nskcv994z3pbq6a5z2021piz118rccmm1y7zlf7klygv93")))) + (build-system cmake-build-system) + (propagated-inputs (list boost zlib)) ;included in headers + (description "Msgpack is a library for C++ that implements binary +serialization."))) + +;;; The msgpack package was split into msgpack-c and msgpack-cxx starting from +;;; version 4.0.0. (define-public msgpack + (deprecated-package "msgpack" msgpack-c)) + +(define-public msgpack-3 (package + (inherit msgpack-c) (name "msgpack") (version "3.3.0") (source @@ -237,23 +290,13 @@ (define-public msgpack '(let ((p (open-file "msgpack.pc.in" "a"))) (display (string-append "Requires: " "zlib" "\n") p) - (close-output-port p) - #t)) + (close-output-port p))) (sha256 (base32 "0yzhq50ijvwrfkr97knhvn54lj3f4hr3zy39yq8wpf6xll94s4bf")))) - (build-system cmake-build-system) - (native-inputs - (list googletest-1.8 pkg-config)) - (propagated-inputs - (list zlib)) ;; Msgpack installs two headers (zbuffer.h, - ;; zbuffer.hpp) which #include . However, 'guix gc --references' - ;; does not detect a store reference to zlib since these headers are not - ;; compiled. - (home-page "https://www.msgpack.org") - (synopsis "Binary serialization library") + (native-inputs (list googletest-1.8)) (description "Msgpack is a library for C/C++ that implements binary -serialization.") - (license license:boost1.0))) +serialization. This is the legacy version that predates the split into C and +C++ specific packages."))) (define-public libmpack (package diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 5fc72d7937..44641360ba 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1172,10 +1172,8 @@ (define-public tmate (base32 "0x5c31yq7ansmiy20a0qf59wagba9v3pq97mlkxrqxn4n1gcc6vi")))) (build-system gnu-build-system) - (inputs - (list libevent libssh msgpack ncurses)) - (native-inputs - (list autoconf automake pkg-config)) + (inputs (list libevent libssh msgpack-3 ncurses)) + (native-inputs (list autoconf automake pkg-config)) (home-page "https://tmate.io/") (synopsis "Terminal sharing application") (description "tmate is a terminal sharing application that allows you to diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index d58b022123..16f73e355f 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -814,10 +814,8 @@ (define-public eovim (string-append start nvim)))))) (add-before 'build 'set-home (lambda _ (setenv "HOME" "/tmp")))))) - (native-inputs - (list pkg-config)) - (inputs - (list efl msgpack neovim)) + (native-inputs (list pkg-config)) + (inputs (list efl msgpack-3 neovim)) (home-page "https://github.com/jeanguyomarch/eovim/") (synopsis "EFL GUI for Neovim") (description "Graphical Neovim interface based on the @acronym{EFL, Enlightenment