From c59bff972953b444f067888596b33ecaf8d33a7c Mon Sep 17 00:00:00 2001 From: Noa Himesaka Date: Sun, 28 Apr 2024 13:36:51 +0900 Subject: [PATCH] 24.04.1.3-t2 Gemini-T2 --- PKGBUILD | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 2dea194..92adc82 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,23 +5,23 @@ # Calamares installer configured for EndeavourOS for Macs with T2 security chip pkgname=calamares-eos-t2 -pkgver=23.11.2.4 +pkgver=24.04.1.3 pkgrel=1 -release_name="Galileo Neo-T2" +release_name="Gemini-T2" pkgdesc="Calamares installer for EndeavourOS for Macs with T2 security chip" arch=('any') url="https://github.com/t2linux/calamares-eos-t2" license=('GPL3') -makedepends=('git' 'cmake' 'extra-cmake-modules' 'kpmcore' 'boost' 'python-jsonschema' 'python-pyaml' 'python-unidecode' 'gawk') -conflicts=('calamares_current') -depends=( 'qt5-svg' 'qt5-webengine' 'yaml-cpp' 'networkmanager' 'upower' 'kcoreaddons5' 'kconfig5' 'ki18n5' 'kservice5' \ -'kwidgetsaddons5' 'kpmcore' 'squashfs-tools' 'rsync' 'cryptsetup' 'qt5-xmlpatterns' 'doxygen' 'dmidecode' \ -'gptfdisk' 'hwinfo' 'kparts5' 'polkit-qt5' 'python' 'solid5' 'qt5-tools' 'boost-libs' 'libpwquality' 'ckbcomp' 'qt5-quickcontrols2' ) +makedepends=('git' 'cmake' 'extra-cmake-modules' 'python-jsonschema' 'python-pyaml' 'python-unidecode' 'gawk') +conflicts=('calamares-git') +depends=( 'qt6-svg' 'qt6-webengine' 'yaml-cpp' 'networkmanager' 'upower' 'kcoreaddons' 'kconfig' 'ki18n' 'kservice' \ +'kwidgetsaddons' 'kpmcore' 'squashfs-tools' 'rsync' 'pybind11' 'cryptsetup' 'doxygen' 'dmidecode' \ +'gptfdisk' 'hwinfo' 'kparts' 'polkit-qt6' 'python' 'solid' 'qt6-tools' 'libpwquality' 'ckbcomp' 'qt6-declarative' ) provides=("calamares") options=(!strip !emptydirs) source=("https://github.com/t2linux/${pkgname}/archive/refs/tags/${pkgver}-t2.tar.gz") -sha256sums=('SKIP') +sha256sums=('716cf93932d5141f65d56261679554a4c7a40614ea92a0e298e5dc9d6d687695') prepare() { # Update branding.desc with the proper values @@ -32,19 +32,16 @@ prepare() { print } ' - awk -i inplace -v version="${pkgver}" -v release="${release_name}" "$replace_command" "${srcdir}/calamares-eos-t2-${pkgver}-t2/data/eos/branding/endeavouros/branding.desc" + awk -i inplace -v version="${pkgver}" -v release="${release_name}" "$replace_command" "${srcdir}/calamares-${pkgver}/data/eos/branding/endeavouros/branding.desc" } build() { - cmake -B build -S "${srcdir}/calamares-eos-t2-${pkgver}-t2" \ - -DWEBVIEW_FORCE_WEBKIT=OFF \ - -DWITH_PYTHONQT=OFF \ - -DWITH_KF5DBus=OFF \ - -DWITH_APPSTREAM=OFF \ + cmake -B build -S "${srcdir}/calamares-${pkgver}" \ + -DWITH_QT6=ON \ -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DBoost_NO_BOOST_CMAKE=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DINSTALL_CONFIG=OFF \ -DSKIP_MODULES="dracut \ dummycpp dummyprocess dummypython dummypythonqt \ finishedq initcpio keyboardq license localeq notesqml oemid \ @@ -57,5 +54,6 @@ build() { package() { make -C build DESTDIR="${pkgdir}" install install -dm 755 "${pkgdir}/etc" - cp -rp "${srcdir}/calamares-eos-t2-${pkgver}-t2/data/eos" "${pkgdir}/etc/calamares" + cp -rp "${srcdir}/calamares-${pkgver}/data/eos" "${pkgdir}/etc/calamares" } +