From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id mINaKsjlGWPGzgAAbAwnHQ (envelope-from ) for ; Thu, 08 Sep 2022 14:53:28 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id oEdIKsjlGWOmbAAAauVa8A (envelope-from ) for ; Thu, 08 Sep 2022 14:53:28 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2E50633B9E for ; Thu, 8 Sep 2022 14:53:28 +0200 (CEST) Received: from localhost ([::1]:53720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWH27-0008LC-9j for larch@yhetil.org; Thu, 08 Sep 2022 08:53:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWGvu-0002kG-G0 for guix-patches@gnu.org; Thu, 08 Sep 2022 08:47:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40625) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oWGvt-0003MV-VF for guix-patches@gnu.org; Thu, 08 Sep 2022 08:47:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oWGvt-0000oI-OV for guix-patches@gnu.org; Thu, 08 Sep 2022 08:47:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57337] [PATCH 0/2] Add docxbox Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Sep 2022 12:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57337 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Wiktor =?UTF-8?Q?=C5=BBelazny?= Cc: Wiktor =?UTF-8?Q?=C5=BBelazny?= , 57337@debbugs.gnu.org Received: via spool by 57337-submit@debbugs.gnu.org id=B57337.16626411773057 (code B ref 57337); Thu, 08 Sep 2022 12:47:01 +0000 Received: (at 57337) by debbugs.gnu.org; 8 Sep 2022 12:46:17 +0000 Received: from localhost ([127.0.0.1]:57557 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWGvA-0000nF-E9 for submit@debbugs.gnu.org; Thu, 08 Sep 2022 08:46:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oWGv4-0000my-FD for 57337@debbugs.gnu.org; Thu, 08 Sep 2022 08:46:14 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49592) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWGuy-00035l-Rn; Thu, 08 Sep 2022 08:46:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=l462mxqT/ZKLyGrYq03Eu/tFruZMOky2uvT/jFssJ6c=; b=n00uNASsDVir2kqu/MK+ uWjgPVF/5exe5nXYHnsJyhKve+G+eM9GhDIfpwUn+jdMI4lKfE4ovdRQQIsiSP8JDM4oPBXcWKHdS AZRyjb2KHexV68cZp/ybUkBxL+CfzexgB9NOZ012Q0+i4Ubq0gm+VmWJPVckB1IaAhObpDvzEMIHj TVlwJmZy9TVDrfY3IPMTmkQq2zhDgphFOy3b04NDU4Mey2xit0dRb0FDYYVAEMkwcR+wuWDaOHEdf yeE2qSoaLs+0IMEaaQSuV/7FK9u2vnVvjTfWaU7JrJfhu1m+7AuNqaBZab1tieXxfROiID3wmErfk hGEzO2u3fEc0lg==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=42548 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWGuy-0004PN-9e; Thu, 08 Sep 2022 08:46:04 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20220822092753.31295-1-wz@freeshell.de> <20220822093651.31574-1-wz@freeshell.de> Date: Thu, 08 Sep 2022 14:46:02 +0200 In-Reply-To: <20220822093651.31574-1-wz@freeshell.de> ("Wiktor =?UTF-8?Q?=C5=BBelazny?="'s message of "Mon, 22 Aug 2022 11:36:50 +0200") Message-ID: <8735d2hw51.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1662641608; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=l462mxqT/ZKLyGrYq03Eu/tFruZMOky2uvT/jFssJ6c=; b=hm5nV8tuqzHmwT57q8R656d9TQyzxb5PkbH9jGeL4N6DHJhlL5t3LjqmYdLSCImFDcH2MX yra5qJeCzbswM05TkUR1pupv3Qogsv4y3jRyz4X3lsNI9ZGxHkpx9tIKIw2dm2vTd9XSfQ OSrAYmX60uyR6dw/9B4/DQZ5DNneD1LpFfiL6s1MZcsKIiHgIh0Fuc3u7Haisogj3V5JaB GNkO1J/ArVbruUi3EtMVFIVz7/I/QD/Pt1gVSJf+gIEe9aYfrG7uaOG1IwwvS683rCnsPh q2NwVMDu7RBZsc+LCgUe1b9Fsie2mnqSECo2tGHFFwj62ZTFNMopFt6jIhsGyQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662641608; a=rsa-sha256; cv=none; b=qoZMAUIVF65FzbzKhxTn1At1tZyWbQ0BbyasNjBlGkwqkZLsIZne1N5Y4/yZMgAnTBZzjL 86e/yii72CyPN1/qHEJD7mUz52nmaemqkmlcOtjaQgq48JapBvSgsQyf9GQLBK3lxe9NFA /nMLONoJPegY4Cd+UD0ka6wN0tGmTLApxQIoBG+WXr8muXVJ6RUpYSbiYOx4wc7ReRhph8 76ncRPOLJwg909zf8gLUN40L89GmEzXct+njlve2mJwfZnjSDWLBhlMwHyNrUahSLAHSu7 tY8e+0x9bDblvLWW+UzknXnIGhBPL+59NW+is0yfRNyVUVwbecWf/zKnJcGUvQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=n00uNASs; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -5.08 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=n00uNASs; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 2E50633B9E X-Spam-Score: -5.08 X-Migadu-Scanner: scn0.migadu.com X-TUID: p8qd2ipaygGL Wiktor =C5=BBelazny skribis: > From: Wiktor =C5=BBelazny > > * gnu/packages/cpp.scm (miniz-cpp): New variable. [...] > +++ b/gnu/packages/patches/miniz-cpp-fixed-duplicated-symbols.patch > @@ -0,0 +1,2734 @@ > +commit 64f974213ac16f78c008bd148c8a2a07e902f148 > +Author: Kay Stenschke > +Date: Mon Apr 27 12:13:34 2020 +0200 > + > + Fixed duplicated symbols > +=20=20=20=20 > + Using miniz-cpp from multiple translation units caused linker error. > + Done: marked declarations as static for correct linking from multipl= e translation units. > + > +diff --git a/zip_file.hpp b/zip_file.hpp > +index c324f70..3aff33c 100644 > +--- a/zip_file.hpp > ++++ b/zip_file.hpp > +@@ -226,12 +226,12 @@ > + //#define MINIZ_NO_MALLOC > +=20 > + #if defined(__TINYC__) && (defined(__linux) || defined(__linux__)) > +- // TODO: Work around "error: include file 'sys\utime.h' when compilin= g with tcc on Linux > ++// TODO: Work around "error: include file 'sys\utime.h' when compiling = with tcc on Linux > + #define MINIZ_NO_TIME > + #endif > +=20 > + #if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_ARCHIVE_APIS) > +- #include > ++#include > + #endif > +=20 > + #if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || defined= (__i386) || defined(__i486__) || defined(__i486) || defined(i386) || define= d(__ia64__) || defined(__x86_64__) > +@@ -272,15 +272,15 @@ extern "C" { > + typedef unsigned long mz_ulong; > +=20 > + // mz_free() internally uses the MZ_FREE() macro (which by default call= s free() unless you've modified the MZ_MALLOC macro) to release a block all= ocated from the heap. > +-void mz_free(void *p); > ++static void mz_free(void *p); > +=20 > + #define MZ_ADLER32_INIT (1) > + // mz_adler32() returns the initial adler-32 value to use when called w= ith ptr=3D=3DNULL. > +-mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t bu= f_len); > ++static mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, si= ze_t buf_len); > +=20 > + #define MZ_CRC32_INIT (0) > + // mz_crc32() returns the initial CRC-32 value to use when called with = ptr=3D=3DNULL. > +-mz_ulong mz_crc32(mz_ulong crc, const unsigned char *ptr, size_t buf_le= n); > ++static mz_ulong mz_crc32(mz_ulong crc, const unsigned char *ptr, size_t= buf_len); > +=20 > + // Compression strategies. > + enum { MZ_DEFAULT_STRATEGY =3D 0, MZ_FILTERED =3D 1, MZ_HUFFMAN_ONLY = =3D 2, MZ_RLE =3D 3, MZ_FIXED =3D 4 }; > +@@ -343,7 +343,7 @@ typedef struct mz_stream_s > + typedef mz_stream *mz_streamp; > +=20 > + // Returns the version string of miniz.c. > +-const char *mz_version(void); > ++static const char *mz_version(void); > +=20 > + // mz_deflateInit() initializes a compressor with default options: > + // Parameters: [...] > ++#define Z_NO_FLUSH MZ_NO_FLUSH > ++#define Z_PARTIAL_FLUSH MZ_PARTIAL_FLUSH > ++#define Z_SYNC_FLUSH MZ_SYNC_FLUSH > ++#define Z_FULL_FLUSH MZ_FULL_FLUSH > ++#define Z_FINISH MZ_FINISH > ++#define Z_BLOCK MZ_BLOCK > ++#define Z_OK MZ_OK > ++#define Z_STREAM_END MZ_STREAM_END > ++#define Z_NEED_DICT MZ_NEED_DICT > ++#define Z_ERRNO MZ_ERRNO > ++#define Z_STREAM_ERROR MZ_STREAM_ERROR > ++#define Z_DATA_ERROR MZ_DATA_ERROR > ++#define Z_MEM_ERROR MZ_MEM_ERROR > ++#define Z_BUF_ERROR MZ_BUF_ERROR > ++#define Z_VERSION_ERROR MZ_VERSION_ERROR > ++#define Z_PARAM_ERROR MZ_PARAM_ERROR > ++#define Z_NO_COMPRESSION MZ_NO_COMPRESSION > ++#define Z_BEST_SPEED MZ_BEST_SPEED > ++#define Z_BEST_COMPRESSION MZ_BEST_COMPRESSION > ++#define Z_DEFAULT_COMPRESSION MZ_DEFAULT_COMPRESSION > ++#define Z_DEFAULT_STRATEGY MZ_DEFAULT_STRATEGY > ++#define Z_FILTERED MZ_FILTERED > ++#define Z_HUFFMAN_ONLY MZ_HUFFMAN_ONLY > ++#define Z_RLE MZ_RLE > ++#define Z_FIXED MZ_FIXED > ++#define Z_DEFLATED MZ_DEFLATED > ++#define Z_DEFAULT_WINDOW_BITS MZ_DEFAULT_WINDOW_BITS > ++#define alloc_func mz_alloc_func > ++#define free_func mz_free_func > ++#define internal_state mz_internal_state > ++#define z_stream mz_stream > ++#define deflateInit mz_deflateInit > ++#define deflateInit2 mz_deflateInit2 > ++#define deflateReset mz_deflateReset > ++#define deflate mz_deflate > ++#define deflateEnd mz_deflateEnd > ++#define deflateBound mz_deflateBound > ++#define compress mz_compress > ++#define compress2 mz_compress2 > ++#define compressBound mz_compressBound > ++#define inflateInit mz_inflateInit > ++#define inflateInit2 mz_inflateInit2 > ++#define inflate mz_inflate > ++#define inflateEnd mz_inflateEnd > ++#define uncompress mz_uncompress > ++#define crc32 mz_crc32 > ++#define adler32 mz_adler32 It would seem that the code uses a bundled copy of zlib, which is why it needs to rename things. Do I get it right? If so, it would be best to remove the bundled zlib and instead add zlib as an input. Thanks, Ludo=E2=80=99.