$ git diff --patch-with-stat --summary 257cb33b707f2fe1da120ff5b040f6168644a18d..2351d4cfc379727ca7c2e80716ff61c007683cb7
.abf.yml | 2 +-
cala-luks-sucker1.patch | 12 ++++++++++++
calamares-bug1286.patch | 12 ------------
calamares.spec | 8 ++++----
4 files changed, 17 insertions(+), 17 deletions(-)
create mode 100644 cala-luks-sucker1.patch
delete mode 100644 calamares-bug1286.patch
diff --git a/.abf.yml b/.abf.yml
index 157394f..cef3e8c 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,4 @@
sources:
OpenMandriva-adverts.tar.xz: d0833604f1ce5bdcc7a1560cc51f4c392a9ed665
- calamares-3.2.17.1.tar.gz: 40b2df513648cde937ecff6257cc790eac1ce5b4
openmandriva-install.svg: a64c8fd2b0e11766cfdcc0c345664b99c4b108b7
+ calamares-3.2.18.tar.gz: fb77ce09ff2a0c468ccb4f2b4d9f6b787731c857
diff --git a/cala-luks-sucker1.patch b/cala-luks-sucker1.patch
new file mode 100644
index 0000000..e552e00
--- /dev/null
+++ b/cala-luks-sucker1.patch
@@ -0,0 +1,12 @@
+diff -Naur calamares-3.2.18/src/modules/partition/jobs/FillGlobalStorageJob.cpp calamares-3.2.18-p/src/modules/partition/jobs/FillGlobalStorageJob.cpp
+--- calamares-3.2.18/src/modules/partition/jobs/FillGlobalStorageJob.cpp 2020-01-28 17:42:21.000000000 +0100
++++ calamares-3.2.18-p/src/modules/partition/jobs/FillGlobalStorageJob.cpp 2020-02-13 03:31:31.121174177 +0100
+@@ -89,7 +89,7 @@
+ map[ "fs" ] = partition->fileSystem().name( { QStringLiteral("C") } ); // Untranslated
+ if ( partition->fileSystem().type() == FileSystem::Luks &&
+ dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() )
+- map[ "fs" ] = dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS()->name();
++ map[ "fs" ] = dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS()->name( { QStringLiteral("C") } );
+ map[ "uuid" ] = uuid;
+
+ // Debugging for inside the loop in createPartitionList(),
diff --git a/calamares-bug1286.patch b/calamares-bug1286.patch
deleted file mode 100644
index 612e350..0000000
--- a/calamares-bug1286.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up calamares-3.2.17.1/CMakeLists.txt.omv~ calamares-3.2.17.1/CMakeLists.txt
---- calamares-3.2.17.1/CMakeLists.txt.omv~ 2019-12-19 01:55:25.761186246 +0100
-+++ calamares-3.2.17.1/CMakeLists.txt 2019-12-19 01:55:44.005185361 +0100
-@@ -220,7 +220,7 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang
-
- set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
-
-- set( CALAMARES_AUTOMOC_OPTIONS "-butils/moc-warnings.h" )
-+ set( CALAMARES_AUTOMOC_OPTIONS --include utils/moc-warnings.h )
- set( CALAMARES_AUTOUIC_OPTIONS --include utils/moc-warnings.h )
- else()
- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" )
diff --git a/calamares.spec b/calamares.spec
index c585eb3..205887e 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -5,7 +5,7 @@
Summary: Distribution-independent installer framework
Name: calamares
-Version: 3.2.17.1
+Version: 3.2.18
%if "%{git}" != ""
Release: 0.%{git}.1
Source0: calamares-%{version}-%{git}.tar.xz
@@ -60,7 +60,7 @@ Patch6: 0003-disable-lvm.patch
Patch7: calamares-3.2.16-random-seed-location.patch
Patch10: esp-to-boot-flag.patch
Patch11: kpmcore4-api-1.patch
-Patch12: calamares-bug1286.patch
+Patch12: http://frugalware.eu/cala-luks-sucker1.patch
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
@@ -177,8 +177,8 @@ rm -f src/modules/*/*.conf.default-settings
-G Ninja
if grep -q "No Python support" CMakeFiles/CMakeOutput.log; then
- echo "Python support is disabled."
- echo "Probably boost-python libraries weren't detected."
+ printf '%\n' "Python support is disabled."
+ printf '%s\n' "Probably boost-python libraries weren't detected."
exit 1
fi