From patchwork Sat Jun 15 18:54:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 65384 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 2AAD427BBEA; Sat, 15 Jun 2024 19:55:28 +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.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=ham 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 B4E3227BBE9 for ; Sat, 15 Jun 2024 19:55:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sIYYJ-0008QG-In; Sat, 15 Jun 2024 14:55:03 -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 1sIYYH-0008Pv-St for guix-patches@gnu.org; Sat, 15 Jun 2024 14:55:01 -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 1sIYYH-0006qr-K4 for guix-patches@gnu.org; Sat, 15 Jun 2024 14:55:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sIYYI-0002e9-Bp for guix-patches@gnu.org; Sat, 15 Jun 2024 14:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71575] [PATCH] gnu: abiword: Switch to the site mirror. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Jun 2024 18:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71575 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71575@debbugs.gnu.org Cc: "Artyom V. Poptsov" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171847768410112 (code B ref -1); Sat, 15 Jun 2024 18:55:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Jun 2024 18:54:44 +0000 Received: from localhost ([127.0.0.1]:41163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sIYXz-0002cx-HZ for submit@debbugs.gnu.org; Sat, 15 Jun 2024 14:54:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:33546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sIYXw-0002cd-Lm for submit@debbugs.gnu.org; Sat, 15 Jun 2024 14:54:42 -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 1sIYXv-0008Mx-9F for guix-patches@gnu.org; Sat, 15 Jun 2024 14:54:39 -0400 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sIYXt-0006oc-3V for guix-patches@gnu.org; Sat, 15 Jun 2024 14:54:38 -0400 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2ebe6495aedso29611461fa.0 for ; Sat, 15 Jun 2024 11:54:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718477673; x=1719082473; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=O0mY3/cnj94oLkPw0+XH8hRjmBZr8k2aExS4e54U9rQ=; b=Xv16+9j8BbOMxC1fc5DmSFZNA5T5GgMBzBqXlhlIcOEVZ2EPyLVAidhz4XO/8/llYk BkM0VqfHm+WmZt6KMgK/l7XyYfX0iL8uykpRw57Ya2Hhb6g0eWsx+jRJkl/fIdtjLrjZ Rh7o5h/45mlyRcA+wViOakWz+DqTuqaJidCFfdgUuNT+/UJI4ifKoOqiaU6wuynI23Vy oXwhoAID3xzDx3dTrxL28jx/aAQ8yNKOBBh0XRoV4wIJIgteRPhvo9pB3wX4S3hZi3+z x8DcpNv0Jmv8RQk1kR8bnCWxvHgrWvOGjtEBYl26p6Qfv5WWFk1HivQVesNrlup/QHV+ cFDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718477673; x=1719082473; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=O0mY3/cnj94oLkPw0+XH8hRjmBZr8k2aExS4e54U9rQ=; b=szwPZZwS1T33BdqmReRdFwI0zkyspKBuL62hBNsB3bFAGh8v705J07xphlBN/CIzbe U6VJ9mzaEifiR+zkglyIY5tXjJALnmAhUJeraFWIvyshIh486QEKoX3K0nzxKVXjl3e9 1pxK8zxVvncgLr0NClZCJZayZHUgxESECPJ499ubg1lw+ELinpgZ7cR93jfGXTAGWE0U D9J4cgNYx4mdsZ9QM8zu1R/K162iXsf1mTXud568DqXcw+1J7CThSulYwbsIq/PhOUfd RhicZO1gPJSa0L/6QkCCI3y5wchpAcecArvpFoLrGqb6YbfGBnhcUP+e+2yEBgr8rUw4 9fKQ== X-Gm-Message-State: AOJu0YyX32uGPgYLBmVj4b5benPK4708sk4jvD3h4W9ZkzenXJzsG9St SjEbFy55fVSpfdZV9Z+y/EOYy8U1sOFbe4MG9+kMhfMuXr8r2VUIaN3yrw== X-Google-Smtp-Source: AGHT+IEa227BOmpn9dWPFuc7PvGaVIbA/crhxLhZWa90gt1+xpVBQ6/6eRb+m220xDr8XmEmxdjhWw== X-Received: by 2002:a2e:3008:0:b0:2d3:4b73:7b40 with SMTP id 38308e7fff4ca-2ec0e5c65eamr37271791fa.17.1718477672686; Sat, 15 Jun 2024 11:54:32 -0700 (PDT) Received: from elephant.. ([95.79.82.148]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2ec05c898f7sm8419041fa.101.2024.06.15.11.54.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jun 2024 11:54:31 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 15 Jun 2024 21:54:16 +0300 Message-ID: <283b320938293f946e1920bd6b289ac3beb589be.1718477656.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22f; envelope-from=poptsov.artyom@gmail.com; helo=mail-lj1-x22f.google.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, URIBL_SBL_A=0.1 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/abiword.scm (abiword): Switch to the site mirror as the original site is down since around August 2023 (see ). [source]: Use a site mirror. [home-page]: Likewise. [arguments]: Use gexps. Change-Id: I4b02ea4e3c60d56547249f83fc1addf56e55055c --- gnu/packages/abiword.scm | 66 +++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 31 deletions(-) base-commit: 612e4dd98f7d1d015e405af9d029bede3fe3c280 diff --git a/gnu/packages/abiword.scm b/gnu/packages/abiword.scm index 1635ed54fd..d3b08323f7 100644 --- a/gnu/packages/abiword.scm +++ b/gnu/packages/abiword.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ (define-module (gnu packages abiword) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) @@ -53,7 +55,9 @@ (define-public abiword (origin (method url-fetch) (uri - (string-append "https://www.abisource.com/downloads/abiword/" version + ;; XXX: The main site is down. Only a (partial) + ;; mirror is available at . + (string-append "http://www.nl.abisource.com/downloads/abiword/" version "/source/abiword-" version ".tar.gz")) (sha256 (base32 "1d1179pnslijpjhz1q155fsc828rrlqf7lsn2inqsl3hk5z28mqj")) @@ -62,35 +66,35 @@ (define-public abiword (build-system glib-or-gtk-build-system) (arguments ;; NOTE: rsvg is disabled, since Abiword - `(#:configure-flags ;; supports it directly, and its BS is broken. - (list ;; wmf was removed from Guix for security. - "--enable-clipart" ;; TODO: The following plugins have unresolved - "--enable-templates" ;; dependencies: aiksaurus, grammar, wpg, gda, - (string-append ;; wordperfect, psion, mathview. - "--enable-plugins=" - "applix " "babelfish " "bmp " "clarisworks " "collab " "command " - "docbook " "eml " "epub " "freetranslation " "garble " "gdict " - "gimp " "goffice " "google " "hancom " "hrtext " "iscii " "kword " - "latex " "loadbindings " "mht " "mif " "mswrite " "opendocument " - "openwriter " "openxml " "opml " "ots " "paint " "passepartout " - "pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict " - "wikipedia " "wml " "xslfo") - "--enable-introspection" - (string-append "--with-gir-dir=" - (assoc-ref %outputs "out") - "/share/gir-1.0") - (string-append "--with-typelib-dir=" - (assoc-ref %outputs "out") - "/lib/girepository-1.0")) - ;; tests fail with: Gtk-CRITICAL **: gtk_settings_get_for_screen: - ;; assertion 'GDK_IS_SCREEN (screen)' failed - ;; GLib-GObject-CRITICAL **: g_object_get_qdata: - ;; assertion 'G_IS_OBJECT (object)' failed - ;; Manually starting the X server before the test phase did not help - ;; the tests to pass. - #:tests? #f - #:make-flags - (list "gtk_update_icon_cache=true"))) + (list #:configure-flags ;; supports it directly, and its BS is broken. + #~(list ;; wmf was removed from Guix for security. + "--enable-clipart" ;; TODO: The following plugins have unresolved + "--enable-templates" ;; dependencies: aiksaurus, grammar, wpg, gda, + (string-append ;; wordperfect, psion, mathview. + "--enable-plugins=" + "applix " "babelfish " "bmp " "clarisworks " "collab " "command " + "docbook " "eml " "epub " "freetranslation " "garble " "gdict " + "gimp " "goffice " "google " "hancom " "hrtext " "iscii " "kword " + "latex " "loadbindings " "mht " "mif " "mswrite " "opendocument " + "openwriter " "openxml " "opml " "ots " "paint " "passepartout " + "pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict " + "wikipedia " "wml " "xslfo") + "--enable-introspection" + (string-append "--with-gir-dir=" + #$output + "/share/gir-1.0") + (string-append "--with-typelib-dir=" + #$output + "/lib/girepository-1.0")) + ;; tests fail with: Gtk-CRITICAL **: gtk_settings_get_for_screen: + ;; assertion 'GDK_IS_SCREEN (screen)' failed + ;; GLib-GObject-CRITICAL **: g_object_get_qdata: + ;; assertion 'G_IS_OBJECT (object)' failed + ;; Manually starting the X server before the test phase did not help + ;; the tests to pass. + #:tests? #f + #:make-flags + #~(list "gtk_update_icon_cache=true"))) (inputs (list boost enchant @@ -120,7 +124,7 @@ (define-public abiword libtool pkg-config python-wrapper)) - (home-page "https://www.abisource.com/") + (home-page "http://www.nl.abisource.com/") (synopsis "Word processing program") ;; HACKERS: The comment below is here so that it shows up early in the