From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id QLrEHcbr+2FzQgEAgWs5BA (envelope-from ) for ; Thu, 03 Feb 2022 15:50:46 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id oGYLG8br+2E2fAAA9RJhRA (envelope-from ) for ; Thu, 03 Feb 2022 15:50:46 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 02B2F3AA42 for ; Thu, 3 Feb 2022 15:50:45 +0100 (CET) Received: from localhost ([::1]:44546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFdRb-0003uw-68 for larch@yhetil.org; Thu, 03 Feb 2022 09:50:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFdQ8-0001to-HP for guix-patches@gnu.org; Thu, 03 Feb 2022 09:49:14 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:32841) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nFdPy-0006pc-DK for guix-patches@gnu.org; Thu, 03 Feb 2022 09:49:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nFdPy-0003YS-AM for guix-patches@gnu.org; Thu, 03 Feb 2022 09:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53748] [PATCH]: Update g-golf to 0.0.1-1010-1824633. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Feb 2022 14:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53748@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164389968613583 (code B ref -1); Thu, 03 Feb 2022 14:49:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Feb 2022 14:48:06 +0000 Received: from localhost ([127.0.0.1]:54968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFdP3-0003X0-JS for submit@debbugs.gnu.org; Thu, 03 Feb 2022 09:48:06 -0500 Received: from lists.gnu.org ([209.51.188.17]:41318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nFdOu-0003Vx-Up for submit@debbugs.gnu.org; Thu, 03 Feb 2022 09:48:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFdOu-0008Uv-GC for guix-patches@gnu.org; Thu, 03 Feb 2022 09:47:56 -0500 Received: from mail-m972.mail.163.com ([123.126.97.2]:17903) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFdOk-0006Ab-Q7 for guix-patches@gnu.org; Thu, 03 Feb 2022 09:47:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=/nU/g ZsjdAcJcOG75ny4PiqVhculIYWLU4DKSOlhBS0=; b=iK/BhbuhG9YKn3TmigoPr gTP8P4g6y5nS/wBIL+fHsM5jpVPbQRNuqkVHQPfFqrOEn91LFXBx0xQomM15T+/t 9P14v7Uc0f0eCR2ZQPbjggjKsZjAFq7PgtkS6CmOuBRKuQBV+arM0OOIOIiBLzKQ R3S2Go6nWBirLvXgSULZSU= Received: from asus-laptop (unknown [27.46.106.193]) by smtp2 (Coremail) with SMTP id GtxpCgBnvlYH6_thQPZKAw--.4477S2; Thu, 03 Feb 2022 22:47:36 +0800 (CST) User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao Date: Thu, 03 Feb 2022 22:45:04 +0800 Message-ID: <86sft0m2gt.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: GtxpCgBnvlYH6_thQPZKAw--.4477S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RWlk3UUUUU X-Originating-IP: [27.46.106.193] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBawicr1et2-ma+AAAsq Received-SPF: pass client-ip=123.126.97.2; envelope-from=all_but_last@163.com; helo=mail-m972.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1643899845; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=/nU/gZsjdAcJcOG75ny4PiqVhculIYWLU4DKSOlhBS0=; b=ia0W0b1XappyD10UOsPcbbQiHSa1/5FEupQeISFQxSE7N9bLibpPmEx8I/ByWCOtS0O60+ fzQckP71EM7ORQZvJgBuwCSb2GSmQKruLC/YjS6+o8P03824fA6IztdyLTnZBqlNjGbi1O EpX4Wf3b5s813TWUf0oTEpVTfVYiWivKcbQxbukg6qY6878Xka8SZg310sEJ4ype39iX3A lBvUmgzZzX2sbuZKG+IiadWJnnyPZgVvmGRV/Kfh7Vv7ksalbwiP/T4TAO1ELt6diwWqSN 0X2dST3jKAXnL7U1dgrgC0vzNvmgOIDzU4+3tYPnp6+4g24OD3gdXnYasx8bhA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1643899845; a=rsa-sha256; cv=none; b=id19eLaaSUAJhMXY6rRgsclvrvjf9sHJ3VfV4FnjjJHs10SKsWAQKjb5Dlu2MQxddxdD5y xknlcTGkqns0aVniNIiNBVhAOEyhrw782qgn5jC3vApxHszJP+bz2HfaB64XUhyN+sK7SK GwV9t0BNpUJdr3rLWQJTfa9ssmx/CYfGNyVdGNImzS8cLk1Nn6dLUojbsSOkSTMAcGXRw7 zSpO8AHT1elb+quSpCOiuR+Oq8XNI9NHS9AIJAhs0dlGKuJaDnGApCc0ywbhRlfaAOOfAk WcmJL35nFYJ21sFAGKdAN7BUliojLz8R5yczWQSewa1KKy+Xr4CAA+WLfziSFQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b="iK/Bhbuh"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b="iK/Bhbuh"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 02B2F3AA42 X-Spam-Score: -4.33 X-Migadu-Scanner: scn1.migadu.com X-TUID: 1udO18cbZr9f --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain This patch series update g-golf to 0.0.1-1010-1824633. Add support for Guile 3. And deprecate variable 'g-golf' in favour of 'guile-g-golf' and 'guile2.2-g-golf'. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYfvrAhUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/nnLAD+N7fVzZBpju2+R1jMjSvmIOrPzRp5 oFe7dVOM3Hp7AJwBANtbfTBqs3vwloEhKebt+layeQn+1/xUUvNUxi267eMD =XGfk -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-g-golf-Update-to-0.0.1-1010-1824633.patch Content-Transfer-Encoding: quoted-printable >From e680954ca2b0d0987045c22642e4c1290a6de05b Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Thu, 3 Feb 2022 22:27:40 +0800 Subject: [PATCH 1/4] gnu: g-golf: Update to 0.0.1-1010-1824633. * gnu/packages/guile-xyz.scm (g-golf)[arguments]: Use G-Expression. : Add phase 'fix-guile-site-directory'. Patch 'configure.ac' before bootstrapping, avoid breaking configure script in accident. In phase 'substitute-libs', use `search-input-file` for searching libraries. In phase 'start-xorg-server', simplify the X server startup script. [inputs]: Remove gtk+ and clutter. Use label-less style. [native-inputs]: Add gtk+ and clutter, they're now only needed in test. Use label-less style. --- gnu/packages/guile-xyz.scm | 124 +++++++++++++++++++------------------ 1 file changed, 63 insertions(+), 61 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index f35ba43057..7be33c060f 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -39,6 +39,7 @@ ;;; Copyright =C2=A9 2021 Zelphir Kaltstahl ;;; Copyright =C2=A9 2021 Oleg Pykhalov ;;; Copyright =C2=A9 2021, 2022 Artyom V. Poptsov +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -117,6 +118,7 @@ (define-module (gnu packages guile-xyz) #:use-module (gnu packages xorg) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix hg-download) #:use-module (guix build-system cmake) @@ -1969,8 +1971,8 @@ (define-public guile-sly (license license:gpl3+))) =20 (define-public g-golf - (let ((commit "ef830107b9765bd6a2da848d0cbe45e11374c0b5") - (revision "839")) + (let ((commit "1824633d37da3794f349d6829e9dac2cf89adaa8") + (revision "1010")) (package (name "g-golf") (version (git-version "0.1.0" revision commit)) @@ -1982,69 +1984,69 @@ (define-public g-golf (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0r472hvmf447kqvkahp1wy4irb5gy8y793hm8r9rc511smdx66cw"))= )) + (base32 "0ncpqv6pbsx9fjmdzvzbjljnhqgw9pynqy9vr9aq35nb7rzrhfdf"))= )) (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("texinfo" ,texinfo) - ("gettext" ,gettext-minimal) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server))) + (arguments + (list + #:configure-flags + #~(list "--with-guile-site=3Dno") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-guile-site-directory + (lambda _ + (substitute* "configure.ac" + (("SITEDIR=3D.*$") + "SITEDIR=3D\"$datadir/guile/site/$GUILE_EFFECTIVE_VERSI= ON\";\n") + (("SITECCACHEDIR=3D\"\\$libdir/g-golf") + "SITECCACHEDIR=3D\"$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 - `(("guile" ,guile-2.2) - ("guile-lib" ,guile2.2-lib) - ("clutter" ,clutter) - ("gtk" ,gtk+) - ("glib" ,glib))) + (list guile-3.0 guile-lib glib)) + (native-inputs + (list autoconf + automake + texinfo + gettext-minimal + libtool + pkg-config + ;; required for tests + gtk+ + clutter + xorg-server-for-tests)) (propagated-inputs (list gobject-introspection)) - (arguments - `(#:phases - (modify-phases %standard-phases - (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) - (let* ((get (lambda (key lib) - (string-append (assoc-ref inputs key) "/lib/"= lib))) - (libgi (get "gobject-introspection" "libgirepos= itory-1.0")) - (libglib (get "glib" "libglib-2.0")) - (libgobject (get "glib" "libgobject-2.0")) - (libgdk (get "gtk" "libgdk-3"))) - (substitute* "configure" - (("SITEDIR=3D\"\\$datadir/g-golf\"") - "SITEDIR=3D\"$datadir/guile/site/$GUILE_EFFECTIVE_VERS= ION\"") - (("SITECCACHEDIR=3D\"\\$libdir/g-golf/") - "SITECCACHEDIR=3D\"$libdir/")) - (substitute* "g-golf/init.scm" - (("libgirepository-1.0") libgi) - (("libglib-2.0") libglib) - (("libgdk-3") libgdk) - (("libgobject-2.0") libgobject) - (("\\(dynamic-link \"libg-golf\"\\)") - (format #f "~s" - `(dynamic-link - (format #f "~alibg-golf" - (if (getenv "GUILE_GGOLF_UNINSTALLED= ") - "" - ,(format #f "~a/lib/" - (assoc-ref outputs "out= ")))))))) - (setenv "GUILE_AUTO_COMPILE" "0") - (setenv "GUILE_GGOLF_UNINSTALLED" "1") - #t))) - (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))))) (home-page "https://www.gnu.org/software/g-golf/") (synopsis "Guile bindings for GObject Introspection") (description --=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-Deprecate-the-g-golf-variable.patch >From 567b8f456aae2f5af4714ba96af304bfbcdb4538 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Thu, 3 Feb 2022 22:35:10 +0800 Subject: [PATCH 2/4] gnu: Deprecate the 'g-golf' variable. g-golf now supports both Guile 3.0 and 2.2. Assign a new name to identify the g-golf for different Guile version. * gnu/packages/guile-xyz.scm (g-golf): Rename to guile-g-golf. (g-golf): Define as deprecated by guile-g-golf. --- gnu/packages/guile-xyz.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 7be33c060f..5364e65a58 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1970,11 +1970,11 @@ (define-public guile-sly (home-page "https://dthompson.us/projects/sly.html") (license license:gpl3+))) -(define-public g-golf +(define-public guile-g-golf (let ((commit "1824633d37da3794f349d6829e9dac2cf89adaa8") (revision "1010")) (package - (name "g-golf") + (name "guile-g-golf") (version (git-version "0.1.0" revision commit)) (source (origin @@ -2057,6 +2057,9 @@ (define (get lib) object-oriented programming system, GOOPS.") (license license:lgpl3+)))) +(define-public g-golf + (deprecated-package "g-golf" guile-g-golf)) + (define-public g-wrap (package (name "g-wrap") -- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-Add-guile2.2-g-golf.patch >From 56622a18f2b6c9b820b6564367f6ccdb5d8bb5ec Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Thu, 3 Feb 2022 22:38:59 +0800 Subject: [PATCH 3/4] gnu: Add guile2.2-g-golf. * gnu/packages/guile-xyz.scm (guile2.2-g-golf): New variable. --- gnu/packages/guile-xyz.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 5364e65a58..3fe3c2c690 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2060,6 +2060,14 @@ (define (get lib) (define-public g-golf (deprecated-package "g-golf" guile-g-golf)) +(define-public guile2.2-g-golf + (package + (inherit guile-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") -- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0004-gnu-nomad-Depends-on-proper-version-of-g-golf.patch >From af47535974bf92dc2ba6b20b4d5eeaf7ce1e6928 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Thu, 3 Feb 2022 22:39:54 +0800 Subject: [PATCH 4/4] gnu: nomad: Depends on proper version of g-golf. * gnu/packages/guile-xyz.scm (nomad)[inputs]: Replace 'g-golf' with 'guile2.2-g-golf'. --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 3fe3c2c690..b7922b89f8 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3456,7 +3456,7 @@ (define-public nomad ("guile-readline" ,guile2.2-readline) ("guile-gcrypt" ,guile2.2-gcrypt) ("gnutls" ,gnutls) - ("g-golf" ,g-golf) + ("g-golf" ,guile2.2-g-golf) ("shroud" ,shroud) ("emacsy" ,emacsy-minimal) ;; Gtk -- 2.34.0 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=--