aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysutils/calamares/Makefile19
-rw-r--r--sysutils/calamares/distinfo6
-rw-r--r--sysutils/calamares/pkg-plist38
3 files changed, 40 insertions, 23 deletions
diff --git a/sysutils/calamares/Makefile b/sysutils/calamares/Makefile
index bd01739c4435..131f6bccf7c3 100644
--- a/sysutils/calamares/Makefile
+++ b/sysutils/calamares/Makefile
@@ -1,6 +1,5 @@
PORTNAME= calamares
-DISTVERSION= 3.2.61
-PORTREVISION= 6
+DISTVERSION= 3.3.14
CATEGORIES= sysutils
MASTER_SITES= https://github.com/calamares/${PORTNAME}/releases/download/v${DISTVERSION}/
@@ -8,17 +7,25 @@ MAINTAINER= adridg@FreeBSD.org
COMMENT= Distro- and desktop-independent installer
WWW= https://calamares.io/
+LICENSE= BSD2CLAUSE CC-BY-4.0 CC0-1.0 GPLv3+ LGPL21 LGPL3+ MIT
+LICENSE_COMB= dual
+LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/LICENSES/BSD-2-Clause.txt
+LICENSE_FILE_CC-BY-4.0= ${WRKSRC}/LICENSES/CC-BY-4.0.txt
+LICENSE_FILE_CC0-1.0= ${WRKSRC}/LICENSES/CC0-1.0.txt
+LICENSE_FILE_GPLv3+ = ${WRKSRC}/LICENSES/GPL-3.0-or-later.txt
+LICENSE_FILE_LGPL21= ${WRKSRC}/LICENSES/LGPL-2.1-only.txt
+LICENSE_FILE_LGPL3+ = ${WRKSRC}/LICENSES/LGPL-3.0-or-later.txt
+LICENSE_FILE_MIT= ${WRKSRC}/LICENSES/MIT.txt
+
LIB_DEPENDS= libicui18n.so:devel/icu \
libyaml-cpp.so:devel/yaml-cpp \
libpwquality.so:security/libpwquality \
libboost_python${PYTHON_SUFFIX}.so:devel/boost-python-libs
-USES= cmake compiler:c++17-lang cpe gettext kde:5 python qt:5
+USES= cmake compiler:c++17-lang cpe gettext kde:6 python qt:6
USE_KDE= coreaddons dbusaddons \
ecm:build
-USE_QT= concurrent core dbus declarative gui network quickcontrols2 \
- svg widgets xml \
- buildtools:build qmake:build
+USE_QT= base
CMAKE_OFF= INSTALL_POLKIT
diff --git a/sysutils/calamares/distinfo b/sysutils/calamares/distinfo
index c8f1daf40ee2..98ad7953000f 100644
--- a/sysutils/calamares/distinfo
+++ b/sysutils/calamares/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1662060258
-SHA256 (calamares-3.2.61.tar.gz) = 7591b9b60738bdba7b9de2b8da5462ab21006db06a006f0dd21ac5b832711dd2
-SIZE (calamares-3.2.61.tar.gz) = 4281646
+TIMESTAMP = 1740834213
+SHA256 (calamares-3.3.14.tar.gz) = 5547f80db067dea923ae693ba6bb88eb2b2eeac1da3ebec42fce453e31c290c0
+SIZE (calamares-3.3.14.tar.gz) = 4820523
diff --git a/sysutils/calamares/pkg-plist b/sysutils/calamares/pkg-plist
index a9d8466a6704..f568918ed530 100644
--- a/sysutils/calamares/pkg-plist
+++ b/sysutils/calamares/pkg-plist
@@ -10,11 +10,13 @@ include/libcalamares/Job.h
include/libcalamares/JobExample.h
include/libcalamares/JobQueue.h
include/libcalamares/ProcessJob.h
-include/libcalamares/PythonHelper.h
-include/libcalamares/PythonJob.h
-include/libcalamares/PythonJobApi.h
include/libcalamares/Settings.h
include/libcalamares/ViewManager.h
+include/libcalamares/compat/CheckBox.h
+include/libcalamares/compat/Mutex.h
+include/libcalamares/compat/Size.h
+include/libcalamares/compat/Variant.h
+include/libcalamares/compat/Xml.h
include/libcalamares/geoip/GeoIPFixed.h
include/libcalamares/geoip/GeoIPJSON.h
include/libcalamares/geoip/GeoIPTests.h
@@ -39,13 +41,13 @@ include/libcalamares/modulesystem/ModuleManager.h
include/libcalamares/modulesystem/Preset.h
include/libcalamares/modulesystem/ProcessJobModule.h
include/libcalamares/modulesystem/PythonJobModule.h
-include/libcalamares/modulesystem/PythonQtViewModule.h
include/libcalamares/modulesystem/Requirement.h
include/libcalamares/modulesystem/RequirementsChecker.h
include/libcalamares/modulesystem/RequirementsModel.h
include/libcalamares/modulesystem/ViewModule.h
include/libcalamares/network/Manager.h
include/libcalamares/network/Tests.h
+include/libcalamares/packages/Globals.h
include/libcalamares/partition/AutoMount.h
include/libcalamares/partition/FileSystem.h
include/libcalamares/partition/Global.h
@@ -56,12 +58,10 @@ include/libcalamares/partition/PartitionIterator.h
include/libcalamares/partition/PartitionQuery.h
include/libcalamares/partition/PartitionSize.h
include/libcalamares/partition/Sync.h
-include/libcalamares/utils/BoostPython.h
-include/libcalamares/utils/CalamaresUtilsGui.h
-include/libcalamares/utils/CalamaresUtilsSystem.h
include/libcalamares/utils/CommandList.h
include/libcalamares/utils/Dirs.h
include/libcalamares/utils/Entropy.h
+include/libcalamares/utils/Gui.h
include/libcalamares/utils/ImageRegistry.h
include/libcalamares/utils/Logger.h
include/libcalamares/utils/NamedEnum.h
@@ -69,13 +69,14 @@ include/libcalamares/utils/NamedSuffix.h
include/libcalamares/utils/Paste.h
include/libcalamares/utils/Permissions.h
include/libcalamares/utils/PluginFactory.h
-include/libcalamares/utils/PythonQtUtils.h
include/libcalamares/utils/Qml.h
include/libcalamares/utils/QtCompat.h
include/libcalamares/utils/RAII.h
include/libcalamares/utils/Retranslator.h
include/libcalamares/utils/Runner.h
include/libcalamares/utils/String.h
+include/libcalamares/utils/StringExpander.h
+include/libcalamares/utils/System.h
include/libcalamares/utils/Traits.h
include/libcalamares/utils/UMask.h
include/libcalamares/utils/Units.h
@@ -84,10 +85,6 @@ include/libcalamares/utils/Yaml.h
include/libcalamares/utils/moc-warnings.h
include/libcalamares/viewpages/BlankViewStep.h
include/libcalamares/viewpages/ExecutionViewStep.h
-include/libcalamares/viewpages/PythonQtGlobalStorageWrapper.h
-include/libcalamares/viewpages/PythonQtJob.h
-include/libcalamares/viewpages/PythonQtUtilsWrapper.h
-include/libcalamares/viewpages/PythonQtViewStep.h
include/libcalamares/viewpages/QmlViewStep.h
include/libcalamares/viewpages/Slideshow.h
include/libcalamares/viewpages/ViewStep.h
@@ -98,6 +95,7 @@ include/libcalamares/widgets/LogWidget.h
include/libcalamares/widgets/PrettyRadioButton.h
include/libcalamares/widgets/TranslationFix.h
include/libcalamares/widgets/WaitingWidget.h
+include/libcalamares/widgets/waitingspinnerwidget.h
lib/calamares/libcalamares.so
lib/calamares/modules/bootloader/bootloader.schema.yaml
lib/calamares/modules/bootloader/main.py
@@ -108,6 +106,7 @@ lib/calamares/modules/contextualprocess/module.desc
lib/calamares/modules/displaymanager/displaymanager.schema.yaml
lib/calamares/modules/displaymanager/main.py
lib/calamares/modules/displaymanager/module.desc
+lib/calamares/modules/dracut/dracut.schema.yaml
lib/calamares/modules/dracut/main.py
lib/calamares/modules/dracut/module.desc
lib/calamares/modules/dracutlukscfg/libcalamares_job_dracutlukscfg.so
@@ -135,8 +134,10 @@ lib/calamares/modules/hwclock/main.py
lib/calamares/modules/hwclock/module.desc
lib/calamares/modules/initcpio/libcalamares_job_initcpio.so
lib/calamares/modules/initcpio/module.desc
+lib/calamares/modules/initcpiocfg/initcpiocfg.schema.yaml
lib/calamares/modules/initcpiocfg/main.py
lib/calamares/modules/initcpiocfg/module.desc
+lib/calamares/modules/initcpiocfg/test.yaml
lib/calamares/modules/initramfs/libcalamares_job_initramfs.so
lib/calamares/modules/initramfs/module.desc
lib/calamares/modules/initramfscfg/encrypt_hook
@@ -211,6 +212,8 @@ lib/calamares/modules/unpackfs/main.py
lib/calamares/modules/unpackfs/module.desc
lib/calamares/modules/unpackfs/runtests.sh
lib/calamares/modules/unpackfs/unpackfs.schema.yaml
+lib/calamares/modules/unpackfsc/libcalamares_job_unpackfsc.so
+lib/calamares/modules/unpackfsc/module.desc
lib/calamares/modules/users/libcalamares_viewmodule_users.so
lib/calamares/modules/users/module.desc
lib/calamares/modules/usersq/libcalamares_viewmodule_usersq.so
@@ -221,6 +224,9 @@ lib/calamares/modules/welcomeq/libcalamares_viewmodule_welcomeq.so
lib/calamares/modules/welcomeq/module.desc
lib/calamares/modules/zfs/libcalamares_job_zfs.so
lib/calamares/modules/zfs/module.desc
+lib/calamares/modules/zfshostid/main.py
+lib/calamares/modules/zfshostid/module.desc
+lib/calamares/modules/zfshostid/zfshostid.schema.yaml
lib/cmake/Calamares/CMakeColors.cmake
lib/cmake/Calamares/CalamaresAddBrandingSubdirectory.cmake
lib/cmake/Calamares/CalamaresAddLibrary.cmake
@@ -236,9 +242,11 @@ lib/cmake/Calamares/CalamaresTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Calamares/CalamaresTargets.cmake
lib/cmake/Calamares/FindYAMLCPP.cmake
lib/libcalamares.so
-lib/libcalamares.so.3.2.61
+lib/libcalamares.so.3.3
+lib/libcalamares.so.3.3.14
lib/libcalamaresui.so
-lib/libcalamaresui.so.3.2.61
+lib/libcalamaresui.so.3.3
+lib/libcalamaresui.so.3.3.14
share/applications/calamares.desktop
%%DATADIR%%/branding/default/banner.png
%%DATADIR%%/branding/default/banner.png.license
@@ -280,6 +288,7 @@ share/locale/el/LC_MESSAGES/calamares-python.mo
share/locale/en_GB/LC_MESSAGES/calamares-python.mo
share/locale/eo/LC_MESSAGES/calamares-python.mo
share/locale/es/LC_MESSAGES/calamares-python.mo
+share/locale/es_AR/LC_MESSAGES/calamares-python.mo
share/locale/es_MX/LC_MESSAGES/calamares-python.mo
share/locale/et/LC_MESSAGES/calamares-python.mo
share/locale/eu/LC_MESSAGES/calamares-python.mo
@@ -296,6 +305,7 @@ share/locale/id/LC_MESSAGES/calamares-python.mo
share/locale/is/LC_MESSAGES/calamares-python.mo
share/locale/it_IT/LC_MESSAGES/calamares-python.mo
share/locale/ja/LC_MESSAGES/calamares-python.mo
+share/locale/ka/LC_MESSAGES/calamares-python.mo
share/locale/ko/LC_MESSAGES/calamares-python.mo
share/locale/lt/LC_MESSAGES/calamares-python.mo
share/locale/ml/LC_MESSAGES/calamares-python.mo