From patchwork Mon Aug 22 09:27:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Wiktor_=C5=BBelazny?= X-Patchwork-Id: 321 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 4EADB27BBEA; Mon, 22 Aug 2022 10:40:31 +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.9 required=5.0 tests=BAYES_00,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 0419827BBE9 for ; Mon, 22 Aug 2022 10:40:31 +0100 (BST) Received: from localhost ([::1]:59210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQ3v1-0005Xp-Qf for patchwork@mira.cbaines.net; Mon, 22 Aug 2022 05:40:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQ3ql-0000uP-0r for guix-patches@gnu.org; Mon, 22 Aug 2022 05:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48115) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQ3qk-0003WI-LX for guix-patches@gnu.org; Mon, 22 Aug 2022 05:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oQ3qk-0005Vt-HV for guix-patches@gnu.org; Mon, 22 Aug 2022 05:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57337] [PATCH 0/2] Add docxbox Resent-From: Wiktor =?utf-8?q?=C5=BBelazny?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 Aug 2022 09:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57337 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57337@debbugs.gnu.org Cc: Wiktor =?utf-8?q?=C5=BBelazny?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166116094621169 (code B ref -1); Mon, 22 Aug 2022 09:36:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Aug 2022 09:35:46 +0000 Received: from localhost ([127.0.0.1]:37864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQ3qU-0005VM-4F for submit@debbugs.gnu.org; Mon, 22 Aug 2022 05:35:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:47800) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQ3qS-0005VF-C0 for submit@debbugs.gnu.org; Mon, 22 Aug 2022 05:35:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQ3qS-0000LC-6C for guix-patches@gnu.org; Mon, 22 Aug 2022 05:35:44 -0400 Received: from freeshell.de ([116.202.128.144]:56848) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQ3qO-0003NS-GO for guix-patches@gnu.org; Mon, 22 Aug 2022 05:35:43 -0400 Received: from localhost.localdomain (cst-prg-68-192.cust.vodafone.cz [46.135.68.192]) (Authenticated sender: wz) by freeshell.de (Postfix) with ESMTPSA id 34C5FB364037; Mon, 22 Aug 2022 11:28:22 +0200 (CEST) From: Wiktor =?utf-8?q?=C5=BBelazny?= Date: Mon, 22 Aug 2022 11:27:53 +0200 Message-Id: <20220822092753.31295-1-wz@freeshell.de> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Received-SPF: pass client-ip=116.202.128.144; envelope-from=wz@freeshell.de; helo=freeshell.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches The docxbox patch is probably not ready for applying, yet (but it should be close). This is my first attempt at “unvendoring”. The thing builds and seems to work. The problem is that etc/ld.so.cache gets created. I have no idea where it comes from, but I suspect that it shouldn’t be there, as it’s easy to imagine a conflict if multiple packages with etc/ld.so.cache are being installed. miniz-cpp-fixed-duplicated-symbols.patch is the last commit in https://github.com/kstenschke/miniz-cpp/tree/patch-2 I think I just used `git show` and redirected the output to the file. I’m noting this because I’m not sure if there are any potential copyright issues involved in such a workflow. I couldn’t get the test suite to work. Please, see the comment in the package definition for the details. Then, there are linter messages: /home//guix/guix-git/gnu/packages/textutils.scm:1512:12: docxbox@0.0.5: the source file name should contain the package name Adding the (file-name (git-file-name name version)) line removes the warning, but breaks the build. /home//guix/guix-git/gnu/packages/textutils.scm:1512:12: docxbox@0.0.5: the source URI should not be an autogenerated tarball I’m guessing this refers to GitHub Automatic Releases feature. Unfortunately, there are no other releases to choose from in that repository. Finally, there’s the question related to the MS Word being proprietary software. I don’t think there should be controversies here, as docxbox is about interacting with the docx format, rather than the software itself. And the format itself is standardized. Perhaps the synopsis the package should avoid mentioning MS Word. I borrowed it from the docxbox repository. Wiktor Żelazny (2): gnu: Add miniz-cpp. gnu: Add docxbox. gnu/local.mk | 1 + gnu/packages/cpp.scm | 27 + .../miniz-cpp-fixed-duplicated-symbols.patch | 2734 +++++++++++++++++ gnu/packages/textutils.scm | 73 +- 4 files changed, 2833 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/miniz-cpp-fixed-duplicated-symbols.patch base-commit: b8f2eb286ec52c97048e23d326d94ae5772797e8