app-admin/calamares : version bump

5 files changed, 149 insertions, 35 deletions

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 5641d7b8..20c7d15c 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1 @@
-DIST calamares-3.1.1.tar.gz 4895018 SHA256 1644f28f0ee166411dafc849d1d1c9b5bf4f7346ebaf430ee3cf1a7d330a85aa SHA512 4c45f949075a46c6b1de14b322f7d124b4346b11c112b410a216359530d055d21ae8357609d2279614da5490f72f38aebf7844942a2e8a8c2a244cf31350720c WHIRLPOOL 8be229cdcbea88c396a98f42232b0dcb30df81895f927ef45c815be618f5d094f85e2b0fdda7cdf93d6a953d785a7c45bd3f0eae70d2e8775a0bccb8d0a19b3e
+DIST calamares-3.1.8.tar.gz 2265097 SHA256 abc3d44285a17175a1cf2ca69e4b89ab207927edc4d0c0ce48253f8e0a61c007 SHA512 f5fe3e92357d2f7492298b26826da420862438e55f91be6f8d9414d332c2f4b74d382d1c128d78e453609a9a2bc79b423c5e331a295479d169ed76a7028f0375 WHIRLPOOL 43cc8bb2ce073e4b632fa8da71fbd3132b60fb5a85786cde8996e91cfa1c91b695279d52853e34da4c63a4344489120c20f8ab843c77d2ba69d114bb877d4a0a
diff --git a/app-admin/calamares/calamares-3.1.1-r1710.ebuild b/app-admin/calamares/calamares-3.1.8-r1.ebuild
index ebf426f6..fe19f596 100644
--- a/app-admin/calamares/calamares-3.1.1-r1710.ebuild
+++ b/app-admin/calamares/calamares-3.1.8-r1.ebuild
@@ -48,10 +48,8 @@ DEPEND="
 RDEPEND=">=app-misc/calamares-runtime-1.0[branding]"
 
 src_prepare() {
-	# by default, calamares writes UUID=partition-uuid in fstab, regardless
-	# is luks or not. This is utterly broken for many reasons. The patch
-	# below will make calamares to write proper /dev/mapper entries.
-	epatch "${FILESDIR}"/${P}-luks-fstab-write-devmapper.patch
+	# build against kpmcore-3.2
+	epatch "${FILESDIR}"/${P}-kpmcore-3.2.patch
 	# support auto-unlocking encrypted /home partition via OpenRC's dmcrypt service
 	epatch -p1 "${FILESDIR}"/${P}-openrc-dmcrypt-cfg.patch
 	# replace calamares installer desktop icon
diff --git a/app-admin/calamares/files/calamares-3.1.1-luks-fstab-write-devmapper.patch b/app-admin/calamares/files/calamares-3.1.1-luks-fstab-write-devmapper.patch
deleted file mode 100644
index 6b6845d8..00000000
--- a/app-admin/calamares/files/calamares-3.1.1-luks-fstab-write-devmapper.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur a/src/modules/fstab/main.py b/src/modules/fstab/main.py
---- a/src/modules/fstab/main.py	2016-11-25 17:38:49.000000000 +0000
-+++ b/src/modules/fstab/main.py	2017-06-02 15:46:38.124863165 +0100
-@@ -257,12 +257,20 @@
-                         check=check,
-                         )
- 
--        return dict(device="UUID=" + partition["uuid"],
--                    mount_point=mount_point or "swap",
--                    fs=filesystem,
--                    options=options,
--                    check=check,
--                    )
-+        if "luksMapperName" in partition:
-+            return dict(device="/dev/mapper/" + partition["luksMapperName"],
-+                        mount_point=mount_point or "swap",
-+                        fs=filesystem,
-+                        options=options,
-+                        check=check,
-+                        )
-+        else:
-+            return dict(device="UUID=" + partition["uuid"],
-+                        mount_point=mount_point or "swap",
-+                        fs=filesystem,
-+                        options=options,
-+                        check=check,
-+                        )
- 
-     def print_fstab_line(self, dct, file=None):
-         """ Prints line to '/etc/fstab' file. """
diff --git a/app-admin/calamares/files/calamares-3.1.8-kpmcore-3.2.patch b/app-admin/calamares/files/calamares-3.1.8-kpmcore-3.2.patch
new file mode 100644
index 00000000..07e506ec
--- /dev/null
+++ b/app-admin/calamares/files/calamares-3.1.8-kpmcore-3.2.patch
@@ -0,0 +1,146 @@
+diff -Naur calamares-3.1.8/src/modules/partition/CMakeLists.txt calamares-3.1.8-p/src/modules/partition/CMakeLists.txt
+--- calamares-3.1.8/src/modules/partition/CMakeLists.txt	2017-11-14 16:18:58.000000000 +0100
++++ calamares-3.1.8-p/src/modules/partition/CMakeLists.txt	2017-11-18 13:16:38.335840619 +0100
+@@ -5,14 +5,10 @@
+ include(GenerateExportHeader)
+ find_package( KF5 REQUIRED CoreAddons )
+ 
+-# These are needed because KPMcore links publicly against ConfigCore, I18n, IconThemes, KIOCore and Service
+-find_package( KF5 REQUIRED Config I18n IconThemes KIO Service )
++find_package( Qt5 REQUIRED DBus )
++find_package( KF5 REQUIRED Config I18n WidgetsAddons Service )
+ 
+-find_package( KPMcore 3.1.50 QUIET )
+-if ( KPMcore_FOUND )
+-    add_definitions(-DWITH_KPMCORE22)
+-endif()
+-find_package( KPMcore 3.0.3 QUIET )
++find_package( KPMcore 3.2 QUIET )
+ # 3.0.3 and newer has fixes for NVMe support; allow 3.0.2, but warn
+ # about it .. needs to use a different feature name because it otherwise
+ # gets reported as KPMcore (the package).
+@@ -25,15 +21,6 @@
+     add_feature_info( KPMcoreNVMe KPMcore_FOUND "Older KPMcore with no NVMe support" )
+ endif()
+ 
+-find_library( atasmart_LIB atasmart )
+-find_library( blkid_LIB blkid )
+-if( NOT atasmart_LIB )
+-  message( WARNING "atasmart library not found." )
+-endif()
+-if( NOT blkid_LIB )
+-  message( WARNING "blkid library not found." )
+-endif()
+-
+ 
+ include_directories( ${KPMCORE_INCLUDE_DIR} )
+ include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
+diff -Naur calamares-3.1.8/src/modules/partition/core/KPMHelpers.cpp calamares-3.1.8-p/src/modules/partition/core/KPMHelpers.cpp
+--- calamares-3.1.8/src/modules/partition/core/KPMHelpers.cpp	2017-11-14 16:18:58.000000000 +0100
++++ calamares-3.1.8-p/src/modules/partition/core/KPMHelpers.cpp	2017-11-18 13:11:35.255540490 +0100
+@@ -116,9 +116,7 @@
+                     PartitionTable::Flags flags )
+ {
+     FileSystem* fs = FileSystemFactory::create( fsType, firstSector, lastSector
+-#ifdef WITH_KPMCORE22
+                                                 ,device.logicalSize()
+-#endif
+     );
+     return new Partition(
+                parent,
+@@ -153,9 +151,7 @@
+                            FileSystemFactory::create( FileSystem::Luks,
+                                                       firstSector,
+                                                       lastSector
+-#ifdef WITH_KPMCORE22
+                                                      ,device.logicalSize()
+-#endif
+                                                       ) );
+     if ( !fs )
+     {
+@@ -186,9 +182,7 @@
+                          partition->fileSystem().type(),
+                          partition->firstSector(),
+                          partition->lastSector()
+-#ifdef WITH_KPMCORE22
+                         ,device->logicalSize()
+-#endif
+                      );
+     return new Partition( partition->parent(),
+                           *device,
+diff -Naur calamares-3.1.8/src/modules/partition/jobs/FillGlobalStorageJob.cpp calamares-3.1.8-p/src/modules/partition/jobs/FillGlobalStorageJob.cpp
+--- calamares-3.1.8/src/modules/partition/jobs/FillGlobalStorageJob.cpp	2017-11-14 16:18:58.000000000 +0100
++++ calamares-3.1.8-p/src/modules/partition/jobs/FillGlobalStorageJob.cpp	2017-11-18 13:11:35.256540518 +0100
+@@ -77,50 +77,6 @@
+     return uuid;
+ }
+ 
+-// TODO: this will be available from KPMCore soon
+-static const char* filesystem_labels[] = {
+-    "unknown",
+-    "extended",
+-
+-    "ext2",
+-    "ext3",
+-    "ext4",
+-    "linuxswap",
+-    "fat16",
+-    "fat32",
+-    "ntfs",
+-    "reiser",
+-    "reiser4",
+-    "xfs",
+-    "jfs",
+-    "hfs",
+-    "hfsplus",
+-    "ufs",
+-    "unformatted",
+-    "btrfs",
+-    "hpfs",
+-    "luks",
+-    "ocfs2",
+-    "zfs",
+-    "exfat",
+-    "nilfs2",
+-    "lvm2 pv",
+-    "f2fs",
+-    "udf",
+-    "iso9660",
+-};
+-
+-Q_STATIC_ASSERT_X((sizeof(filesystem_labels) / sizeof(char *)) >= FileSystem::__lastType, "Mismatch in filesystem labels");
+-
+-static QString
+-untranslatedTypeName(FileSystem::Type t)
+-{
+-
+-    Q_ASSERT( t >= 0 );
+-    Q_ASSERT( t <= FileSystem::__lastType );
+-
+-    return QLatin1String(filesystem_labels[t]);
+-}
+ 
+ static QVariant
+ mapForPartition( Partition* partition, const QString& uuid )
+@@ -129,7 +85,7 @@
+     map[ "device" ] = partition->partitionPath();
+     map[ "mountPoint" ] = PartitionInfo::mountPoint( partition );
+     map[ "fsName" ] = partition->fileSystem().name();
+-    map[ "fs" ] = untranslatedTypeName( partition->fileSystem().type() );
++    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();
+diff -Naur calamares-3.1.8/src/modules/partition/tests/PartitionJobTests.cpp calamares-3.1.8-p/src/modules/partition/tests/PartitionJobTests.cpp
+--- calamares-3.1.8/src/modules/partition/tests/PartitionJobTests.cpp	2017-11-14 16:18:58.000000000 +0100
++++ calamares-3.1.8-p/src/modules/partition/tests/PartitionJobTests.cpp	2017-11-18 13:11:35.255540490 +0100
+@@ -219,9 +219,7 @@
+     else
+         lastSector = freeSpacePartition->lastSector();
+     FileSystem* fs = FileSystemFactory::create( type, firstSector, lastSector
+-#ifdef WITH_KPMCORE22
+         ,m_device->logicalSize()
+-#endif
+     );
+ 
+     Partition* partition = new Partition(
diff --git a/app-admin/calamares/files/calamares-3.1.1-openrc-dmcrypt-cfg.patch b/app-admin/calamares/files/calamares-3.1.8-openrc-dmcrypt-cfg.patch
index d39e3fab..d39e3fab 100644
--- a/app-admin/calamares/files/calamares-3.1.1-openrc-dmcrypt-cfg.patch
+++ b/app-admin/calamares/files/calamares-3.1.8-openrc-dmcrypt-cfg.patch