From patchwork Sat Apr 9 00:53:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexandros Theodotou X-Patchwork-Id: 38461 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 E320327BBEA; Sat, 9 Apr 2022 01:55:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 A704E27BBE9 for ; Sat, 9 Apr 2022 01:55:20 +0100 (BST) Received: from localhost ([::1]:39432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nczNn-0005Vz-Qm for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 20:55:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nczNX-00057l-Oa for guix-patches@gnu.org; Fri, 08 Apr 2022 20:55:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42547) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nczNX-0002pk-GI for guix-patches@gnu.org; Fri, 08 Apr 2022 20:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nczNX-0007Lh-FD for guix-patches@gnu.org; Fri, 08 Apr 2022 20:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54806] [PATCH 2/5] gnu: Add gtksourceview-5. Resent-From: Alexandros Theodotou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Apr 2022 00:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54806 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54806@debbugs.gnu.org Cc: Alexandros Theodotou X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164946564728089 (code B ref -1); Sat, 09 Apr 2022 00:55:03 +0000 Received: (at submit) by debbugs.gnu.org; 9 Apr 2022 00:54:07 +0000 Received: from localhost ([127.0.0.1]:36421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nczMc-0007Iu-OE for submit@debbugs.gnu.org; Fri, 08 Apr 2022 20:54:07 -0400 Received: from lists.gnu.org ([209.51.188.17]:54592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nczMY-0007Ih-Am for submit@debbugs.gnu.org; Fri, 08 Apr 2022 20:54:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nczMY-000537-3U for guix-patches@gnu.org; Fri, 08 Apr 2022 20:54:02 -0400 Received: from mout01.posteo.de ([185.67.36.141]:54665) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nczMU-0002Zq-Ar for guix-patches@gnu.org; Fri, 08 Apr 2022 20:54:00 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 66AD4240026 for ; Sat, 9 Apr 2022 02:53:56 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4KZxSz6rK8z6tmB; Sat, 9 Apr 2022 02:53:55 +0200 (CEST) From: Alexandros Theodotou Date: Sat, 9 Apr 2022 00:53:43 +0000 Message-Id: <20220409005346.69279-2-alex@zrythm.org> In-Reply-To: <20220409005346.69279-1-alex@zrythm.org> References: <20220409005346.69279-1-alex@zrythm.org> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.141; envelope-from=alex@zrythm.org; helo=mout01.posteo.de X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gtk.scm (gtksourceview-5): New variable. --- gnu/packages/gtk.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 96297535ce..e8131bb955 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Wamm K. D. ;;; Copyright © 2022 Zhu Zihao +;;; Copyright © 2022 Alexandros Theodotou ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,6 +91,7 @@ (define-module (gnu packages gtk) #:use-module (gnu packages linux) #:use-module (gnu packages m4) #:use-module (gnu packages man) + #:use-module (gnu packages pcre) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) @@ -618,6 +620,44 @@ (define-public gtksourceview highlighting and other features typical of a source code editor.") (license license:lgpl2.1+))) +(define-public gtksourceview-5 + (package (inherit gtksourceview) + (name "gtksourceview") + (version "5.4.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0dz6hifma60plbfqm4vlh1mps2z7f15rkkmflf5fra3hwqbw4fq0")))) + (build-system meson-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + (lambda _ + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) + (add-before + 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server"))) + ;; Tests require a running X server. + (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) + (setenv "DISPLAY" ":1") + ;; For the missing /etc/machine-id. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t)))) + #:configure-flags + ;; Needs newer gobject-introspection + '("-Dintrospection=disabled"))) + (propagated-inputs + ;; gtksourceview-3.0.pc refers to all these. + (list glib gtk libxml2 pcre2)))) + (define-public gtksourceview-3 (package (inherit gtksourceview) (name "gtksourceview")