summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Makefile.config2
-rw-r--r--perl-install/NEWS7
-rw-r--r--perl-install/any.pm2
-rwxr-xr-xperl-install/c/stuff.xs.pl11
-rw-r--r--perl-install/common.pm21
-rw-r--r--perl-install/install/Makefile1
-rw-r--r--perl-install/install/NEWS10
-rw-r--r--perl-install/install/gtk.pm2
-rw-r--r--perl-install/install/pixmaps/desktop-PLASMA-big.png (renamed from perl-install/install/pixmaps/desktop-PLASMA5-big.png)bin89754 -> 89754 bytes
-rw-r--r--perl-install/install/pixmaps/desktop-PLASMA.png (renamed from perl-install/install/pixmaps/desktop-PLASMA5.png)bin8669 -> 8669 bytes
-rw-r--r--perl-install/install/share/list.xml15
-rw-r--r--perl-install/install/steps_gtk.pm4
-rw-r--r--perl-install/install/steps_interactive.pm6
-rw-r--r--perl-install/lang.pm2
-rw-r--r--perl-install/pkgs.pm2
-rw-r--r--perl-install/standalone.pm2
-rwxr-xr-xperl-install/standalone/drakbug2
17 files changed, 61 insertions, 28 deletions
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index b522c643e..edd3edb4d 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -1,5 +1,5 @@
# -*- Makefile -*-
-VERSION:=18.69
+VERSION:=18.70
SUDO = sudo
TMPDIR = /tmp
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 5b8290be1..611e0fc43 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,10 @@
+Version 18.70 - 29 November 2025
+
+- 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
+- fix bugs in any::sessions() (mga#33738)
+
Version 18.69 - 07 June 2025
- Updated translations
- drakautologin now detects and manage Wayland sessions (mga#33738)
diff --git a/perl-install/any.pm b/perl-install/any.pm
index ab93036dc..dc0d112e1 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1450,7 +1450,7 @@ sub selectLanguage_standalone {
]);
$locale->{utf8} = !$non_utf8;
lang::set($locale);
- c::init_setlocale() if $in->isa('interactive::gtk');
+ common::init_setlocale() if $in->isa('interactive::gtk');
lang::lang_changed($locale) if $old_lang ne $locale->{lang};
}
diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl
index 1a148b497..8c780bb2a 100755
--- a/perl-install/c/stuff.xs.pl
+++ b/perl-install/c/stuff.xs.pl
@@ -189,17 +189,6 @@ is_secure_file(filename)
OUTPUT:
RETVAL
-void
-init_setlocale()
- CODE:
- setlocale(LC_ALL, "");
- setlocale(LC_NUMERIC, "C"); /* otherwise eval "1.5" returns 1 in fr_FR for example */
-
-char *
-setlocale(category, locale = NULL)
- int category
- char * locale
-
int
lseek_sector(fd, sector, offset)
int fd
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 508e6b31f..23ae4ea6f 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -7,10 +7,11 @@ BEGIN { eval { require Locale::gettext } } #- allow common.pm to be used in drak
use log;
use run_program;
+use POSIX qw(locale_h);
use Exporter;
our @ISA = qw(Exporter);
-our @EXPORT = qw($SECTORSIZE N P N_ check_for_xserver files_exist formatTime MB formatXiB get_libdir get_parent_uid is_running is_uefi kernel_uefi_type makedev mageia_release mageia_release_info mount_efivars removeXiBSuffix require_root_capability setVirtual set_alternative set_l10n_sort set_permissions to_utf8 translate uefi_type unmakedev);
+our @EXPORT = qw($SECTORSIZE N P N_ check_for_xserver files_exist formatTime MB formatXiB get_libdir get_parent_uid init_setlocale is_running is_uefi kernel_uefi_type makedev mageia_release mageia_release_info mount_efivars removeXiBSuffix require_root_capability setVirtual set_alternative set_l10n_sort set_permissions to_utf8 translate uefi_type unmakedev);
# perl_checker: RE-EXPORT-ALL
push @EXPORT, @MDK::Common::EXPORT;
@@ -34,6 +35,20 @@ our $SECTORSIZE = 512;
=over
+=item init_setlocale()
+
+Initialise all locale categories. Set LC_NUMERIC to 'C' (otherwise eval "1.5" returns 1
+in fr_FR for example). Set all other categories according to the current value of the
+LC_ALL environment variable, or if that is undefined, the LANG environment variable, or
+if that is undefined, the system default.
+
+=cut
+
+sub init_setlocale() {
+ setlocale(LC_ALL, '');
+ setlocale(LC_NUMERIC, 'C');
+}
+
=item N($format, ...)
translate a message by calling gettext(). eg:
@@ -171,8 +186,8 @@ only LC_COLLATE will have no effect.
sub set_l10n_sort() {
my $collation_locale = $ENV{LC_ALL};
if (!$collation_locale) {
- $collation_locale = c::setlocale(c::LC_COLLATE());
- $collation_locale =~ /UTF-8/ or c::setlocale(c::LC_COLLATE(), "$collation_locale.UTF-8");
+ $collation_locale = setlocale(LC_COLLATE);
+ $collation_locale =~ /UTF-8/ or setlocale(LC_COLLATE, "$collation_locale.UTF-8");
}
}
diff --git a/perl-install/install/Makefile b/perl-install/install/Makefile
index 273cd934b..69b46e7be 100644
--- a/perl-install/install/Makefile
+++ b/perl-install/install/Makefile
@@ -54,6 +54,7 @@ install_pms:
get_needed_files: xs
# generate installer system:
mkdir -p $(DEST)/{usr/,}{,s}bin
+ mkdir -p $(DEST)/etc
for dir in /lib /lib64; do [[ -d $$dir ]] && mkdir -p $(DEST){,/usr}$$dir; done || :
/usr/lib/dracut/modules.d/30convertfs/convertfs.sh $(DEST)
REP4PMS=$(REP4PMS) ../../tools/install-xml-file-list share/list.xml $(DEST)
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 509fb0ba1..0685b4ac5 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,13 @@
+Version 18.70 - 29 November 2025
+
+- 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 changes and use glycin to load images
+- fix bugs in any::sessions() (mga#33738)
+
Version 18.69 - 07 June 2025
- Updated translations
- bytes_heavy.pl was merged into bytes.pm
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
index c1096bdf4..c1096bdf4 100644
--- a/perl-install/install/pixmaps/desktop-PLASMA5-big.png
+++ b/perl-install/install/pixmaps/desktop-PLASMA-big.png
Binary files differ
diff --git a/perl-install/install/pixmaps/desktop-PLASMA5.png b/perl-install/install/pixmaps/desktop-PLASMA.png
index 249c164e2..249c164e2 100644
--- a/perl-install/install/pixmaps/desktop-PLASMA5.png
+++ b/perl-install/install/pixmaps/desktop-PLASMA.png
Binary files differ
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index f8e12414a..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>
@@ -168,6 +171,7 @@
<from dir="/usr/share/glib-2.0/schemas">
<from expand="glob">
gschema*
+ org.gnome.desktop.*
</from>
</from>
@@ -252,6 +256,11 @@
<!-- needed by dmraid -->
libdmraid-events-isw.so
+ <!-- mutter -->
+ <from expand="glob">
+ mutter-*/plugins/libdefault.so
+ </from>
+
<!-- needed fro Gtk3-WebKit2 -->
<from expand="glob">
libwebkit2gtk-4.1.so.?
@@ -300,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
@@ -416,8 +429,6 @@
</if>
<from expand="glob">
- /usr/LIB/gdk-pixbuf-2.0/*/loaders.cache
- /usr/LIB/gdk-pixbuf-2.0/*/loaders/libpixbufloader?svg.so
/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 beee19acd..a9ef359be 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -51,7 +51,7 @@ sub new($$) {
run_program::raw({ detach => 1 }, 'spice-vdagent', '>', '/dev/null', '2>', '/dev/null');
}
any::disable_x_screensaver();
- run_program::raw({ detach => 1 }, 'mutter');
+ run_program::raw({ detach => 1 }, 'mutter', '--x11');
install::gtk::init_gtk($o);
install::gtk::init_sizes($o);
install::gtk::install_theme($o);
@@ -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;
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index a3c8aa7ea..5301bd1f3 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -1612,7 +1612,7 @@ sub bindtextdomain() {
#- NB: not using $::isInstall to make it work more easily at install and standalone
my $localedir = "$ENV{SHARE_PATH}/locale" . ($::prefix ? "_special" : '');
- c::init_setlocale();
+ common::init_setlocale();
foreach (@::textdomains, 'libDrakX') {
Locale::gettext::bind_textdomain_codeset($_, 'UTF-8');
Locale::gettext::bindtextdomain($_, $localedir);
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 66dbead65..6bcdbab7f 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -227,7 +227,7 @@ sub detect_network_drivers {
sub detect_hardware_packages {
my ($do_pkgs, $o_match_all_hardware) = @_;
my @ignore_flags = $::isInstall ? () : (
- if_(!$do_pkgs->is_installed('task-plasma5-minimal'), "CAT_PLASMA5"),
+ if_(!$do_pkgs->is_installed('task-plasma-minimal'), "CAT_PLASMA"),
if_(!$do_pkgs->is_installed('task-gnome-minimal'), "CAT_GNOME"),
if_(!$do_pkgs->is_installed('task-cinnamon-minimal'), "CAT_CINNAMON"),
if_(!$do_pkgs->is_installed('task-mate-minimal'), "CAT_MATE"),
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index 806ebf7cd..4b14255d0 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -20,7 +20,7 @@ $::isStandalone = 1;
$ENV{SHARE_PATH} ||= "/usr/share";
eval { #- allow standalone.pm to be used in drakxtools-backend without perl-Locale-gettext
- c::init_setlocale();
+ common::init_setlocale();
Locale::gettext::bindtextdomain('libDrakX', "/usr/share/locale");
};
diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug
index 418a3eeb5..dd8d7f469 100755
--- a/perl-install/standalone/drakbug
+++ b/perl-install/standalone/drakbug
@@ -260,7 +260,7 @@ sub report_bug_to_bugzilla() {
$cpuinfo = $1;
}
my $arch = arch();
- $arch = 'i586' if arch() =~ /^i.86/;
+ $arch = 'i686' if arch() =~ /^i.86/;
my $options = join('&',
($product || $version ? 'cf_rpmpkg=' . join('-', $product, $version) : ()),
'version=' . ($rel_data->{branch} eq 'Devel' ? 'Cauldron' : $rel_data->{version}),
generated by cgit v1.2.1 (git 2.21.0) at 2025-12-18 19:31:48 +0000