all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#71575] [PATCH] gnu: abiword: Switch to the site mirror.
@ 2024-06-15 18:54 Artyom V. Poptsov
  2024-06-26  6:49 ` bug#71575: " jgart via Guix-patches via
  0 siblings, 1 reply; 2+ messages in thread
From: Artyom V. Poptsov @ 2024-06-15 18:54 UTC (permalink / raw)
  To: 71575; +Cc: Artyom V. Poptsov

* gnu/packages/abiword.scm (abiword): Switch to the site mirror as the original
  site is down since around August 2023 (see
  <https://web.archive.org/web/20230801000000*/https://www.abisource.com/>).
  [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(-)

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 <leo@famulari.name>
 ;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;;
 ;;; 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 <https://www.abisource.com/> is down.  Only a (partial)
+         ;;      mirror is available at <http://www.nl.abisource.com/>.
+          (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

base-commit: 612e4dd98f7d1d015e405af9d029bede3fe3c280
-- 
2.45.1





^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#71575: [PATCH] gnu: abiword: Switch to the site mirror.
  2024-06-15 18:54 [bug#71575] [PATCH] gnu: abiword: Switch to the site mirror Artyom V. Poptsov
@ 2024-06-26  6:49 ` jgart via Guix-patches via
  0 siblings, 0 replies; 2+ messages in thread
From: jgart via Guix-patches via @ 2024-06-26  6:49 UTC (permalink / raw)
  To: 71575-done; +Cc: Artyom V. Poptsov

Thanks! applied.

all best,

jgart




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-06-26  6:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-15 18:54 [bug#71575] [PATCH] gnu: abiword: Switch to the site mirror Artyom V. Poptsov
2024-06-26  6:49 ` bug#71575: " jgart via Guix-patches via

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.