From patchwork Mon Feb 17 22:12:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Pirotte X-Patchwork-Id: 38794 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 417B927BBEA; Mon, 17 Feb 2025 23:10:37 +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.1 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_SBL_CSS, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 3825927BBE2 for ; Mon, 17 Feb 2025 23:10:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkAFT-0008W6-6A; Mon, 17 Feb 2025 18:09:59 -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 1tk9NL-0001NC-0D for guix-patches@gnu.org; Mon, 17 Feb 2025 17:14:03 -0500 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 1tk9NK-0003qC-FI for guix-patches@gnu.org; Mon, 17 Feb 2025 17:14:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:From:Date:To:Subject; bh=K9iguSUb2tgQb5BuWoJjZh0x29XmBBvmmTGzs16vSVo=; b=iFywWiCaWBXm/QetTOdcyqfj5B/aDXmPIY1uz1He8nmSeaHprpc1lqv73lVklzeZk9BbEtp54tL3JIB3P42zRoV0759ow0NyqVAnq1kmvhg1T7MAkS1eDjucb6uhvqNmS5zzW4uag1iA0YH22+kVG/oaNSUs+dcVzsXmNSPHPSAEFQX4P1tmX5AtA1Kf3CFr21RGLip65dyRz0tTBKdxKIT6DMXl3pdmIBOJGjzHu7VZRrG4HWdxEhIEw+Fq43rdPXbjybo6H+h2PbPEhIU59wDQ5HSn15/4HsjlCrJ/h06GgxV+7z3DubWA28JLOlMUO3WrlL+zqpGgyZa4zWDfxw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tk9NK-0007L4-9l for guix-patches@gnu.org; Mon, 17 Feb 2025 17:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76377] gnu: packages: remove g-golf and nomad Resent-From: David Pirotte Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Feb 2025 22:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76377 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 76377@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173983040728022 (code B ref -1); Mon, 17 Feb 2025 22:14:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Feb 2025 22:13:27 +0000 Received: from localhost ([127.0.0.1]:50556 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tk9Mh-0007Hc-LP for submit@debbugs.gnu.org; Mon, 17 Feb 2025 17:13:27 -0500 Received: from lists.gnu.org ([2001:470:142::17]:41908) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tk9Md-0007Gp-Nr for submit@debbugs.gnu.org; Mon, 17 Feb 2025 17:13:21 -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 1tk9MY-0000mZ-4Y for guix-patches@gnu.org; Mon, 17 Feb 2025 17:13:14 -0500 Received: from smtp.all2all.org ([79.99.200.14] helo=moses.all2all.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tk9MV-0003mw-6N for guix-patches@gnu.org; Mon, 17 Feb 2025 17:13:13 -0500 Received: from localhost (localhost [127.0.0.1]) by moses.all2all.org (Postfix) with ESMTP id 0CA5767C007E for ; Mon, 17 Feb 2025 23:13:07 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at moses.all2all.org Received: from moses.all2all.org ([127.0.0.1]) by localhost (moses.all2all.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id H3x_lGuukdPI for ; Mon, 17 Feb 2025 23:13:05 +0100 (CET) Received: from tintin (unknown [168.227.184.188]) by moses.all2all.org (Postfix) with ESMTPSA id CC71767C007A for ; Mon, 17 Feb 2025 23:13:04 +0100 (CET) Date: Mon, 17 Feb 2025 19:12:55 -0300 Message-ID: <20250217191255.0411a90b@tintin> X-Mailer: Claws Mail 4.3.0 (GTK 3.24.43; x86_64-pc-linux-gnu) MIME-Version: 1.0 Received-SPF: pass client-ip=79.99.200.14; envelope-from=david@altosw.be; helo=moses.all2all.org X-Spam_score_int: 7 X-Spam_score: 0.7 X-Spam_bar: / X-Spam_report: (0.7 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Mon, 17 Feb 2025 18:09:57 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: David Pirotte via Guix-patches From: David Pirotte Reply-To: David Pirotte 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 Hello, Attached is a patch to remove g-golf and nomad, the only package that depends on g-golf (nomad was and still is reported to fail to build in guix for quite a long time now, fwiw). Please review and apply as soon as possible. Thanks, David From e3b178e305434640ef903f571e8c324a414487bb Mon Sep 17 00:00:00 2001 From: David Pirotte Date: Mon, 17 Feb 2025 19:11:12 -0300 Subject: [PATCH] gnu: packages: remove g-golf and nomad * gnu/packages/guile-xyz.scm: Remove g-golf. Remove nomad, which depends on g-golf (nomad was and still is reported to fail to build in guix for quite a long time now, fwiw). --- gnu/packages/guile-xyz.scm | 218 ------------------------------------- 1 file changed, 218 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 295f69d2de..958169359f 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2519,103 +2519,6 @@ (define-public guile-sly (home-page "https://dthompson.us/projects/sly.html") (license license:gpl3+))) -(define-public guile-g-golf - (package - (name "guile-g-golf") - (version "0.8.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/g-golf.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "14b6pjchra0axqifpm90m7jbxla2sarhd7bfhzqbn7d14b74sv2d")))) - (build-system gnu-build-system) - (arguments - (list - #:configure-flags - #~(list "--with-guile-site=no") - #:parallel-build? #f - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-guile-site-directory - (lambda _ - (substitute* "configure.ac" - (("SITEDIR=.*$") - "SITEDIR=\"$datadir/guile/site/$GUILE_EFFECTIVE_VERSION\";\n") - (("SITECCACHEDIR=\"\\$libdir/g-golf/") - "SITECCACHEDIR=\"$libdir/")))) - (add-before 'configure 'tests-work-arounds - (lambda* (#:key inputs #:allow-other-keys) - ;; In build environment, There is no /dev/tty - (substitute* "test-suite/tests/gobject.scm" - (("/dev/tty") "/dev/null")))) - (add-before 'configure 'substitute-libs - (lambda* (#:key inputs outputs #:allow-other-keys) - (define (get lib) - (search-input-file inputs (string-append "lib/" lib ".so"))) - - (let* ((libgi (get "libgirepository-1.0")) - (libglib (get "libglib-2.0")) - (libgobject (get "libgobject-2.0")) - (libg-golf (string-append #$output "/lib/libg-golf"))) - (substitute* "g-golf/init.scm" - (("libgirepository-1.0") libgi) - (("libglib-2.0") libglib) - (("libgobject-2.0") libgobject) - (("\\(dynamic-link \"libg-golf\"\\)") - (format #f "~s" - `(catch #t - (lambda () - (dynamic-link "libg-golf")) - (lambda _ - (dynamic-link ,libg-golf)))))) - (setenv "GUILE_AUTO_COMPILE" "0") - #t))) - (add-before 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) - ;; The test suite requires a running X server. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - #t))))) - (inputs - (list guile-3.0 guile-lib glib)) - (native-inputs - (list autoconf - automake - texinfo - gettext-minimal - libtool - pkg-config - ;; required for tests - gtk+ - xorg-server-for-tests)) - (propagated-inputs - (list gobject-introspection)) - (home-page "https://www.gnu.org/software/g-golf/") - (synopsis "Guile bindings for GObject Introspection") - (description - "G-Golf (Gnome: (Guile Object Library for)) is a library for developing -modern applications in Guile Scheme. It comprises a direct binding to the -GObject Introspection API and higher-level functionality for importing Gnome -libraries and making GObject classes (and methods) available in Guile's -object-oriented programming system, GOOPS.") - (license license:lgpl3+))) - -(define-public g-golf - (deprecated-package "g-golf" guile-g-golf)) - -(define-public guile2.2-g-golf - (package - (inherit guile-g-golf) - (name "guile2.2-g-golf") - (inputs - (modify-inputs (package-inputs guile-g-golf) - (replace "guile" guile-2.2) - (replace "guile-lib" guile2.2-lib))))) - (define-public g-wrap (package (name "g-wrap") @@ -4425,127 +4328,6 @@ (define-public guile-png processing filters.") (license license:gpl3+))) -(define-public nomad - (package - (name "nomad") - (version "0.2.0-alpha-199-g3e7a475") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/nomad.git/") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0p0ha6prp7pyadp61clbhc6b55023vxzfwy14j2qygb2mkq7fhic")))) - (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("bash" ,bash) - ("pkg-config" ,pkg-config) - ("libtool" ,libtool) - ("guile" ,guile-2.2) - ("glib:bin" ,glib "bin") - ("texinfo" ,texinfo) - ("gettext" ,gettext-minimal) - ("perl" ,perl))) - (inputs - `(("bash" ,bash-minimal) ; for wrap-program - ;; Guile - ("guile" ,guile-2.2) - ("guile-lib" ,guile2.2-lib) - ("guile-readline" ,guile2.2-readline) - ("guile-gcrypt" ,guile2.2-gcrypt) - ("gnutls" ,gnutls) - ("g-golf" ,guile2.2-g-golf) - ("shroud" ,shroud) - ("emacsy" ,emacsy-minimal) - ;; Gtk - ("glib" ,glib) - ("dbus-glib" ,dbus-glib) - ("glib-networking" ,glib-networking) - ("gtk+" ,gtk+) - ("gtk+:bin" ,gtk+ "bin") - ("webkitgtk" ,webkitgtk-for-gtk3) - ("gtksourceview" ,gtksourceview-4) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("vte" ,vte) - ;; Gstreamer - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("gst-plugins-good" ,gst-plugins-good) - ("gst-plugins-bad" ,gst-plugins-bad) - ("gst-plugins-ugly" ,gst-plugins-ugly) - ;; Util - ("xorg-server" ,xorg-server))) - (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (ice-9 popen) - (ice-9 rdelim) - (srfi srfi-26)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-webkitgtk - (lambda _ - ;; Adapt to the version we have in Guix. - (substitute* "configure.ac" - (("webkit2gtk-4\\.0") "webkit2gtk-4.1") - (("webkit2gtk-web-extension-4\\.0") - "webkit2gtk-web-extension-4.1")) - - (substitute* "typelib/Makefile.am" - (("WebKit2-4\\.0") "WebKit2-4.1")))) - (add-before 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) - ;; The test suite requires a running X server. - (system (format #f "~a/bin/Xvfb :1 &" - (assoc-ref inputs "xorg-server"))) - (setenv "DISPLAY" ":1") - #t)) - (add-after 'install 'wrap-binaries - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (effective (read-line (open-pipe* - OPEN_READ - "guile" "-c" - "(display (effective-version))"))) - (gst-plugins (map (lambda (i) - (string-append (assoc-ref inputs i) - "/lib/gstreamer-1.0")) - `("gstreamer" - "gst-plugins-base" - "gst-plugins-good" - "gst-plugins-bad" - "gst-plugins-ugly"))) - (out-append (lambda (. args) - (apply string-append out args))) - (gi-path (out-append "/lib/girepository-1.0")) - (load-path (out-append "/share/guile/site/" effective)) - (comp-path (out-append "/lib/guile/" - effective "/site-ccache")) - (ext-path (out-append "/libexec/nomad"))) - (wrap-program (string-append out "/bin/nomad") - `("GUILE_LOAD_PATH" ":" prefix - (,load-path - ,(getenv "GUILE_LOAD_PATH"))) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix - (,comp-path - ,(getenv "GUILE_LOAD_COMPILED_PATH"))) - `("GI_TYPELIB_PATH" ":" prefix - (,gi-path ,(getenv "GI_TYPELIB_PATH"))) - `("GIO_EXTRA_MODULES" ":" prefix - (,(getenv "GIO_EXTRA_MODULES"))) - `("GST_PLUGIN_SYSTEM_PATH" ":" prefix ,gst-plugins) - `("NOMAD_WEB_EXTENSION_DIR" ":" prefix (,ext-path))) - #t)))))) - (home-page "https://savannah.nongnu.org/projects/nomad/") - (synopsis "Extensible Web Browser in Guile Scheme") - (description "Nomad is a Emacs-like web browser that consists of a modular -feature-set, fully programmable in Guile Scheme.") - (license license:gpl3+))) - (define-public guile-cv (package (name "guile-cv") -- 2.47.2