Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14521 from Rmys/master

Browse Source 
calamares ver. bump
This commit is contained in:
Rmys
2024-07-07 13:18:25 +03:00
committed by GitHub
parent d750e7a4f6 8397a37e59
commit 17aff6d626
3 changed files with 67 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/installer/Calamares/actions.py
+3
View File
@@ -22,6 +22,9 @@ def setup():
-DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_LIBDIR=lib \
-DWITH_PYTHONQT=OFF \ -DWITH_PYTHONQT=OFF \
-DINSTALL_CONFIG=ON \ -DINSTALL_CONFIG=ON \
-DWITH_QT6=ON \
-DWITH_QT5=OFF \
-DWITH_KF5DBus=OFF \
-DWITH_CRASHREPORTER=ON", \ -DWITH_CRASHREPORTER=ON", \
sourceDir=".." ) sourceDir=".." )
system/installer/Calamares/files/pisi_set_hostname2.patch
+2 -2
View File
@@ -1,10 +1,10 @@
diff -Nuar a/src/modules/users/SetHostNameJob.cpp b/src/modules/users/SetHostNameJob.cpp diff -Nuar a/src/modules/users/SetHostNameJob.cpp b/src/modules/users/SetHostNameJob.cpp
--- a/src/modules/users/SetHostNameJob.cpp 2020-02-28 01:26:29.000000000 +0300 --- a/src/modules/users/SetHostNameJob.cpp 2020-02-28 01:26:29.000000000 +0300
+++ b/src/modules/users/SetHostNameJob.cpp 2020-03-21 14:05:55.674849075 +0300 +++ b/src/modules/users/SetHostNameJob.cpp 2020-03-21 14:05:55.674849075 +0300
@@ -64,7 +64,7 @@ @@ -52,7 +52,7 @@
setFileHostname( const QString& hostname ) setFileHostname( const QString& hostname )
{ {
return CalamaresUtils::System::instance()->createTargetFile( return Calamares::System::instance()->createTargetFile(
- QStringLiteral( "/etc/hostname" ), ( hostname + '\n' ).toUtf8(), WriteMode::Overwrite ); - QStringLiteral( "/etc/hostname" ), ( hostname + '\n' ).toUtf8(), WriteMode::Overwrite );
+ QStringLiteral( "/etc/env.d/01hostname" ), ( hostname + '\n' ).toUtf8(), WriteMode::Overwrite ); + QStringLiteral( "/etc/env.d/01hostname" ), ( hostname + '\n' ).toUtf8(), WriteMode::Overwrite );
} }
system/installer/Calamares/pspec.xml
+62 -57
View File
@@ -11,49 +11,48 @@
<License>LGPLv2</License> <License>LGPLv2</License>
<Summary>A distribution independent installer framework</Summary> <Summary>A distribution independent installer framework</Summary>
<Description>Calamares is a distribution-independent system installer, with an advanced partitioning feature for both manual and automated partitioning operations.</Description> <Description>Calamares is a distribution-independent system installer, with an advanced partitioning feature for both manual and automated partitioning operations.</Description>
<Archive sha1sum="d2a3a7b96531ba51ec2c569cab11aaa565970149" type="targz">https://github.com/calamares/calamares/archive/v3.2.62.tar.gz</Archive> <Archive sha1sum="0a89a031e963c37ac5641d6a0d429c3477f48d45" type="targz">https://github.com/calamares/calamares/archive/v3.3.8.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>gettext-devel</Dependency> <Dependency>gettext-devel</Dependency>
<Dependency>yaml-cpp</Dependency> <Dependency>yaml-cpp</Dependency>
<Dependency versionFrom="1.83.0">boost-devel</Dependency> <Dependency versionFrom="1.83.0">boost-devel</Dependency>
<Dependency versionFrom="1.83.0">boost-python3</Dependency> <Dependency versionFrom="1.83.0">boost-python3</Dependency>
<Dependency>ki18n-devel</Dependency> <Dependency>ki18n-kf6-devel</Dependency>
<Dependency>solid-devel</Dependency> <Dependency>solid-kf6-devel</Dependency>
<Dependency>parted-devel</Dependency> <Dependency>parted-devel</Dependency>
<Dependency>qt5-linguist</Dependency> <Dependency>qt6-linguist</Dependency>
<Dependency>qt5-svg-devel</Dependency> <Dependency>qt6-svg-devel</Dependency>
<Dependency>udisks2-devel</Dependency> <Dependency>udisks2-devel</Dependency>
<Dependency>libyaml-devel</Dependency> <Dependency>libyaml-devel</Dependency>
<Dependency>python3-devel</Dependency> <Dependency>python3-devel</Dependency>
<Dependency>kconfig-devel</Dependency> <Dependency>kconfig-kf6-devel</Dependency>
<Dependency>qt5-base-devel</Dependency> <Dependency>qt6-base-devel</Dependency>
<Dependency>polkit-qt-devel</Dependency> <Dependency>polkit-qt6-devel</Dependency>
<Dependency>qt5-webkit-devel</Dependency> <Dependency>qt6-webengine-devel</Dependency>
<Dependency>qt5-webengine-devel</Dependency>
<Dependency>libatasmart-devel</Dependency> <Dependency>libatasmart-devel</Dependency>
<Dependency>kcoreaddons-devel</Dependency> <Dependency>kcoreaddons-kf6-devel</Dependency>
<Dependency>qt5-designer-devel</Dependency> <Dependency>qt6-designer-devel</Dependency>
<Dependency>qt5-assistant-devel</Dependency> <Dependency>qt6-assistant-devel</Dependency>
<Dependency>libutil-linux-devel</Dependency> <Dependency>libutil-linux-devel</Dependency>
<Dependency>qt5-declarative-devel</Dependency> <Dependency>qt6-declarative-devel</Dependency>
<Dependency>libxkbfile-devel</Dependency> <Dependency>libxkbfile-devel</Dependency>
<Dependency>e2fsprogs-devel</Dependency> <Dependency>e2fsprogs-devel</Dependency>
<Dependency>squashfs-tools</Dependency> <Dependency>squashfs-tools</Dependency>
<Dependency>efibootmgr-devel</Dependency> <Dependency>efibootmgr-devel</Dependency>
<Dependency>rsync</Dependency> <Dependency>rsync</Dependency>
<Dependency>gptfdisk</Dependency> <Dependency>gptfdisk</Dependency>
<Dependency>extra-cmake-modules</Dependency> <Dependency>extra-cmake-modules-kf6</Dependency>
<Dependency>kpmcore-devel</Dependency> <Dependency>kpmcore-kf6-devel</Dependency>
<Dependency>kiconthemes-devel</Dependency> <Dependency>kiconthemes-kf6-devel</Dependency>
<Dependency>kio-devel</Dependency> <Dependency>kio-kf6-devel</Dependency>
<Dependency>kservice-devel</Dependency> <Dependency>kservice-kf6-devel</Dependency>
<Dependency>kconfig-devel</Dependency> <Dependency>kconfig-kf6-devel</Dependency>
<Dependency>kparts-devel</Dependency> <Dependency>kparts-kf6-devel</Dependency>
<Dependency>kcrash-devel</Dependency> <Dependency>kcrash-kf6-devel</Dependency>
<Dependency>kcompletion-devel</Dependency> <Dependency>kcompletion-kf6-devel</Dependency>
<Dependency>kbookmarks-devel</Dependency> <Dependency>kbookmarks-kf6-devel</Dependency>
<Dependency>kwidgetsaddons-devel</Dependency> <Dependency>kwidgetsaddons-kf6-devel</Dependency>
<Dependency>plasma-framework-devel</Dependency> <Dependency>libplasma-kf6-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<Patch level="1">pisilocalayar.patch</Patch> <Patch level="1">pisilocalayar.patch</Patch>
@@ -69,20 +68,19 @@
<Dependency>boost</Dependency> <Dependency>boost</Dependency>
<Dependency>boost-python3</Dependency> <Dependency>boost-python3</Dependency>
<Dependency>python3</Dependency> <Dependency>python3</Dependency>
<Dependency>kcrash</Dependency> <Dependency>kcrash-kf6</Dependency>
<Dependency>parted</Dependency> <Dependency>parted</Dependency>
<Dependency>solid</Dependency> <Dependency>solid-kf6</Dependency>
<Dependency>ki18n</Dependency> <Dependency>ki18n-kf6</Dependency>
<Dependency>rsync</Dependency> <Dependency>rsync</Dependency>
<Dependency>kconfig</Dependency> <Dependency>kconfig-kf6</Dependency>
<Dependency>kcoreaddons</Dependency> <Dependency>kcoreaddons-kf6</Dependency>
<Dependency>qt5-svg</Dependency> <Dependency>qt6-svg</Dependency>
<Dependency>qt5-webkit</Dependency>
<Dependency>libatasmart</Dependency> <Dependency>libatasmart</Dependency>
<Dependency>qt5-declarative</Dependency> <Dependency>qt6-declarative</Dependency>
<Dependency>rsync</Dependency> <Dependency>rsync</Dependency>
<Dependency>ntfs-3g</Dependency> <Dependency>ntfs-3g</Dependency>
<Dependency>qt5-base</Dependency> <Dependency>qt6-base</Dependency>
<Dependency>gptfdisk</Dependency> <Dependency>gptfdisk</Dependency>
<Dependency>e2fsprogs</Dependency> <Dependency>e2fsprogs</Dependency>
<Dependency>dmidecode</Dependency> <Dependency>dmidecode</Dependency>
@@ -91,33 +89,33 @@
<Dependency>dosfstools</Dependency> <Dependency>dosfstools</Dependency>
<Dependency>libutil-linux</Dependency> <Dependency>libutil-linux</Dependency>
<Dependency>util-linux</Dependency> <Dependency>util-linux</Dependency>
<Dependency>kpmcore</Dependency> <Dependency>kpmcore-kf6</Dependency>
<Dependency>partitionmanager</Dependency> <Dependency>partitionmanager-kf6</Dependency>
<Dependency>qt5-webengine</Dependency> <Dependency>qt6-webengine</Dependency>
<Dependency>kiconthemes</Dependency> <Dependency>kiconthemes-kf6</Dependency>
<Dependency>kio</Dependency> <Dependency>kio-kf6</Dependency>
<Dependency>kservice</Dependency> <Dependency>kservice-kf6</Dependency>
<Dependency>kconfig</Dependency> <Dependency>kconfig-kf6</Dependency>
<Dependency>kparts</Dependency> <Dependency>kparts-kf6</Dependency>
<Dependency>kpackage</Dependency> <Dependency>kpackage-kf6</Dependency>
<Dependency>calamares-theme-pisilinux</Dependency> <Dependency>calamares-theme-pisilinux</Dependency>
<Dependency>icu4c</Dependency> <Dependency>icu4c</Dependency>
<Dependency>kauth</Dependency> <Dependency>kauth-kf6</Dependency>
<Dependency>libX11</Dependency> <Dependency>libX11</Dependency>
<Dependency>sonnet</Dependency> <Dependency>sonnet-kf6</Dependency>
<Dependency>kcodecs</Dependency> <Dependency>kcodecs-kf6</Dependency>
<Dependency>kxmlgui</Dependency> <Dependency>kxmlgui-kf6</Dependency>
<Dependency>yaml-cpp</Dependency> <Dependency>yaml-cpp</Dependency>
<Dependency>kcompletion</Dependency> <Dependency>kcompletion-kf6</Dependency>
<Dependency>kjobwidgets</Dependency> <Dependency>kjobwidgets-kf6</Dependency>
<Dependency>ktextwidgets</Dependency> <Dependency>ktextwidgets-kf6</Dependency>
<Dependency>libpwquality</Dependency> <Dependency>libpwquality</Dependency>
<Dependency>qt5-location</Dependency> <Dependency>qt6-location</Dependency>
<Dependency>kwindowsystem</Dependency> <Dependency>kwindowsystem-kf6</Dependency>
<Dependency>kconfigwidgets</Dependency> <Dependency>kconfigwidgets-kf6</Dependency>
<Dependency>kwidgetsaddons</Dependency> <Dependency>kwidgetsaddons-kf6</Dependency>
<Dependency>qt5-webchannel</Dependency> <Dependency>qt6-webchannel</Dependency>
<Dependency>plasma-framework</Dependency> <Dependency>libplasma-kf6</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin</Path> <Path fileType="executable">/usr/bin</Path>
@@ -137,6 +135,13 @@
</Package> </Package>
<History> <History>
<Update release="21">
<Date>2024-07-07</Date>
<Version>3.3.8</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="20"> <Update release="20">
<Date>2023-10-29</Date> <Date>2023-10-29</Date>
<Version>3.2.62</Version> <Version>3.2.62</Version>