From patchwork Wed Jan 4 20:28:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 45855 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 68BBE27BBED; Wed, 4 Jan 2023 20:29:29 +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,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 AA63B27BBE9 for ; Wed, 4 Jan 2023 20:29:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDANj-0004cY-NR; Wed, 04 Jan 2023 15:29:03 -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 1pDANi-0004cQ-Dt for guix-patches@gnu.org; Wed, 04 Jan 2023 15:29: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 1pDANi-0007Qu-5D for guix-patches@gnu.org; Wed, 04 Jan 2023 15:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pDANh-0003Me-Ln for guix-patches@gnu.org; Wed, 04 Jan 2023 15:29:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60533] [PATCH] Update guile-g-golf. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Jan 2023 20:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60533 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Preston Firestone , 60533@debbugs.gnu.org Received: via spool by 60533-submit@debbugs.gnu.org id=B60533.167286409612876 (code B ref 60533); Wed, 04 Jan 2023 20:29:01 +0000 Received: (at 60533) by debbugs.gnu.org; 4 Jan 2023 20:28:16 +0000 Received: from localhost ([127.0.0.1]:49726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDAMx-0003Lb-Bv for submit@debbugs.gnu.org; Wed, 04 Jan 2023 15:28:16 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:45034) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDAMu-0003LO-5X for 60533@debbugs.gnu.org; Wed, 04 Jan 2023 15:28:13 -0500 Received: by mail-wm1-f67.google.com with SMTP id b24-20020a05600c4a9800b003d21efdd61dso27494412wmp.3 for <60533@debbugs.gnu.org>; Wed, 04 Jan 2023 12:28:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:references:in-reply-to:date:to:from:subject :message-id:from:to:cc:subject:date:message-id:reply-to; bh=APyRQVAfP4iODt2C2p/cTkpczZfaR3W6/O6jY8m7xJo=; b=UtYyl0wwf0kYQi05yycVV01O2cMpRVIGG5T9JJ30jkjyNxABAEAUeObp2SlrNOKdIr i7xcNvRkX6+uxL9htyDTAtW1DBM4amsUAuSWgGpm79MCne5zfDe5GU4eiRFHW4UsBsFO LPLEN08AtNrEg7313kKaxp6IhjZrOrysmW+zn8WJyzn3m3iDYZtr7u3bYcLc9MvU6JWp f5k11ZwTNOIRORL5szbe2ByPXPQ00daDbJqAv2fXZj8tJzSGMcRTbblXM9pawuICg2oq HgkaGueO7o2i1H97WehZbraKPsnGtMXVfzBp4g4f6gQHpvyckixQ4CX+17AbHwtO1sKB 1www== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:references:in-reply-to:date:to:from:subject :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=APyRQVAfP4iODt2C2p/cTkpczZfaR3W6/O6jY8m7xJo=; b=sh0LzxsXQe2rbCsOhaNejfSFuUN23C406Yz7B2dtZE7ZW2fnt2M3j04IcRXn5etnkD xm+1z02zMEu3Eg0TNCX0+jSkW/DxLv+oXZhP0CK53LM3CKTRSYElSSf/u2hVSBH4wzmS 8HKVMdSnRp2fi+s1KPBBqJOGRMh7WQid+Su8TrVKsEvI6G/dTFCD8wmY2ZqwZIf6l9z4 nddAV9EiarEHlQJkKdq6PktDGCacbq6MZiOSaMZX0I62EAN8DUG9n+asjdScZc2NcfPi e5Avuj8j89ywOVuqdeDEAvhSwkfqgSBof1Q0fQF70b65G7FSnAnlQYsfbx+FXfgat58M FcCg== X-Gm-Message-State: AFqh2kpiA0NiYbhxMFppYx60Et1aNltQOy5GUc+eI2f4HWKCzGtJzYTw L9B6MMNq9YHQL6MyWtRiDdg= X-Google-Smtp-Source: AMrXdXuLSXPhfAkw9Eb/gm2FeBYf8KCPLAiEZJzOrvPNc61JBRx5RNTaFwlgGriiHRw9EDdxxj/ACw== X-Received: by 2002:a05:600c:3c88:b0:3d9:69fd:7707 with SMTP id bg8-20020a05600c3c8800b003d969fd7707mr32381059wmb.2.1672864086234; Wed, 04 Jan 2023 12:28:06 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id v26-20020a7bcb5a000000b003cf4eac8e80sm53586375wmj.23.2023.01.04.12.28.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 12:28:05 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Wed, 04 Jan 2023 21:28:04 +0100 In-Reply-To: References: User-Agent: Evolution 3.46.0 MIME-Version: 1.0 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 Hi Preston, Am Dienstag, dem 03.01.2023 um 14:20 -0600 schrieb Preston Firestone: > * guile-xyz.scm: bump guile-g-golf to version 0.8.0.  Proper ChangeLog would be * gnu/packages/guile-xyz.scm (guile-g-golf): Update to 0.8.0-a.1. See below for my comment about the version. > 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]`.  Useless information in the context of a ChangeLog. More useful would have been the following bits: [arguments]: Add #:parallel-build? #f. [inputs]: Replace glib with glib-next. [propagated-inputs]: Replace gobject-introspection with gobject- introspection-next. > --- >  gnu/packages/guile-xyz.scm | 155 ++++++++++++++++++----------------- > -- >  1 file changed, 74 insertions(+), 81 deletions(-) > > 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") The actual version appears to be 0.8.0-a.1 > + (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"))) You should probably stay with git-fetch. > + (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 >  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+))) Do indent your code properly. Also make sure that your MUA doesn't complicate `git am'-based workflows. Attached is a patch in which all of the above have been addressed. Cheers From 2d9048e198e9e8fca9303633227fcc60684a6baf Mon Sep 17 00:00:00 2001 From: Preston Firestone Date: Wed, 4 Jan 2023 21:21:53 +0100 Subject: [PATCH] gnu: guile-g-golf: Update to 0.8.0-a.1. * gnu/packages/guile-xyz.scm (guile-g-golf): Update to 0.8.0-a.1. [arguments]: Add #:parallel-build? #f. [inputs]: Replace glib with glib-next. [propagated-inputs]: Replace gobject-introspection with gobject-introspection-next. --- gnu/packages/guile-xyz.scm | 161 ++++++++++++++++++------------------- 1 file changed, 80 insertions(+), 81 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 9c94764ab3..1468a9c7e4 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2181,91 +2181,90 @@ (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-a.1") + (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 "1lszlssa6k8dhhya5px271gfzas7fyy1iwjqmlxibz5vdirzi565")))) + (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-next)) + (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-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 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)) -- 2.38.1