From patchwork Tue Jan 3 20:20:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Preston M. Firestone" X-Patchwork-Id: 45835 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 4B1A627BBE9; Wed, 4 Jan 2023 02:00:38 +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.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,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 7DFEC27BBEB for ; Wed, 4 Jan 2023 02:00:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pCt4u-00028C-D6; Tue, 03 Jan 2023 21:00:28 -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 1pCr9S-0008MG-HD for guix-patches@gnu.org; Tue, 03 Jan 2023 18:57:02 -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 1pCr9R-00074j-Rq for guix-patches@gnu.org; Tue, 03 Jan 2023 18:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pCr9R-0006d7-KW for guix-patches@gnu.org; Tue, 03 Jan 2023 18:57:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60533] [PATCH] Update guile-g-golf. Resent-From: Preston Firestone Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Jan 2023 23:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60533 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60533@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167279020225439 (code B ref -1); Tue, 03 Jan 2023 23:57:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jan 2023 23:56:42 +0000 Received: from localhost ([127.0.0.1]:47089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCr97-0006c6-57 for submit@debbugs.gnu.org; Tue, 03 Jan 2023 18:56:42 -0500 Received: from lists.gnu.org ([209.51.188.17]:49294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCnmA-0008Ue-Iq for submit@debbugs.gnu.org; Tue, 03 Jan 2023 15:20:47 -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 1pCnmA-00072u-EH for guix-patches@gnu.org; Tue, 03 Jan 2023 15:20:46 -0500 Received: from mail-yb1-xb2c.google.com ([2607:f8b0:4864:20::b2c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pCnm4-0001fF-Bi for guix-patches@gnu.org; Tue, 03 Jan 2023 15:20:46 -0500 Received: by mail-yb1-xb2c.google.com with SMTP id b16so34447257yba.0 for ; Tue, 03 Jan 2023 12:20:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=Q3BM6UBEnR0XwLPy2ebxecClRiqOmOEMq52uRSJb37k=; b=hV6k1ARmgv3WG9kH1Nwh455kCafjkQkgxEl6guK7gHsMY54/NF73hXv1bIvzd+JIEi DWm8/T86AYskp9Zv0hCwAqRCqry+2za18eDrygomylm+Zynz1sWmmS3rh3C+aStItWx4 O8Fw7Dmdzby+DvwQGjOaLiQT5yTjd0csYPX97azaoVbZb3n8HzXP1N3xTrIvQTHzVLVw MmLss76Su4+GOluKjhLm5wt7FZ/HSu1US7Am77BMdGzcZMSW6NRX+fHe08wf2saZukOS y6V92LgGzIuqeI4dC0pkC/zpnowz9Q/vVoyVywlazV7WAwEeQDVMljC2izoJavFq7JrL 0k6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Q3BM6UBEnR0XwLPy2ebxecClRiqOmOEMq52uRSJb37k=; b=MT9E0d+Iukyf4ZoB6tpQk3itywS4YSCyTzohpbqRBK8DV0MuoEs7uKiEsS1BsPsY2/ OUELJpcKEWIgqHwwfwpIgQKxqdz6996wBfOve2MYpBcmmJeHItUt+XoyFzN5z/fLWiqY 8oX9nXshD5XCHFOMw8SQPwZnTHOEpckVQna1jkWeW9fdK0t9im5BzTecp2un4K9Hr5xS 48rne2f4OX4HofhXt3VFcUygB/iarem5cKF6el0lfG5DPYIgFgQn27GuiB4U8fcNT8m7 IsPOEm+61YC/Uc5AknuIsXwZGGqNXKRnISqlm14fHIY2jp18W300qrUWUqECEvvMwn5p EqKw== X-Gm-Message-State: AFqh2kq+Go49JYiZPvd7vduWEj1ETPeZL7oInlh+wWomjN3B+WIjFqrO 1nAgt+vLPr3Q2F86sH+Eh0izc6hVudnMzVojfUtKZ2Z6DTmgjQ== X-Google-Smtp-Source: AMrXdXuaWZdFbNLqmnqJYQFXGMv5wanZQQt+caRU0TBygZ7qkXJmzdc+U9tX/laUPV0IXEUHi28PFwgAyBghDTY9xY0= X-Received: by 2002:a05:6902:4ee:b0:6f0:7d2e:1a73 with SMTP id w14-20020a05690204ee00b006f07d2e1a73mr5389650ybs.397.1672777238672; Tue, 03 Jan 2023 12:20:38 -0800 (PST) MIME-Version: 1.0 From: Preston Firestone Date: Tue, 3 Jan 2023 14:20:27 -0600 Message-ID: Received-SPF: pass client-ip=2607:f8b0:4864:20::b2c; envelope-from=firestone.preston@gmail.com; helo=mail-yb1-xb2c.google.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, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 03 Jan 2023 18:56:39 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 03 Jan 2023 21:00:26 -0500 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 * guile-xyz.scm: bump guile-g-golf to version 0.8.0. This release works under guix, if a guile program relying on g-golf is run in a guix shell like so: `guix shell guile-g-golf guile gtk -- [program]`. --- gnu/packages/guile-xyz.scm | 155 ++++++++++++++++++------------------- 1 file changed, 74 insertions(+), 81 deletions(-) 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+)))) + (license license:lgpl3+))) (define-public g-golf (deprecated-package "g-golf" guile-g-golf)) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 9c94764ab3..692ef9b50b 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2181,91 +2181,84 @@ (define-public guile-sly (license license:gpl3+))) (define-public guile-g-golf - (let ((commit "1824633d37da3794f349d6829e9dac2cf89adaa8") - (revision "1010")) - (package - (name "guile-g-golf") - (version (git-version "0.1.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/g-golf.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0ncpqv6pbsx9fjmdzvzbjljnhqgw9pynqy9vr9aq35nb7rzrhfdf")))) - (build-system gnu-build-system) - (arguments - (list - #:configure-flags - #~(list "--with-guile-site=no") - #: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+ - clutter - 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 + (package + (name "guile-g-golf") + (version "0.8.0") + (source (origin + (method url-fetch) + (uri + " https://git.savannah.gnu.org/cgit/g-golf.git/snapshot/g-golf-0.8.0-a.1.tar.gz ") + (sha256 + "1zqycqss0g9aqwmvrvsz43mmfxzi7dj3waxkb4w8ikdajjm7rd8r"))) + (build-system glib-or-gtk-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) + (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-for-testing + (lambda* (#:key inputs #:allow-other-keys) + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") #t))))) + (inputs (list guile-3.0 guile-lib glib-next)) + (native-inputs (list autoconf + automake + texinfo + gettext-minimal + libtool + pkg-config + ;; required for tests + gtk+ + clutter + xorg-server-for-tests + dbus)) + (propagated-inputs (list gobject-introspection-next)) + (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