From patchwork Thu Nov 18 13:36:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 34615 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 B2B6427BBE3; Thu, 18 Nov 2021 13:57:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 25C6B27BBE1 for ; Thu, 18 Nov 2021 13:57:54 +0000 (GMT) Received: from localhost ([::1]:40422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnhvF-0003dG-5O for patchwork@mira.cbaines.net; Thu, 18 Nov 2021 08:57:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnhb4-0000XV-Oe for guix-patches@gnu.org; Thu, 18 Nov 2021 08:37:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51848) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mnhb4-00030X-Gs for guix-patches@gnu.org; Thu, 18 Nov 2021 08:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mnhb4-0005q5-Eu for guix-patches@gnu.org; Thu, 18 Nov 2021 08:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51946] GNOME Builder is criminally outdated on core-updates-frozen Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Nov 2021 13:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51946@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163724258622354 (code B ref -1); Thu, 18 Nov 2021 13:37:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Nov 2021 13:36:26 +0000 Received: from localhost ([127.0.0.1]:35161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnhaT-0005oU-Fu for submit@debbugs.gnu.org; Thu, 18 Nov 2021 08:36:25 -0500 Received: from lists.gnu.org ([209.51.188.17]:56676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnhaR-0005oM-Hh for submit@debbugs.gnu.org; Thu, 18 Nov 2021 08:36:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnhaR-0008MA-6x for guix-patches@gnu.org; Thu, 18 Nov 2021 08:36:23 -0500 Received: from [2a00:5881:4008:2810::309] (port=51528 helo=planete-kraus.eu) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1mnhaN-0002nq-QR for guix-patches@gnu.org; Thu, 18 Nov 2021 08:36:22 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id b8e73754 for ; Thu, 18 Nov 2021 13:36:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :to:subject:date:message-id:mime-version:content-type; s=dkim; bh=sK8rALMVEE68mVglRHJ0ylzCB4o=; b=SZZiGfcsmyoMWGLWtXiZznhsCeWZ 0I6N3xZxisedydD/7mYWt95k0xKSWSic2oQitZKQt5uFBxiBcqBDhL0R2tlyHM/G Ju1GuVBonUmWlHVMVeJQ3lsGZVQh3JJ1DEmDwnG8vr7RpG5a51QkTzzFOB3I1OSF KNyDRSWiGZ/g7UM= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id aafc8e3e (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Thu, 18 Nov 2021 13:36:08 +0000 (UTC) Date: Thu, 18 Nov 2021 14:36:02 +0100 Message-ID: <87bl2hfuwt.fsf@planete-kraus.eu> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:5881:4008:2810::309 (failed) Received-SPF: pass client-ip=2a00:5881:4008:2810::309; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, RDNS_NONE=0.793, SPF_HELO_PASS=-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-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" Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus X-getmail-retrieved-from-mailbox: Patches Dear guix, I’d like to upgrade GNOME builder. Now, I don’t know how to manage meson: it does not work because it needs to wrap the python path, but a comment on the meson package says that it is not possible to wrap it. What do you think? Best regards, Vivien From d10b9f555e99309721c771fa94efb400144a9223 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 18 Nov 2021 14:21:45 +0100 Subject: [PATCH 3/3] gnu: gnome-builder: Upgrade to 41.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm: Import modules llvm and markup for gnome-builder. (gnome-builder): Upgrade to 41.2. [arguments]: Add #:glib-or-gtk? #t to compile the schemas. [configure-flags]: Enable more plugins. [phase patch-meson]: Pretend we’re building with webkit2gtk-4.1. [inputs]: Add cmark (markup support), clang and llvm, devhelp, glade, libportal and libsoup 2. --- gnu/packages/gnome.scm | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5f8de271cc..cb9f7afb78 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -147,9 +147,11 @@ (define-module (gnu packages gnome) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages lirc) + #:use-module (gnu packages llvm) #:use-module (gnu packages lua) #:use-module (gnu packages mail) #:use-module (gnu packages man) + #:use-module (gnu packages markup) #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) #:use-module (gnu packages music) @@ -12311,25 +12313,22 @@ (define-public sysprof (define-public gnome-builder (package (name "gnome-builder") - (version "3.36.1") + (version "41.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" + (version-major version) "/" name "-" version ".tar.xz")) (sha256 (base32 - "17pvmd5jypar8dkr6w56hvf7jnq4l1wih2wwgkrv7sblr7rkkar2")))) + "04p031i999dccbnlbysmr6f93x7dji7b559j6yhdsqbqgxb7ncan")))) (build-system meson-build-system) (arguments - `(#:configure-flags (list "-Dnetwork_tests=false" + `(#:glib-or-gtk? #t ; To wrap binaries and compile schemas + #:configure-flags (list "-Dnetwork_tests=false" ;; TODO: Enable all plugins... - "-Dplugin_clang=false" + ;; Flatpak plugin wants libsoup 2 "-Dplugin_flatpak=false" - "-Dplugin_glade=false" - ;; XXX: This one has been shown not to work in - ;; - "-Dplugin_jedi=false" ;; ... except this one. "-Dplugin_update_manager=false") #:phases @@ -12343,6 +12342,8 @@ (define-public gnome-builder (("/usr/lib") (string-append (assoc-ref inputs "python-pygobject") "/lib"))) + (substitute* "meson.build" + (("webkit2gtk-4.0") "webkit2gtk-4.1")) #t)) (add-after 'configure 'fix-ninja (lambda _ @@ -12357,7 +12358,10 @@ (define-public gnome-builder (setenv "DISPLAY" ":1") #t))))) (inputs - `(("devhelp" ,devhelp) + `(("cmark" ,cmark) + ("clang" ,clang) + ("devhelp" ,devhelp) + ("glade" ,glade3) ("gspell" ,gspell) ("gtk+" ,gtk+) ("json-glib" ,json-glib) @@ -12365,6 +12369,9 @@ (define-public gnome-builder ("libdazzle" ,libdazzle) ("libgit2-glib" ,libgit2-glib) ("libpeas" ,libpeas) + ("libportal" ,libportal) + ("libsoup" ,libsoup-minimal-2) + ("llvm" ,llvm) ("python-pygobject" ,python-pygobject) ("sysprof" ,sysprof) ("template-glib" ,template-glib) -- 2.34.0