Merge pull request #37 from Hayao0819/master

3.2.32.1 ← wut

.gitignore

@@ -50,6 +50,7 @@ CMakeLists.txt.user
 
 # Backup files
 *~
+*.bak
 
 # Kate
 *.kate-swp

3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h

@@ -41,7 +41,7 @@ class DLLEXPORT KDSingleApplicationGuard : public QObject
     explicit KDSingleApplicationGuard( Policy policy, QObject * parent=nullptr );
     explicit KDSingleApplicationGuard( const QStringList & arguments, QObject * parent=nullptr );
     explicit KDSingleApplicationGuard( const QStringList & arguments, Policy policy, QObject * parent=nullptr );
-    ~KDSingleApplicationGuard();
+    ~KDSingleApplicationGuard() override;
 
     bool isOperational() const;
 
@@ -70,7 +70,7 @@ public Q_SLOTS:
     void killOtherInstances();
 
 protected:
-    /*! \reimp */ bool event( QEvent * event );
+    /*! \reimp */ bool event( QEvent * event ) override;
 
 private:
 #ifndef Q_WS_WIN

3rdparty/waitingspinnerwidget.h

@@ -85,7 +85,7 @@ private slots:
     void rotate();
 
 protected:
-    void paintEvent(QPaintEvent *paintEvent);
+    void paintEvent(QPaintEvent *paintEvent) override;
 
 private:
     static int lineCountDistanceFromPrimary(int current, int primary,

CHANGES

@@ -7,6 +7,76 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
+# 3.2.32.1 (2020-10-17) #
+
+This is a release to address source-incompatible changes in KPMcore 4.2.0,
+which was released just before Calamares 3.2.32 and had not yet been
+compile-tested. There is also one changed message in the translations,
+reported by Yuri Chornoivan.
+
+
+# 3.2.32 (2020-10-16) #
+
+This release contains contributions from (alphabetically by first name):
+ - Fabian Tomat
+ - Gaël PORTAY
+
+## Core ##
+ - When doing GeoIP lookups, Calamares pretends to be Firefox.
+   This resolves an issue where the GeoIP provider was refusing
+   QNAM connections with the default User-Agent.
+ - New translation available, Friulian. Welcome!
+
+## Modules ##
+ - The *netinstall* module has some tricky configuration files;
+   it now complains about more cases of bad syntax or poor structure.
+ - The *partition* module can now be constrained to work only with
+   a particular kind of partition table. (thanks Gaël)
+ - The *partition* module is a little more resilient to variations
+   in btrfs notation from os-prober.
+ - The *shellprocess* module now supports having a different progress
+   message (other than "Shell Processes Job") through the config file.
+
+
+ # 3.2.31 (2020-10-06) #
+
+This release contains contributions from (alphabetically by first name):
+ - Corentin Noël
+ - kadler15 (new contributor! hi!)
+
+## Core ##
+ - At the start of the *exec* phase, an overview is given of the
+   various job weights, which allows you to tweak the overall
+   progress reporting during the installation.
+ - Problems with running Calamares on a 1-core single CPU have been resolved.
+
+## Modules ##
+ - The *keyboard* module now recognizes Turkish "F" layout and
+   will set the vconsole keyboard layout correctly even if xkb
+   keymaps are not found.
+ - The *machineid* module, which generates UUIDs for systemd and dbus
+   and can generate entropy files (filled from `/dev/urandom` in the host
+   system) now supports more than one entropy file; generate them as needed
+   (or copy a fixed value to all, depending on *entropy-copy*). Deprecate
+   *entropy* (which generates a specific output file) as too inflexible.
+ - In the *partition* module, swap can now be chosen as *file*, which is
+   **not** create a swap partition, but write a `/swapfile` in the root
+   directory, 512MiB large, and set that as swap. There is as yet no
+   "smarts" about the size of the swap file.
+ - Multiple problems in the *partition* module around partition
+   sizing have been resolved by Corentin Noël.
+ - The *preservefiles* module documentation did not match the functionality,
+   and when used, didn't work right. #1521 (thanks kadler15)
+ - Progress reporting from the *unpackfs* module has been revamped:
+   it reports more often now, so that it is more obvious that files
+   are being transferred even when the percentage progress does not
+   change.
+ - The *unpackfs* module now supports a *weight* setting for each
+   of the unpack entries. For a single entry this does not matter,
+   but if there are multiple entries it allows tweaking the relative
+   progress between each entry.
+
+
 # 3.2.30 (2020-09-03) #
 
 This release contains contributions from (alphabetically by first name):

CMakeLists.txt

@@ -41,7 +41,7 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.30
+    VERSION 3.2.32.1
     LANGUAGES C CXX )
 
 set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
@@ -140,15 +140,14 @@ set( CALAMARES_DESCRIPTION_SUMMARY
 # NOTE: update these lines by running `txstats.py`, or for full automation
 #       `txstats.py -e`. See also
 #
-# Total 69 languages
-set( _tx_complete az az_AZ ca cs_CZ da fi_FI he hi hr ja nl pt_BR
-    sq sv tg tr_TR uk zh_TW )
-set( _tx_good as ast be de es fr hu it_IT ko lt ml pt_PT ru sk
-    zh_CN )
-set( _tx_ok ar bg bn el en_GB es_MX es_PR et eu fa gl id is mr nb
-    pl ro sl sr sr@latin te th )
+# Total 70 languages
+set( _tx_complete ca cs_CZ he hr sq tr_TR uk )
+set( _tx_good as ast az az_AZ be da de es fa fi_FI fr hi hu it_IT
+    ja ko lt ml nl pt_BR pt_PT ru sk sv tg zh_CN zh_TW )
+set( _tx_ok ar bg bn el en_GB es_MX es_PR et eu fur gl id is mr nb
+    pl ro sl sr sr@latin th )
 set( _tx_incomplete ca@valencia eo fr_CH gu ie kk kn lo lv mk ne_NP
-    ur uz )
+    te ur uz )
 
 ### Required versions
 #

CMakeModules/CalamaresAddTest.cmake

@@ -14,6 +14,7 @@
 # calamares_add_test(
 #   <NAME>
 #   [GUI]
+#   [RESOURCES FILE]
 #   SOURCES <FILE..>
 #   )
 
@@ -24,13 +25,14 @@ function( calamares_add_test )
     # parse arguments (name needs to be saved before passing ARGN into the macro)
     set( NAME ${ARGV0} )
     set( options GUI )
+    set( oneValueArgs NAME RESOURCES )
     set( multiValueArgs SOURCES LIBRARIES DEFINITIONS )
-    cmake_parse_arguments( TEST "${options}" "" "${multiValueArgs}" ${ARGN} )
+    cmake_parse_arguments( TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
     set( TEST_NAME ${NAME} )
 
     if( ECM_FOUND AND BUILD_TESTING )
         ecm_add_test(
-            ${TEST_SOURCES}
+            ${TEST_SOURCES} ${TEST_RESOURCES}
             TEST_NAME
                 ${TEST_NAME}
             LINK_LIBRARIES
@@ -44,5 +46,8 @@ function( calamares_add_test )
         if( TEST_GUI )
             target_link_libraries( ${TEST_NAME} calamaresui Qt5::Gui )
         endif()
+        if( TEST_RESOURCES )
+            calamares_autorcc( ${TEST_NAME} ${TEST_RESOURCES} )
+        endif()
     endif()
 endfunction()

CMakeModules/KPMcoreHelper.cmake

@@ -0,0 +1,39 @@
+# === This file is part of Calamares - <https://calamares.io> ===
+#
+#   SPDX-FileCopyrightText: 2020 Adriaan de Groot <[email protected]>
+#   SPDX-License-Identifier: BSD-2-Clause
+#
+###
+#
+# Finds KPMcore and consistently sets API flags based on the version.
+#
+if ( NOT KPMcore_searched_for )
+    set( KPMcore_searched_for TRUE )
+
+    find_package( KPMcore 3.3 )
+    set_package_properties(
+        KPMcore PROPERTIES
+        URL "https://invent.kde.org/kde/kpmcore"
+        DESCRIPTION "KDE Partitioning library"
+        TYPE RECOMMENDED
+        PURPOSE "For disk partitioning support"
+    )
+
+    if( KPMcore_FOUND )
+        set( KPMcore_API_DEFINITIONS "" )
+        if( KPMcore_VERSION VERSION_GREATER "3.3.70" AND KPMcore_VERSION VERSION_LESS "4.0" )
+            message( FATAL_ERROR "KPMCore beta versions ${KPMcore_VERSION} not supported" )
+        endif()
+        if ( KPMcore_VERSION VERSION_GREATER "3.3.0")
+            list( APPEND KPMcore_API_DEFINITIONS WITH_KPMCORE331API) # kpmcore > 3.3.0 with deprecations
+        endif()
+        if ( KPMcore_VERSION VERSION_GREATER_EQUAL "4.0")
+            list( APPEND KPMcore_API_DEFINITIONS WITH_KPMCORE4API) # kpmcore 4 with new API
+        endif()
+        if( KPMcore_VERSION VERSION_GREATER_EQUAL "4.2" )
+            list( APPEND KPMcore_API_DEFINITIONS WITH_KPMCORE42API) # kpmcore 4.2 with new API
+        endif()
+    else()
+        set( KPMcore_API_DEFINITIONS WITHOUT_KPMcore )
+    endif()
+endif()

CONTRIBUTING.md

@@ -0,0 +1,35 @@
+<!-- SPDX-FileCopyrightText: no
+     SPDX-License-Identifier: CC0-1.0
+-->
+
+# Contributing to Calamares
+
+### Dependencies
+
+Main:
+* Compiler with C++14 support: GCC >= 5 or Clang >= 3.5.1
+* CMake >= 3.3
+* Qt >= 5.9
+* yaml-cpp >= 0.5.1
+* Python >= 3.3 (required for some modules)
+* Boost.Python >= 1.55.0 (required for some modules)
+* KDE extra-cmake-modules >= 5.18 (recommended; required for some modules;
+  required for some tests)
+* KDE Frameworks KCoreAddons (>= 5.58 recommended)
+* PythonQt (optional, deprecated)
+
+Individual modules may have their own requirements;
+these are listed in CMake output.
+Particular requirements (not complete):
+
+* *fsresizer* KPMCore >= 3.3 (>= 4.2 recommended)
+* *partition* KPMCore >= 3.3 (>= 4.2 recommended)
+* *users* LibPWQuality (optional)
+
+### Building
+
+See [wiki](https://github.com/calamares/calamares/wiki) for up to date
+[building](https://github.com/calamares/calamares/wiki/Develop-Guide)
+and [deployment](https://github.com/calamares/calamares/wiki/Deploy-Guide)
+instructions.
+

README.md

@@ -2,7 +2,7 @@
      SPDX-License-Identifier: CC0-1.0
 -->
 
-### Calamares: Distribution-Independent Installer Framework
+# Calamares: Distribution-Independent Installer Framework
 ---------
 
 [![GitHub release](https://img.shields.io/github/v/release/sereneteam/alterlinux-calamares?color=%234169e1&include_prereleases&style=flat-square)](https://github.com/sereneteam/alterlinux-calamares/releases)
@@ -35,7 +35,31 @@ Modules:
 
 ### Building (Vanilla)
 
-See [wiki](https://github.com/calamares/calamares/wiki) for up to date
-[building](https://github.com/calamares/calamares/wiki/Develop-Guide)
-and [deployment](https://github.com/calamares/calamares/wiki/Deploy-Guide)
-instructions.
+Clone Calamares from GitHub. The default branch is called *calamares*.
+
+```
+git clone https://github.com/calamares/calamares.git
+```
+
+Calamares is a KDE-Frameworks and Qt-based, C++14, CMake-built application.
+The dependencies are explainged in [CONTRIBUTING.md](CONTRIBUTING.md).
+
+## Contributing to Calamares
+
+Calamares welcomes PRs. New issues are welcome, too.
+There are both the Calamares **core** repository (this one),
+and an *extensions** repository ([Calamares extensions](https://github.com/calamares/calamares-extensions).
+
+Contributions to code, modules, documentation, the wiki and the website are all welcome.
+There is more information in the [CONTRIBUTING.md](CONTRIBUTING.md) file.
+
+## Join the Conversation
+
+GitHub Issues are **one** place for discussing Calamares if there are concrete
+problems or a new feature to discuss.
+
+Regular Calamares development chit-chat happens on old-school IRC
+(no registration required). Responsiveness is best during the day
+in Europe, but feel free to idle.
+
+[![Visit our IRC channel](https://kiwiirc.com/buttons/webchat.freenode.net/calamares.png)](https://webchat.freenode.net/?channel=#calamares?nick=guest|)

calamares.desktop

@@ -78,6 +78,10 @@ Name[fr]=Installer le système
 Icon[fr]=calamares
 GenericName[fr]=Installateur système
 Comment[fr]=Calamares - Installateur système
+Name[fur]=Instale il sisteme
+Icon[fur]=calamares
+GenericName[fur]=Program di instalazion dal sisteme
+Comment[fur]=Calamares — Program di instalazion dal sisteme
 Name[gl]=Instalación do Sistema
 Icon[gl]=calamares
 GenericName[gl]=Instalador de sistemas

ci/calamaresstyle

@@ -35,7 +35,13 @@ test -n "$CF" || { echo "! No clang-format ($CF_VERSIONS) found in PATH"; exit 1
 test -x "$AS" || { echo "! $AS is not executable."; exit 1 ; }
 test -x "$CF" || { echo "! $CF is not executable."; exit 1 ; }
 
-expr `"$CF" --version | tr -dc '[^.0-9]' | cut  -d . -f 1` '<' 10 > /dev/null ||  { echo "! $CF is version 10 or later, needs different .clang-format" ; exit 1 ; }
+unmangle_clang_format=""
+if expr `"$CF" --version | tr -dc '[^.0-9]' | cut  -d . -f 1` '<' 10 > /dev/null ; then
+	:
+else
+	unmangle_clang_format=$( dirname $0 )/../.clang-format
+	echo "SpaceInEmptyBlock: false" >> "$unmangle_clang_format"
+fi
 
 set -e
 
@@ -65,3 +71,7 @@ if test "x$any_dirs" = "xyes" ; then
 else
 	style_some "$@"
 fi
+
+if test -n "$unmangle_clang_format" ; then
+	sed -i.bak '/^SpaceInEmptyBlock/d' "$unmangle_clang_format"
+fi