From patchwork Sun Mar 26 15:53:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49070 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 EA0E817492; Tue, 11 Apr 2023 08:11:30 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 E79DA1748D for ; Tue, 11 Apr 2023 08:11:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pm89m-0004GZ-IN; Tue, 11 Apr 2023 03:11:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pm89i-0004CZ-FE for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pm89i-0000vi-7D for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pm89i-0008J2-2k for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v3 03/15] gnu: Make pango-next the new pango. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Apr 2023 07:11:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name, Maxim Cournoyer Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.168119702731779 (code B ref 62467); Tue, 11 Apr 2023 07:11:06 +0000 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:27 +0000 Received: from localhost ([127.0.0.1]:36471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm894-0008GP-58 for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:26 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:35619) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88u-0008Dl-4Y for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:20 -0400 Received: by mail-ej1-f65.google.com with SMTP id jg21so17504761ejc.2 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197010; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=QQkEIU1yY+kP96+xlSo6c/rdh6pPIpteqqJjx8kRjRc=; b=IzXVmFjLaJ04xjU8jyMjGJye2c+6ZRHj8lGgb5ZWkSeqC+9iD1psFwy0/tHksmUx83 wYxkI4l8xHuTUkp9s0KChb5bo4M52h3LS6BddqD7uPWfwbUG5Fwag4SaW+sSJ0UXO6Vj 4BVBMA6/PF6skre+T3U5Y8vN+8dVWooGUfv8J90SzNzn3U7WfB6UuD9bCQx4x3mlruC+ QbL0xowNdbiN9emWSL/JOzT6bzAaw7KcT2/62nFqr8PXmZ3lwRbNMpSl0qzdmj6NEoHg vbDBvo9J2L2U+CsOn8Q/nrLCEKIJTuQjZC/ujHkgXSgl+Bz9jYGqKpMnM36YXJGiXAkn ETGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197010; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=QQkEIU1yY+kP96+xlSo6c/rdh6pPIpteqqJjx8kRjRc=; b=DmdmtgObkGR6kckZZRvLQoQhXQnS82dgL0q3BAeddVi/qF0oSlJ9gsfnZbcbjgeO6G 2i9m/ermRNCeI9QA7GnyOKsGloSoCHvhgKaXwKTPPo97VsnQqhxg/zXo+IgUFTiNhncv YhAM/vyKV5QU+gzlZzgK7f6E3D+HYYd8SQatmoQz3Fj2kRYJYMlpS4ziuBTIHw/IE6wS yb9t2PyDRzVmyGZCuWaF8iimsjiAhWXs+5jqC7AMD8LMW7c3jWWDSCllod4XAfZg9Ub/ S9M4Z9elR0bzCsw1ciL1Yh1ZthPEsvTymg8kll/NC/atbQ/rmdPZqM+MTQWZtUL0KEzi 1sGg== X-Gm-Message-State: AAQBX9fCZlNZsUVNV39F6/R2sPfQwes2tXz0TeaGpG1pd8UcE8PmQxEx WFQnmgIU15y5HoWS12iFtMIlnopNHuK1VQ== X-Google-Smtp-Source: AKy350ZBHMaxTTdlWx1fPoFbnpu1Wc9MbJQNG6UUO0NFGyThetdD5E4Unu9aqHbaHTqmQkbtOtWEjQ== X-Received: by 2002:a17:907:c24b:b0:94a:32ed:5cb7 with SMTP id tj11-20020a170907c24b00b0094a32ed5cb7mr8686852ejc.31.1681197010408; Tue, 11 Apr 2023 00:10:10 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:10 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 17:53:13 +0200 Message-ID: <9ba78c2d91159e8896f2e112714d5c7beb7ba22f.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gtk.scm (pango): Update to 1.50.4. (pango-next): Delete variable. (pango-1.48): New variable, defining old pango with inheritance. (gtk)[propagated-inputs]: Use pango instead of pango-next. (pangomm)[propagated-inputs]: Likewise. (gtksourceview, gtk, pangomm)[inputs]: Use pango instead of pango-next. (pangomm-2.46)[inputs]: Use pango-1.48. * gnu/packages/freedesktop.scm (colord-gtk)[inputs]: Remove pango-next. * gnu/packages/geo.scm (gnome-maps)[inputs]: Likewise. * gnu/packages/gnome.scm (evolution-data-server)[inputs]: Likewise. (network-manager-openvpn)[inputs]: Likewise. (network-manager-vpnc)[inputs]: Likewise. (network-manager-openconnect)[inputs]: Likewise. (network-manager-fortisslvpn)[inputs]: Likewise. (gnome-bluetooth)[inputs]: Likewise. (baobab)[inputs]: Likewise. (gnome-calendar)[inputs]: Likewise. (gtranslator)[inputs]: Likewise. * gnu/packages/ibus.scm (ibus)[inputs]: Likewise. * gnu/packages/messaging.scm (dino)[inputs]: Likewise. * gnu/packages/music.scm (zrythm)[inputs]: Likewise. * gnu/packages/webkit.scm (webkitgtk-next)[inputs]: Likewise. --- gnu/packages/freedesktop.scm | 4 +--- gnu/packages/geo.scm | 1 - gnu/packages/gnome.scm | 25 ++++++------------------- gnu/packages/gtk.scm | 26 +++++++++++--------------- gnu/packages/ibus.scm | 2 +- gnu/packages/messaging.scm | 1 - gnu/packages/music.scm | 2 +- gnu/packages/webkit.scm | 3 +-- 8 files changed, 21 insertions(+), 43 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 043d1ec92b..d63faedb85 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2113,9 +2113,7 @@ (define-public colord-gtk pkg-config vala)) (inputs - ;; TODO: remove pango-next after it's the default. - (list gtk+ - pango-next)) + (list gtk+)) (propagated-inputs ;; colord-gtk.pc refers to all these. (list colord gtk)) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 753ab558ad..9465c0eda7 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -388,7 +388,6 @@ (define-public gnome-maps libshumate libsoup libxml2 - pango-next ;TODO: remove when it's the default rest-next webkitgtk)) (synopsis "Graphical map viewer and wayfinding program") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 99ca0fef88..2f73c0a9b7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8406,7 +8406,6 @@ (define-public evolution-data-server libphonenumber mit-krb5 openldap - pango-next ;remove after it's the default webkitgtk)) (synopsis "Store address books and calendars") (home-page "https://wiki.gnome.org/Apps/Evolution") @@ -8714,8 +8713,7 @@ (define-public network-manager-openvpn libnma libsecret network-manager - openvpn - pango-next)) ;remove after it's the default + openvpn)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "OpenVPN plug-in for NetworkManager") (description @@ -8765,8 +8763,7 @@ (define-public network-manager-vpnc vpnc network-manager libnma - libsecret - pango-next)) ;TODO: remove after it's the default + libsecret)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "VPNC plug-in for NetworkManager") (description @@ -8818,8 +8815,7 @@ (define-public network-manager-openconnect libxml2 lz4 network-manager - openconnect - pango-next)) ;TODO: remove after it's the default + openconnect)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "OpenConnect plug-in for NetworkManager") (description @@ -8882,7 +8878,6 @@ (define-public network-manager-fortisslvpn libsecret network-manager openfortivpn - pango-next ;TODO: remove after it's the default ppp)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "Fortinet SSLVPN plug-in for NetworkManager") @@ -9309,8 +9304,6 @@ (define-public gnome-bluetooth (list eudev gsound libnotify - ;; TODO: Delete pango-next after it's the default. - pango-next python-dbus upower)) (synopsis "GNOME Bluetooth subsystem") @@ -10023,10 +10016,7 @@ (define-public baobab python vala)) (inputs - (list gtk libadwaita libhandy - ;; XXX: Ensure pango-next is used instead of the equally propagated - ;; 'pango'. - pango-next)) + (list gtk libadwaita libhandy)) (synopsis "Disk usage analyzer for GNOME") (description "Baobab (Disk Usage Analyzer) is a graphical application to analyse disk @@ -10624,9 +10614,7 @@ (define-public gnome-calendar gsettings-desktop-schemas libadwaita libdazzle - libgweather4-with-libsoup2 - ;; Remove pango-next when it's the default. - pango-next)) + libgweather4-with-libsoup2)) (home-page "https://wiki.gnome.org/Apps/Calendar") (synopsis "GNOME's calendar application") (description @@ -13465,8 +13453,7 @@ (define-public gtranslator gspell libgda libhandy - libsoup - pango-next)) + libsoup)) (propagated-inputs (list gtksourceview-4)) ; required for source view (home-page "https://wiki.gnome.org/Apps/Gtranslator") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 89ce459e4c..edcdda8187 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -427,7 +427,7 @@ (define-public libthai (define-public pango (package (name "pango") - (version "1.48.10") + (version "1.50.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -436,7 +436,7 @@ (define-public pango (patches (search-patches "pango-skip-libthai-test.patch")) (sha256 (base32 - "166wxhsjb6hb0dk7wkkdcmpvasl9n0a0aa64mdgagzfdidwzbq91")))) + "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas @@ -481,21 +481,19 @@ (define-public pango (home-page "https://pango.gnome.org/") (license license:lgpl2.0+))) -;; TODO: Make this the default package in next release cycle. -(define-public pango-next +(define-public pango-1.48 (package (inherit pango) - (name "pango-next") ;to avoid profile conflicts - (version "1.50.4") + (version "1.48.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" - (version-major+minor version) - "/pango-" version ".tar.xz")) + (version-major+minor version) "/" + "pango-" version ".tar.xz")) (patches (search-patches "pango-skip-libthai-test.patch")) (sha256 (base32 - "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl")))))) + "166wxhsjb6hb0dk7wkkdcmpvasl9n0a0aa64mdgagzfdidwzbq91")))))) (define-public pango-1.42 (package @@ -713,8 +711,7 @@ (define-public gtksourceview glib gtk libxml2 - pcre2 - pango-next)) + pcre2)) (home-page "https://wiki.gnome.org/Projects/GtkSourceView") (synopsis "GNOME source code widget") (description "GtkSourceView is a text widget that extends the standard @@ -741,7 +738,6 @@ (define-public gtksourceview-4 (propagated-inputs (modify-inputs (package-propagated-inputs gtksourceview) (replace "gtk" gtk+) - (replace "pango-next" pango) (replace "glib" glib))))) (define-public gtksourceview-3 @@ -1413,7 +1409,7 @@ (define-public gtk libxkbcommon libxrandr libxrender - pango-next + pango vulkan-headers vulkan-loader ;for vulkan graphics API support wayland ;for wayland display-backend @@ -1830,7 +1826,7 @@ (define-public pangomm ("python" ,python) ("xsltproc" ,libxslt))) (propagated-inputs - (list cairo cairomm glibmm pango-next)) + (list cairo cairomm glibmm pango)) (home-page "https://pango.gnome.org//") (synopsis "C++ interface to the Pango text rendering library") (description @@ -1853,7 +1849,7 @@ (define-public pangomm-2.46 (sha256 (base32 "06zczkaxf5p5kjgnzrfylzi40w9a8lxpndgs7rpn12qrsq27sy6k")))) (propagated-inputs - (list cairomm-1.14 glibmm-2.64 pango)))) + (list cairomm-1.14 glibmm-2.64 pango-1.48)))) (define-public atkmm (package diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 7d52c5889e..2bcad54656 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -248,7 +248,7 @@ (define-public ibus ((#:configure-flags flags) #~(cons* "--enable-gtk4" #$flags)))) (inputs (modify-inputs (package-inputs ibus-minimal) - (prepend gtk pango-next))) + (prepend gtk))) (properties (alist-delete 'hidden? (package-properties ibus-minimal))))) (define-public ibus-libpinyin diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index ebb9bc17b3..2365e4f848 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1396,7 +1396,6 @@ (define-public dino libsignal-protocol-c libsoup libsrtp ;for calls support - pango-next ;gtk4 wants pango 1.50+ qrencode sqlite webrtc-audio-processing)) ;for A/V support diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5a28e1321f..bcf587f010 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6501,7 +6501,7 @@ (define-public zrythm libyaml lilv lv2 - pango-next + pango pipewire pulseaudio reproc diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 0a51479985..8ef95ce518 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -290,8 +290,7 @@ (define-public webkitgtk-next (replace "gtk+" gtk))) (inputs (modify-inputs (package-inputs webkitgtk) - (delete "gtk+-2" "libnotify") - (append pango-next))))) ;TODO: remove after it's the default + (delete "gtk+-2" "libnotify"))))) ;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME ;;; packages for webkit2gtk-4.0. See also the upstream tracker for libsoup 3: