diff options
Diffstat (limited to 'perl-install/install')
| -rw-r--r-- | perl-install/install/NEWS | 5 | ||||
| -rw-r--r-- | perl-install/install/gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/pixmaps/desktop-PLASMA-big.png (renamed from perl-install/install/pixmaps/desktop-PLASMA5-big.png) | bin | 89754 -> 89754 bytes | |||
| -rw-r--r-- | perl-install/install/pixmaps/desktop-PLASMA.png (renamed from perl-install/install/pixmaps/desktop-PLASMA5.png) | bin | 8669 -> 8669 bytes | |||
| -rw-r--r-- | perl-install/install/share/list.xml | 8 | ||||
| -rw-r--r-- | perl-install/install/steps_gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 6 |
7 files changed, 16 insertions, 7 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 60dd5a440..912b1cd1b 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,6 +1,9 @@ +- use POSIX::setlocale() instead of c::setlocale() to ensure Locale::gettext + uses any locale changes we make (mga#34656) +- use task-plasma-minimal instead of task-plasma5-minimal - use mutter with X11 backend - Create /etc while creating installer system -- Adapt to latest gdk-pixbuf +- Adapt to latest gdk-pixbuf changes and use glycin to load images - fix bugs in any::sessions() (mga#33738) Version 18.69 - 07 June 2025 diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index f878e42d9..a6aad8516 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -212,7 +212,7 @@ q(<fontconfig> } Gtk3->init; - c::init_setlocale(); + common::init_setlocale(); } #------------------------------------------------------------------------------ diff --git a/perl-install/install/pixmaps/desktop-PLASMA5-big.png b/perl-install/install/pixmaps/desktop-PLASMA-big.png Binary files differindex c1096bdf4..c1096bdf4 100644 --- a/perl-install/install/pixmaps/desktop-PLASMA5-big.png +++ b/perl-install/install/pixmaps/desktop-PLASMA-big.png diff --git a/perl-install/install/pixmaps/desktop-PLASMA5.png b/perl-install/install/pixmaps/desktop-PLASMA.png Binary files differindex 249c164e2..249c164e2 100644 --- a/perl-install/install/pixmaps/desktop-PLASMA5.png +++ b/perl-install/install/pixmaps/desktop-PLASMA.png diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 0acffba7e..3c1100d34 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -112,6 +112,9 @@ <!-- needed by WebKit-4.1.typelib --> webkit2gtk-4.1/WebKitNetworkProcess webkit2gtk-4.1/WebKitWebProcess + <!-- glycin-loaders --> + glycin-loaders/2+/glycin-image-rs + glycin-loaders/2+/glycin-svg <from expand="glob"> libinput/libinput-* </from> @@ -306,6 +309,10 @@ /usr/lib/rpm/mageia/macros /usr/lib/rpm/macros + <!-- glycin-loaders --> + /usr/share/glycin-loaders/2+/conf.d/glycin-image-rs.conf + /usr/share/glycin-loaders/2+/conf.d/glycin-svg.conf + /usr/share/pci.ids /usr/share/usb.ids /usr/share/locale/UTF-8 @@ -422,7 +429,6 @@ </if> <from expand="glob"> - /usr/LIB/gdk-pixbuf-2.0/*/loaders.cache /etc/brltty/*/*.ttb /etc/brltty/*/*/*.txt /LIB/brltty/libbrlttyb??.so diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index fa34c947c..a9ef359be 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -186,7 +186,7 @@ sub leavingStep { sub charsetChanged { my ($o) = @_; - c::init_setlocale(); + common::init_setlocale(); install::gtk::load_font($o); install::gtk::create_steps_window($o); } diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index 4dc48acef..55985e01a 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -387,7 +387,7 @@ sub choosePackages { my ($individual, $chooseGroups); if (!$o->{isUpgrade}) { - my $tasks_ok = install::pkgs::packageByName($o->{packages}, 'task-plasma5-minimal') && + my $tasks_ok = install::pkgs::packageByName($o->{packages}, 'task-plasma-minimal') && install::pkgs::packageByName($o->{packages}, 'task-gnome-minimal'); if ($tasks_ok && $availableC >= 2_500_000_000) { _chooseDesktop($o, $o->{rpmsrate_flags_chosen}, \$chooseGroups); @@ -452,7 +452,7 @@ sub _chooseDesktop { my ($o, $rpmsrate_flags_chosen, $chooseGroups) = @_; my @l = group_by2( - PLASMA5 => N("Plasma"), + PLASMA => N("Plasma"), GNOME => N("GNOME"), Custom => N("Custom"), ); @@ -471,7 +471,7 @@ sub _chooseDesktop { } my $desktop = $choice->[0]; log::l("chosen Desktop: $desktop"); - my @desktops = ('PLASMA5', 'GNOME'); + my @desktops = ('PLASMA', 'GNOME'); if (member($desktop, @desktops)) { my ($want, $dontwant) = ($desktop, grep { $desktop ne $_ } @desktops); $rpmsrate_flags_chosen->{"CAT_$want"} = 1; |
