unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 75167@debbugs.gnu.org
Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com,
	vivien@planete-kraus.eu
Subject: [bug#75167] [PATCH gnome-team 6/6] gnu: gnome-builder: Update to 47.2.
Date: Sat, 28 Dec 2024 21:35:15 +0100	[thread overview]
Message-ID: <b59cd33a161981c567284d1b9e3b6e16e2588c30.1735418244.git.liliana.prikler@gmail.com> (raw)
In-Reply-To: <cover.1735418244.git.liliana.prikler@gmail.com>

* gnu/packages/gnome.scm (gnome-builder): Update to 47.2.
[#:phases]: Drop ‘patch-source’:
[inputs]: Add gom and libspelling.  Replace libpeas with libpeas-2.
[native-inputs]: Add gcc-14.
---
 gnu/packages/gnome.scm | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f3568350f79..95318a85312 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13649,7 +13649,7 @@ (define-public libspelling
 (define-public gnome-builder
   (package
     (name "gnome-builder")
-    (version "44.2")
+    (version "47.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -13657,7 +13657,7 @@ (define-public gnome-builder
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1c192xzjv5hsbp1p3wil595810k49kgmf5a7lwf260izip3qk9ng"))))
+                "15dlm6zvq54djx6h1z3jg21fw4v21dwh7i9db9k367nd8wybk1s6"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -13665,14 +13665,6 @@ (define-public gnome-builder
       #:configure-flags #~(list "-Dnetwork_tests=false" "-Ddocs=true")
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-source
-            (lambda _
-              ;; With Gnome 4.14, GtkStackPage has an autoptr already, so it'd
-              ;; get redefined.  Drop this phase when updating gnome-builder to
-              ;; 46.0 or newer.  See also
-              ;; <https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/7aaaecefc2ea8a37eaeae8b4d726d119d4eb8fa3>
-              (substitute* "src/libide/tweaks/ide-tweaks-window.c"
-                (("G_DEFINE_AUTOPTR_CLEANUP_FUNC \\(GtkStackPage, .*\\)") ""))))
           (add-after 'unpack 'patch-meson
             (lambda* (#:key inputs #:allow-other-keys)
               (substitute* "meson.build"
@@ -13714,6 +13706,7 @@ (define-public gnome-builder
            flatpak
            gspell
            gtk
+           gom
            json-glib
            jsonrpc-glib
            libadwaita
@@ -13721,9 +13714,10 @@ (define-public gnome-builder
            libdex
            libgit2-glib
            libpanel
-           libpeas
+           libpeas-2
            libportal
            libsoup
+           libspelling
            llvm
            libostree
            python
@@ -13738,6 +13732,10 @@ (define-public gnome-builder
      (list desktop-file-utils           ;for desktop-file-validate
            `(,glib "bin")
            gettext-minimal
+           ;; GCC 14 seems to be required to not end up in a compilation
+           ;; failure.
+           ;; See <https://gitlab.gnome.org/GNOME/gnome-builder/-/issues/2176>.
+           gcc-14
            gi-docgen
            pkg-config
            python                       ;for meson scripts
-- 
2.46.0





  parent reply	other threads:[~2024-12-28 21:18 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-28 20:37 [bug#75167] [PATCH gnome-team 0/6] Update GNOME Builder to 47.2 Liliana Marie Prikler
2024-12-28 19:22 ` [bug#75167] [PATCH gnome-team 1/6] gnu: Add libpeas-2 Liliana Marie Prikler
2024-12-29  3:29   ` Maxim Cournoyer
2024-12-28 19:22 ` [bug#75167] [PATCH gnome-team 2/6] gnu: jsonrpc-glib: Update to 3.44.1 Liliana Marie Prikler
2024-12-28 19:23 ` [bug#75167] [PATCH gnome-team 3/6] gnu: libdex: Update to 0.8.1 Liliana Marie Prikler
2024-12-28 20:34 ` [bug#75167] [PATCH gnome-team 4/6] gnu: gom: Update to 0.5.3 Liliana Marie Prikler
2024-12-28 20:34 ` [bug#75167] [PATCH gnome-team 5/6] gnu: Add libspelling Liliana Marie Prikler
2024-12-29  4:34   ` Maxim Cournoyer
2024-12-28 20:35 ` Liliana Marie Prikler [this message]
2024-12-29  4:38   ` [bug#75167] [PATCH gnome-team 6/6] gnu: gnome-builder: Update to 47.2 Maxim Cournoyer
2024-12-29  4:38 ` [bug#75167] [PATCH gnome-team 0/6] Update GNOME Builder " Maxim Cournoyer
2024-12-29  8:31   ` bug#75167: " Liliana Marie Prikler
2024-12-30  2:49     ` [bug#75167] " Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b59cd33a161981c567284d1b9e3b6e16e2588c30.1735418244.git.liliana.prikler@gmail.com \
    --to=liliana.prikler@gmail.com \
    --cc=75167@debbugs.gnu.org \
    --cc=maxim.cournoyer@gmail.com \
    --cc=vivien@planete-kraus.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).