From c3cad0dda04da9ef01c78b5fda0cd61c972136a8 Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 31 Oct 2023 14:54:34 +0300 Subject: [PATCH] calamares ver. bump --- system/installer/Calamares/actions.py | 4 ++ .../Calamares/files/pisilocalayar.patch | 58 +++++++++---------- system/installer/Calamares/pspec.xml | 39 +++++++++++-- 3 files changed, 66 insertions(+), 35 deletions(-) diff --git a/system/installer/Calamares/actions.py b/system/installer/Calamares/actions.py index 39d0436166..2632b070a2 100644 --- a/system/installer/Calamares/actions.py +++ b/system/installer/Calamares/actions.py @@ -10,6 +10,10 @@ from pisi.actionsapi import shelltools from pisi.actionsapi import get def setup(): + shelltools.system("""sed -i 's|Fancy GNU/Linux 2020.2 LTS "Turgid Tuba"|Pisi GNU/Linux 2.3.4 LTS "Pisi Linux"|g' src/branding/default/branding.desc""") + shelltools.system("sed -i 's|2020.2|2.3.4|g' src/branding/default/branding.desc") + shelltools.system("sed -i 's|FancyGL|Pisilinux|g' src/branding/default/branding.desc") + shelltools.makedirs("build") shelltools.cd("build") diff --git a/system/installer/Calamares/files/pisilocalayar.patch b/system/installer/Calamares/files/pisilocalayar.patch index b66adba1d0..752ddfd649 100644 --- a/system/installer/Calamares/files/pisilocalayar.patch +++ b/system/installer/Calamares/files/pisilocalayar.patch @@ -1,6 +1,6 @@ diff -Nuar a/src/modules/mudur/main.py b/src/modules/mudur/main.py --- a/src/modules/mudur/main.py 1970-01-01 02:00:00.000000000 +0200 -+++ b/src/modules/mudur/main.py 2020-03-21 13:48:02.731926493 +0300 ++++ b/src/modules/mudur/main.py 2021-10-30 12:34:17.000000000 +0300 @@ -0,0 +1,66 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- @@ -33,17 +33,17 @@ diff -Nuar a/src/modules/mudur/main.py b/src/modules/mudur/main.py +def run(): + + install_path = libcalamares.globalstorage.value("rootMountPoint") -+ -+ ++ ++ + path = os.path.join(install_path, "etc/locale.conf") -+ ++ + mloc = open(path,"r") + a=mloc.readline() + b=a.split("=")[1] -+ ++ + languages = b.split("_")[0] + -+ ++ + mudur_file_path = os.path.join(install_path, "etc/conf.d/mudur") + lines = [] + for l in open(mudur_file_path, "r").readlines(): @@ -55,63 +55,63 @@ diff -Nuar a/src/modules/mudur/main.py b/src/modules/mudur/main.py + lines.append(l) + + open(mudur_file_path, "w").writelines(lines) -+ ++ + if os.path.exists(os.path.join(install_path, "etc/sudoers")): + os.unlink(os.path.join(install_path, "etc/sudoers")) -+ ++ + + source = os.path.join(install_path, "etc/sudoers.orig") + target = os.path.join(install_path, "etc/sudoers") -+ ++ + shutil.copy(source, target) -+ ++ + libcalamares.utils.target_env_call(['chmod', '440', '/etc/sudoers']) + + return None diff -Nuar a/src/modules/mudur/module.desc b/src/modules/mudur/module.desc --- a/src/modules/mudur/module.desc 1970-01-01 02:00:00.000000000 +0200 -+++ b/src/modules/mudur/module.desc 2020-03-21 13:49:51.631918635 +0300 ++++ b/src/modules/mudur/module.desc 2021-10-30 12:34:17.000000000 +0300 @@ -0,0 +1,6 @@ +--- +type: "job" +name: "mudur" +interface: "python" +script: "main.py" -+ ++ diff -Nuar a/src/modules/packages/main.py b/src/modules/packages/main.py ---- a/src/modules/packages/main.py 2020-02-28 01:26:29.000000000 +0300 -+++ b/src/modules/packages/main.py 2020-03-21 13:54:17.751899433 +0300 -@@ -311,17 +311,17 @@ - pass - - +--- a/src/modules/packages/main.py 2023-04-24 23:33:41.000000000 +0300 ++++ b/src/modules/packages/main.py 2023-10-31 14:05:35.506720508 +0300 +@@ -321,17 +321,17 @@ + libcalamares.utils.debug("Dummy backend: Running script '" + str(script) + "'") + + -class PMEntropy(PackageManager): - backend = "entropy" +class PMpisi(PackageManager): + backend = "pisi" - + def install(self, pkgs, from_local=False): - check_target_env_call(["equo", "i"] + pkgs) -+ check_target_env_call(["pisi", "it"] + pkgs) - ++ check_target_env_call(["pisi", "it"] + pkgs) + def remove(self, pkgs): - check_target_env_call(["equo", "rm"] + pkgs) + check_target_env_call(["pisi", "rm","--ignore-comar"] + pkgs) - + def update_db(self): - check_target_env_call(["equo", "update"]) + pass - + def update_system(self): # Doesn't need to update the system explicitly diff -Nuar a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp ---- a/src/modules/partition/gui/EncryptWidget.cpp 2020-03-28 01:43:50.000000000 +0300 -+++ b/src/modules/partition/gui/EncryptWidget.cpp 2020-04-06 12:08:51.169929059 +0300 -@@ -36,6 +36,7 @@ +--- a/src/modules/partition/gui/EncryptWidget.cpp 2023-04-24 23:33:41.000000000 +0300 ++++ b/src/modules/partition/gui/EncryptWidget.cpp 2023-10-31 14:07:10.411534035 +0300 +@@ -45,6 +45,7 @@ m_ui->m_passphraseLineEdit->hide(); m_ui->m_confirmLineEdit->hide(); m_ui->m_iconLabel->hide(); + m_ui->m_encryptCheckBox->hide(); - - connect( m_ui->m_encryptCheckBox, &QCheckBox::stateChanged, this, &EncryptWidget::onCheckBoxStateChanged ); - connect( m_ui->m_passphraseLineEdit, &QLineEdit::textEdited, this, &EncryptWidget::onPassphraseEdited ); + // TODO: this deserves better rendering, an icon or something, but that will + // depend on having a non-bogus implementation of systemSupportsEncryptionAcceptably + if ( systemSupportsEncryptionAcceptably() ) diff --git a/system/installer/Calamares/pspec.xml b/system/installer/Calamares/pspec.xml index db6f99b617..67ccda6233 100644 --- a/system/installer/Calamares/pspec.xml +++ b/system/installer/Calamares/pspec.xml @@ -11,14 +11,13 @@ LGPLv2 A distribution independent installer framework Calamares is a distribution-independent system installer, with an advanced partitioning feature for both manual and automated partitioning operations. - https://github.com/calamares/calamares/archive/v3.2.39.3.tar.gz + https://github.com/calamares/calamares/archive/v3.2.62.tar.gz gettext-devel yaml-cpp - boost-devel - boost-python3 + boost-devel + boost-python3 ki18n-devel - kcoreaddons solid-devel parted-devel qt5-linguist @@ -50,6 +49,10 @@ kservice-devel kconfig-devel kparts-devel + kcrash-devel + kcompletion-devel + kbookmarks-devel + kwidgetsaddons-devel plasma-framework-devel @@ -63,8 +66,8 @@ Calamares libgcc - boost - boost-python3 + boost + boost-python3 python3 kcrash parted @@ -98,6 +101,23 @@ kparts kpackage calamares-theme-pisilinux + icu4c + kauth + libX11 + sonnet + kcodecs + kxmlgui + yaml-cpp + kcompletion + kjobwidgets + ktextwidgets + libpwquality + qt5-location + kwindowsystem + kconfigwidgets + kwidgetsaddons + qt5-webchannel + plasma-framework /usr/bin @@ -117,6 +137,13 @@ + + 2023-10-29 + 3.2.62 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2021-10-30 3.2.39.3