From patchwork Mon Aug 15 19:37:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 41695 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 776C227BBEA; Mon, 15 Aug 2022 20:54:19 +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.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 EBFEB27BBE9 for ; Mon, 15 Aug 2022 20:54:18 +0100 (BST) Received: from localhost ([::1]:54334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oNgAE-0001xo-5e for patchwork@mira.cbaines.net; Mon, 15 Aug 2022 15:54:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNg9y-0001ex-UQ for guix-patches@gnu.org; Mon, 15 Aug 2022 15:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54384) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oNg9y-0005c1-Gk for guix-patches@gnu.org; Mon, 15 Aug 2022 15:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oNg9y-0005SJ-Cz for guix-patches@gnu.org; Mon, 15 Aug 2022 15:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57230] [PATCH core-updates 2/3] gnu: gtksourceview: Update to 5.4.2. References: <8e8a8f204658da3504fe4176b8935b5a60e3c078.camel@gmail.com> In-Reply-To: <8e8a8f204658da3504fe4176b8935b5a60e3c078.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Aug 2022 19:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57230 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57230@debbugs.gnu.org Received: via spool by 57230-submit@debbugs.gnu.org id=B57230.166059323620947 (code B ref 57230); Mon, 15 Aug 2022 19:54:02 +0000 Received: (at 57230) by debbugs.gnu.org; 15 Aug 2022 19:53:56 +0000 Received: from localhost ([127.0.0.1]:44130 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNg9s-0005Rk-0a for submit@debbugs.gnu.org; Mon, 15 Aug 2022 15:53:56 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:37630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNg9o-0005RB-0y for 57230@debbugs.gnu.org; Mon, 15 Aug 2022 15:53:52 -0400 Received: by mail-ej1-f68.google.com with SMTP id kb8so15296140ejc.4 for <57230@debbugs.gnu.org>; Mon, 15 Aug 2022 12:53:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:from:to:cc; bh=OeiLFtARZi1bhgvLyFymuRv9wseGWN8mVXs10Gl1+uY=; b=DI7ZeyDIV9QXYVes8s5NCivLSw8IOhl+JNRpI0iZNLqCpV5/UhmYelCMPyyQoG0ULR J1Qo8cBR2bIwDDsHH8Ik42Ar931uX2zOFIaxz+F0z1G8If/63JbCxGqSXd8CSISsZ4sX KLBJyJnwn/NEQICF2AX9XfKWOD78igH4n/ToDPmDc1d6KZjKY8DL6ZtueRXWf+qWqEgY /MaETUUILrnXLHn0FG+EvyzRf7/IhaLalbEWumLjG7n2BPyHk2Ti0kMuL+2T03HYbrRH pFCLG18zrzW90o2pm94MNjaevKzO3ctmvGqlgGFv+686m+AdLJjS96hcZT9Mgw12jNZp caMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:x-gm-message-state:from:to:cc; bh=OeiLFtARZi1bhgvLyFymuRv9wseGWN8mVXs10Gl1+uY=; b=On8uqQagBEZlPkkqu+0bRm7+/FNrgNj7Tg7nRhTTp4XGQQFTzYaSkJFnb3BAEaAwoS Id6eyEIUcmnWQ2h0QdWC7ElAGwKA5Zk60+AlG77y07FSbh56abHCPi8ZZhfHZ3E60ahr EOLmqJJSkdvILKX2t5k+qf7UiHnlruRe+yEVPcXE4EU+wcC60nyzLR7ELV//byde0iy1 1j63w/CyQFDfTfUOhtpiSPQyTxTpVadc1mHSYc3BOYgcuVr9ITyN5OFOPFzI0NXoLGZx zpHLlDzsUOquVcSto79BAY4X6uPrO96FnqUot8AzSGK3iFNLXu+AQUomXdJ+E/cp8Wdd nHCA== X-Gm-Message-State: ACgBeo2m7Tgbs+aekoMLiA7AL2ngnK0JB40bk0NajvmtVXQozxTaBqPl xMGyks0v0dXDiG375ql82gGLVzexs+M= X-Google-Smtp-Source: AA6agR4gBnjFgCj4AOTmfTZ+8JoN56NM5pPtCiGMLZ9KAkLuZQDW49isLnr2ziFmvk/zFx50cabjcw== X-Received: by 2002:a17:906:e8f:b0:730:9480:9728 with SMTP id p15-20020a1709060e8f00b0073094809728mr10963849ejf.99.1660593225188; Mon, 15 Aug 2022 12:53:45 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id v17-20020aa7d811000000b0043d7ff1e3bcsm7136884edq.72.2022.08.15.12.53.44 for <57230@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Aug 2022 12:53:44 -0700 (PDT) From: Liliana Marie Prikler Date: Mon, 15 Aug 2022 21:37:25 +0200 Message-ID: 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gtk.scm (gtksourceview-5): New variable. (gtksourceview): Inherit from gtksourceview-5. --- gnu/packages/gtk.scm | 63 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b3f2439c37..2426faeb2f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -92,6 +92,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) @@ -566,9 +567,61 @@ (define-public gtksourceview-2 (license license:lgpl2.0+) (home-page "https://developer.gnome.org/gtksourceview/"))) -(define-public gtksourceview +(define-public gtksourceview-5 (package (name "gtksourceview") + (version "5.4.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/gtksourceview/" + (version-major+minor version) "/" + "gtksourceview-" version ".tar.xz")) + (sha256 + (base32 + "1rwxnzq2vvck5ni5zsfnmnx2kgasi3a2n29w93g106c4xc3hw55d")))) + (build-system meson-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-build + (lambda _ + (substitute* "meson.build" + (("gnome.post_install" all) + (string-append "# " all))))) + (add-before 'check 'pre-check + (lambda* (#:key inputs native-inputs #:allow-other-kgeys) + (let ((Xvfb (search-input-file (or native-inputs inputs) + "/bin/Xvfb"))) + ;; Tests require a running X server. + (system (format #f "~a :1 &" Xvfb)) + (setenv "DISPLAY" ":1") + ;; For the missing /etc/machine-id. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t)))))) + (native-inputs + (list `(,glib "bin") ; for glib-genmarshal, etc. + intltool + itstool + gobject-introspection + pkg-config + vala + ;; For testing. + xorg-server-for-tests + shared-mime-info)) + (propagated-inputs + ;; gtksourceview-5.0.pc refers to all these. + (list glib gtk libxml2 pcre2)) + (home-page "https://wiki.gnome.org/Projects/GtkSourceView") + (synopsis "GNOME source code widget") + (description "GtkSourceView is a text widget that extends the standard +GTK+ text widget GtkTextView. It improves GtkTextView by implementing syntax +highlighting and other features typical of a source code editor.") + (license license:lgpl2.1+))) + +(define-public gtksourceview + (package + (inherit gtksourceview-5) (version "4.2.0") (source (origin (method url-fetch) @@ -604,13 +657,7 @@ (define-public gtksourceview ("shared-mime-info" ,shared-mime-info))) (propagated-inputs ;; gtksourceview-3.0.pc refers to all these. - (list glib gtk+ libxml2)) - (home-page "https://wiki.gnome.org/Projects/GtkSourceView") - (synopsis "GNOME source code widget") - (description "GtkSourceView is a text widget that extends the standard -GTK+ text widget GtkTextView. It improves GtkTextView by implementing syntax -highlighting and other features typical of a source code editor.") - (license license:lgpl2.1+))) + (list glib gtk+ libxml2)))) (define-public gtksourceview-3 (package (inherit gtksourceview)