[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/15: gnu: Make pango-next the new pango.
From: |
guix-commits |
Subject: |
03/15: gnu: Make pango-next the new pango. |
Date: |
Thu, 13 Apr 2023 01:12:04 -0400 (EDT) |
lilyp pushed a commit to branch gnome-team
in repository guix.
commit 26c55c14368dcb91f03a4378aa52f54ae30b5791
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Sun Mar 26 17:53:13 2023 +0200
gnu: Make pango-next the new pango.
* 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 @@ iChat interoperability, and multi-user chats and Tubes
using the
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 77f6f853b4..e22dfca9f1 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -389,7 +389,6 @@ topology functions.")
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 @@ Microsoft Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and
Kerberos.")
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 @@ services.")
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 @@ to virtual private networks (VPNs) via OpenVPN.")
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 @@ Compatible with Cisco VPN concentrators configured to use
IPsec.")
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 @@ Cisco's AnyConnect SSL VPN.")
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 @@ usage and information about running processes.")
(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 @@ files.")
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 @@ desktop. It supports world clock, stop watch, alarms,
and count down timer.")
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 @@ your data.")
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 @@ applications.")
(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 @@ applications.")
(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 @@ handling for GTK+-2.x.")
(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 @@ printing and other features typical of a source code
editor.")
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 @@ highlighting and other features typical of a source code
editor.")
(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 @@ application suites.")
libxkbcommon
libxrandr
libxrender
- pango-next
+ pango
vulkan-headers
vulkan-loader ;for vulkan graphics API support
wayland ;for wayland display-backend
@@ -1830,7 +1826,7 @@ library.")
("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 @@ library.")
(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 @@ may also simplify input method development.")
((#: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 @@ Encryption to Gajim.")
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 @@ and as an LV2 plugin.")
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 @@ propagated by default) such as @code{gst-plugins-good} and
(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:
- branch gnome-team updated (ac180c65e5 -> f81e71552f), guix-commits, 2023/04/13
- 03/15: gnu: Make pango-next the new pango.,
guix-commits <=
- 05/15: gnu: Make gobject-introspection-next the new gobject-introspection., guix-commits, 2023/04/13
- 10/15: gnu: gtk+-2: Fix build by hardening list store., guix-commits, 2023/04/13
- 14/15: gnu: inkscape: Use new package style., guix-commits, 2023/04/13
- 15/15: gnu: Remove lib2geom 1.1., guix-commits, 2023/04/13
- 09/15: gnu: python-pygobject: Update to 3.44.1., guix-commits, 2023/04/13
- 02/15: gnu: glib: Update to 2.76.1., guix-commits, 2023/04/13
- 06/15: gnu: gobject-introspection: Update to 1.76.1., guix-commits, 2023/04/13
- 08/15: gnu: python-pygobject: Set upstream-name., guix-commits, 2023/04/13
- 13/15: gnu: inkscape: Update stable version to 1.2.1., guix-commits, 2023/04/13
- 01/15: gnu: librsvg-2.40: Fix test failure with Pango 1.50., guix-commits, 2023/04/13