From patchwork Mon Dec 26 14:57:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Wiktor_=C5=BBelazny?= X-Patchwork-Id: 45588 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 4470727BBEB; Mon, 26 Dec 2022 14:59:51 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 9046627BBE9 for ; Mon, 26 Dec 2022 14:59:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p9owT-0005qM-2K; Mon, 26 Dec 2022 09:59:05 -0500 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 1p9owR-0005pv-7H for guix-patches@gnu.org; Mon, 26 Dec 2022 09:59:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p9owQ-0000y2-VV for guix-patches@gnu.org; Mon, 26 Dec 2022 09:59:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p9owQ-0005Ag-Qu for guix-patches@gnu.org; Mon, 26 Dec 2022 09:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57337] [v2 2/2] gnu: Add docxbox. Resent-From: Wiktor =?utf-8?q?=C5=BBelazny?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Dec 2022 14:59:02 +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: 57337@debbugs.gnu.org Cc: ludo@gnu.org Received: via spool by 57337-submit@debbugs.gnu.org id=B57337.167206673119847 (code B ref 57337); Mon, 26 Dec 2022 14:59:02 +0000 Received: (at 57337) by debbugs.gnu.org; 26 Dec 2022 14:58:51 +0000 Received: from localhost ([127.0.0.1]:53927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p9owE-0005A1-N3 for submit@debbugs.gnu.org; Mon, 26 Dec 2022 09:58:51 -0500 Received: from freeshell.de ([116.202.128.144]:44504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p9owC-00059m-DO for 57337@debbugs.gnu.org; Mon, 26 Dec 2022 09:58:50 -0500 Received: from localhost.localdomain (cst-prg-22-96.cust.vodafone.cz [46.135.22.96]) (Authenticated sender: wz) by freeshell.de (Postfix) with ESMTPSA id 7F244B3A3BA4; Mon, 26 Dec 2022 15:58:10 +0100 (CET) From: Wiktor =?utf-8?q?=C5=BBelazny?= Date: Mon, 26 Dec 2022 15:57:32 +0100 Message-Id: <20221226145732.1237-3-wz@freeshell.de> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221226145732.1237-1-wz@freeshell.de> References: <20221226145732.1237-1-wz@freeshell.de> 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/textutils.scm (docxbox): New variable. --- gnu/packages/textutils.scm | 76 +++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 151add964e..6c3cb2695b 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -58,6 +58,7 @@ (define-module (gnu packages textutils) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages gcc) #:use-module (gnu packages golang) #:use-module (gnu packages gettext) @@ -74,7 +75,8 @@ (define-module (gnu packages textutils) #:use-module (gnu packages ruby) #:use-module (gnu packages slang) #:use-module (gnu packages syncthing) - #:use-module (gnu packages web)) + #:use-module (gnu packages web) + #:use-module (gnu packages xml)) (define-public dos2unix (package @@ -1522,3 +1524,75 @@ (define-public ack easily specify file types, match highlighting, Perl-Compatible Regular Expressions, and being faster to type than grep.") (license license:artistic2.0))) + +(define-public docxbox + (let ((commit "7c09cfdfd055fedf72676250eae8f03bb8ef7ed5") + (revision "1")) + (package + (name "docxbox") + (version (git-version "0.0.5" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gyselroth/docxbox") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0irccm5siy7k6kjnrmm9pxc4cmc3l30377kqpp6vd6y21nk7yc4w")) + (modules '((guix build utils))) + (snippet '(begin + (for-each delete-file-recursively + '("bin" "vendor/json" "vendor/miniz-cpp" + "vendor/tinyxml2")))))) + (build-system cmake-build-system) + ;; (native-inputs (list bats)) ; Enable after fixing tests, use bash module + (inputs `(("json-modern-cxx" ,json-modern-cxx) + ("miniz-cpp" ,miniz-cpp) + ("tinyxml2-source" ,(package-source tinyxml2)))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'unvendor + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("vendor/miniz-cpp/zip_file.hpp") + "")) + (with-directory-excursion "docxbox" + (substitute* (find-files "." "\\.(cc|h)$") + (("#include