From patchwork Mon Aug 15 19:43:37 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: 41694 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 E493027BBEA; Mon, 15 Aug 2022 20:54:13 +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 22C7527BBE9 for ; Mon, 15 Aug 2022 20:54:13 +0100 (BST) Received: from localhost ([::1]:40302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oNgA8-0001fm-AD for patchwork@mira.cbaines.net; Mon, 15 Aug 2022 15:54:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNg9z-0001f4-8o for guix-patches@gnu.org; Mon, 15 Aug 2022 15:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oNg9y-0005c7-UC 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-0005SQ-Oz 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 3/3] gnu: Make gtksourceview-5 the default gtksourceview. 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.166059323720954 (code B ref 57230); Mon, 15 Aug 2022 19:54:02 +0000 Received: (at 57230) by debbugs.gnu.org; 15 Aug 2022 19:53:57 +0000 Received: from localhost ([127.0.0.1]:44132 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNg9s-0005Ro-FB for submit@debbugs.gnu.org; Mon, 15 Aug 2022 15:53:57 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:43758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNg9n-0005RD-BY for 57230@debbugs.gnu.org; Mon, 15 Aug 2022 15:53:53 -0400 Received: by mail-ed1-f68.google.com with SMTP id o22so10846656edc.10 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=5DpSALtxVLMtWhSTVJx33DFM7Ux3v9b5uLV6wJ9Z4QU=; b=Ol5FJVwY0l1W7Um/yt9LFCu5tgYOT8bDvyoYi05pBV+wNiTv5C7b1RTDKPbhziOnR6 njm9/i/zmKE27stEwNSPstcpbcZSKfoMk/8tSwX/J4CK6/icaaOERZISVQHEFWneCn3j W1dDtawOyWZFPQp3lZknv/wmU+LKW0GTfGa3LHjC8FpO7vn/KkjCQWMWVjOSt2D8hOy1 0EfXuZ/S0fbSXMID28EZtW5rjECIz/4FtFVlWf1fIAN9BXPyJ6AxFa3GZ7ZDGkK4/iFZ 3c1UY6Dz76rZNM1P/3D8qoCYEoumiyt/oc3e7gJ5oRrHbyvErjLSq8rC7QcXBgUIztmn E9yA== 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=5DpSALtxVLMtWhSTVJx33DFM7Ux3v9b5uLV6wJ9Z4QU=; b=bfSp7s9G6CHpwscv4XJXaN6uU1CfQEmqUMimNJNxfe+bQ1RU80sYD1C3zDaOtKSblV 5xSBINOp01IK3VTYKU/ffcj+SuPiQfikFE3RBiLNK1CfG97zTWjxSvNwG8eF/mdGqLIj kX4oeOVXLGINpYr/yRgc3Ds/pRSxnJZpNMUcZDLv8GbgvBAljmPPsS6axXiXMWiqXW4d fys5Vf/qEfzvTJZZolZiBWaThfJYp583Q7Yc1HV4yGFrf0XzGg95TU5bKAdOpYgXJnmG awaDXuTBLy8TLy6b1sCS5xUrvxf8dyshBC2qbHGU2WD8s3XusUBWGMmVDhMfbl0foz+f xfnA== X-Gm-Message-State: ACgBeo2anHzu+R1DStLAXhjm7MmAUuN7Aj9aK+umDF6tFDPAbLzFmM+e 5ymR7bTC50+5XWd1Yl1tzLLDxgYDRMM= X-Google-Smtp-Source: AA6agR79pFOWcDD8A14sYz8PovFVZzAY7P11/7T1Pz1ci0hIfYe30Zhfae4azC21Ps6mLkrjEh0gTA== X-Received: by 2002:a05:6402:2706:b0:43e:5df1:2e04 with SMTP id y6-20020a056402270600b0043e5df12e04mr15449469edd.315.1660593225765; 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.45 for <57230@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Aug 2022 12:53:45 -0700 (PDT) From: Liliana Marie Prikler Date: Mon, 15 Aug 2022 21:43:37 +0200 Message-ID: <071341d011d2d2b00784406db5428996c3d2b0f8.camel@gmail.com> 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): Rename to gtksourceview. (gtksourceview): Rename to gtksourceview-4. (gtksourceview-3): Adjust accordingly. * gnu/packages/gnome.scm (tepl, sushi, gedit, gnome-calculator, xpad) (gitg, gnome-boxes, gnome-latex, setzer, gnome-builder) (gtranslator): Use gtksourceview-4. * gnu/packages/guile-xyz.scm (nomad): Likewise. * gnu/packages/mail.scm (balsa): Likewise. * gnu/packages/messaging.scm (gajim): Likewise. * gnu/packages/music.scm (zrythm, quodlibet): Likewise. * gnu/packages/syndication.scm (giara): Likewise. * gnu/packages/xfce.scm (mousepad): Likewise. --- gnu/packages/gnome.scm | 22 +++++++++++----------- gnu/packages/gtk.scm | 6 +++--- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/music.scm | 4 ++-- gnu/packages/syndication.scm | 2 +- gnu/packages/xfce.scm | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 017a230721..1730b2e799 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1057,7 +1057,7 @@ (define-public tepl (list amtk glib gtk+ - gtksourceview + gtksourceview-4 libxml2 uchardet)) (synopsis "Text editor product line") @@ -1623,7 +1623,7 @@ (define-public sushi gjs gst-plugins-base gstreamer - gtksourceview + gtksourceview-4 harfbuzz libepoxy libmusicbrainz @@ -7259,7 +7259,7 @@ (define-public gedit glib gspell gtk+ - gtksourceview + gtksourceview-4 libpeas libxml2 iso-codes @@ -10083,7 +10083,7 @@ (define-public gnome-calculator python)) (inputs (list `(,glib "bin") - gtksourceview + gtksourceview-4 libgee libhandy libsoup-minimal-2 @@ -10115,7 +10115,7 @@ (define-public xpad (list autoconf automake `(,gtk+ "bin") intltool pkg-config)) (inputs - (list gtksourceview libsm)) + (list gtksourceview-4 libsm)) (home-page "https://wiki.gnome.org/Apps/Xpad") (synopsis "Virtual sticky note") (description @@ -11277,7 +11277,7 @@ (define-public gitg gsettings-desktop-schemas gspell gtk+ - gtksourceview + gtksourceview-4 json-glib libdazzle libgee @@ -11589,7 +11589,7 @@ (define-public gnome-boxes gsettings-desktop-schemas gtk+ gtk-vnc - gtksourceview + gtksourceview-4 json-glib libhandy libosinfo @@ -11786,7 +11786,7 @@ (define-public gnome-latex gsettings-desktop-schemas gspell gtk+ - gtksourceview + gtksourceview-4 libgee tepl-5 uchardet)) @@ -11841,7 +11841,7 @@ (define-public setzer `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gspell" ,gspell) ("gtk+" ,gtk+) - ("gtksourceview" ,gtksourceview) + ("gtksourceview" ,gtksourceview-4) ("pango" ,pango) ("poppler" ,poppler) ("python-pdfminer" ,python-pdfminer-six) @@ -12287,7 +12287,7 @@ (define-public gnome-builder template-glib vte webkitgtk-with-libsoup2)) - (propagated-inputs (list gtksourceview)) ; needed for settings + (propagated-inputs (list gtksourceview-4)) ; needed for settings (native-inputs (list desktop-file-utils ; for desktop-file-validate `(,glib "bin") gettext-minimal @@ -12492,7 +12492,7 @@ (define-public gtranslator ("itstool" ,itstool) ("pkg-config" ,pkg-config))) (propagated-inputs - (list gtksourceview)) ; required for source view + (list gtksourceview-4)) ; required for source view (arguments `(#:build-type "release" #:glib-or-gtk? #t diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 2426faeb2f..b57e6b9092 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -567,7 +567,7 @@ (define-public gtksourceview-2 (license license:lgpl2.0+) (home-page "https://developer.gnome.org/gtksourceview/"))) -(define-public gtksourceview-5 +(define-public gtksourceview (package (name "gtksourceview") (version "5.4.2") @@ -619,7 +619,7 @@ (define-public gtksourceview-5 highlighting and other features typical of a source code editor.") (license license:lgpl2.1+))) -(define-public gtksourceview +(define-public gtksourceview-4 (package (inherit gtksourceview-5) (version "4.2.0") @@ -660,7 +660,7 @@ (define-public gtksourceview (list glib gtk+ libxml2)))) (define-public gtksourceview-3 - (package (inherit gtksourceview) + (package (inherit gtksourceview-4) (name "gtksourceview") (version "3.24.10") (source (origin diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 8e8a73ad30..4578b797a0 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3460,7 +3460,7 @@ (define-public nomad ("gtk+" ,gtk+) ("gtk+:bin" ,gtk+ "bin") ("webkitgtk" ,webkitgtk) - ("gtksourceview" ,gtksourceview) + ("gtksourceview" ,gtksourceview-4) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("vte" ,vte) ;; Gstreamer diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 33dcc48e04..b943a233db 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3766,7 +3766,7 @@ (define-public balsa gnutls gpgme gtk+ - gtksourceview + gtksourceview-4 gtkspell3 libassuan ; in gpgme.pc Requires libcanberra diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 47798c3586..c74e722c74 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1275,7 +1275,7 @@ (define-public gajim ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) ("gtk+" ,gtk+) - ("gtksourceview" ,gtksourceview) + ("gtksourceview" ,gtksourceview-4) ("gupnp-igd" ,gupnp-igd) ("libappindicator" ,libappindicator) ("libnice" ,libnice) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index dcc1a43d2d..6189dd89ac 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6195,7 +6195,7 @@ (define-public zrythm ("glibc" ,glibc) ("graphviz" ,graphviz) ("gtk+" ,gtk+) - ("gtksourceview" ,gtksourceview) + ("gtksourceview" ,gtksourceview-4) ("guile" ,guile-2.2) ("libaudec" ,libaudec) ("libcyaml" ,libcyaml) @@ -6810,7 +6810,7 @@ (define-public quodlibet gst-plugins-ugly gstreamer gtk+ - gtksourceview ; undo, redo, multiline text fields + gtksourceview-4 ; undo, redo, multiline text fields hicolor-icon-theme keybinder-3.0 ; keybindings outside of GNOME librsvg diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 6eb88afb8f..9c066bb4e4 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -196,7 +196,7 @@ (define-public giara (inputs `(("glib" ,glib) ("gtk+" ,gtk+) - ("gtksourceview" ,gtksourceview) + ("gtksourceview" ,gtksourceview-4) ("libhandy" ,libhandy) ("python" ,python) ("python-beautifulsoup" ,python-beautifulsoup4) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 12c490f622..7b76ec0f85 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1338,7 +1338,7 @@ (define-public mousepad `(,glib "bin") ; for glib-compile-schemas. pkg-config)) (inputs - (list gtk+ gtksourceview xfconf)) + (list gtk+ gtksourceview-4 xfconf)) (home-page "https://git.xfce.org/apps/mousepad/") (synopsis "Simple text editor for Xfce") (description