c-ludenberg
8ed1a6e5ad
Relates to Antergos-NeXT/antergos-iso#14 (online install had no KDE session; SDDM showed nothing). Root cause: we run TWO packagechooser instances (DE chooser + DM chooser), both with method: netinstall-add. Upstream Calamares tags all netinstall data with the same hardcoded "packageChooser" source string, so when the second instance (packagechooser@dm) wrote its groups it pruned EVERYTHING tagged packageChooser from global storage - including the DE's groups. KDE never reached packageOperations, so Plasma was never installed. Fix: tag each instance's netinstall data with its own instance id (packagechooser@de / packagechooser@dm, via m_defaultId) and prune using that same id. Each chooser now only removes its own stale data and the other instance's groups survive the merge. Version: CALAMARES_VERSION 3.4.2 -> 3.4.2-w0k3 (BREATHTAKING). Shows in About dialog, --version and libcalamares. pkgrel 8 -> 9, local makepkg build of 3.4.2-9 verified clean. Also add ntp-dinit to Init Services group in netinstall.yaml, so the service exists on the installed system (relates to Antergos-NeXT/antergos-iso#13).
96 lines
2.4 KiB
Bash
96 lines
2.4 KiB
Bash
# Maintainer: Celestia Ludenberg <ash8820@proton.me>
|
|
# Contributor: Antergos NeXT Team
|
|
# Upstream: Calamares team
|
|
|
|
_pkgname="calamares"
|
|
pkgname="$_pkgname"
|
|
pkgver=3.4.2
|
|
pkgrel=9
|
|
pkgdesc="Distribution-independent installer framework"
|
|
url="https://codeberg.org/Calamares/calamares"
|
|
license=("GPL-3.0-or-later")
|
|
arch=('x86_64')
|
|
|
|
depends=(
|
|
'kcoreaddons'
|
|
'kpmcore'
|
|
'libpwquality'
|
|
'qt6-declarative'
|
|
'qt6-svg'
|
|
'yaml-cpp'
|
|
)
|
|
makedepends=(
|
|
'extra-cmake-modules'
|
|
'libglvnd'
|
|
'ninja'
|
|
'qt6-tools'
|
|
'qt6-translations'
|
|
)
|
|
|
|
_pkgext="tar.gz"
|
|
DLAGENTS=('https::/usr/bin/curl -gqb "" -fLC - --http1.1 --retry 5 --retry-delay 5 -o %o %u')
|
|
source=("$_pkgname-$pkgver.$_pkgext"::"$url/releases/download/v$pkgver/$_pkgname-$pkgver.$_pkgext"
|
|
'multi-netinstall-add.patch')
|
|
sha256sums=('733bbbb00dc9f84874bd5c22960952f317ea2537565431179fa2152b2fbfdccc'
|
|
'18a0e1592b0f893256996f6071d539cbd692b920b4d3788e043442f3e707d795')
|
|
|
|
prepare() {
|
|
cd "$srcdir/$_pkgname-$pkgver"
|
|
patch -Np1 -i "$srcdir/multi-netinstall-add.patch"
|
|
}
|
|
|
|
build() {
|
|
local _skip_modules=(
|
|
dummycpp
|
|
dummyprocess
|
|
dummypython
|
|
dummypythonqt
|
|
dracut
|
|
initramfs
|
|
initramfscfg
|
|
interactiveterminal
|
|
)
|
|
|
|
local _pkgsrc_dir="$srcdir/$_pkgname-$pkgver"
|
|
|
|
sed -i '/"ddlm --target " + de_command/a\
|
|
elif os.path.exists(self.os_path("usr/bin/cosmic-greeter-start")):\
|
|
self.config_data["default_session"]["command"] = "cosmic-greeter-start"' \
|
|
"$_pkgsrc_dir/src/modules/displaymanager/main.py"
|
|
|
|
local _cmake_options=(
|
|
-B build
|
|
-S "$_pkgsrc_dir"
|
|
-G Ninja
|
|
-DCMAKE_BUILD_TYPE=Release
|
|
-DCMAKE_INSTALL_PREFIX='/usr'
|
|
-DCMAKE_INSTALL_LIBDIR='lib'
|
|
-DWITH_QT6=ON
|
|
-DINSTALL_CONFIG=ON
|
|
-DSKIP_MODULES="${_skip_modules[*]}"
|
|
-DBUILD_TESTING=OFF
|
|
-DKDE_INSTALL_BINDIR=/usr/bin
|
|
-DKDE_INSTALL_SBINDIR=/usr/sbin
|
|
-DKDE_INSTALL_LIBDIR=/usr/lib
|
|
-DKDE_INSTALL_LIBEXECDIR=/usr/libexec
|
|
-DKDE_INSTALL_INCLUDEDIR=/usr/include
|
|
-DKDE_INSTALL_LOCALSTATEDIR=/var
|
|
-DKDE_INSTALL_SHAREDSTATEDIR=/usr/share
|
|
-DKDE_INSTALL_DATAROOTDIR=/usr/share
|
|
-DKDE_INSTALL_DATADIR=/usr/share
|
|
-DKDE_INSTALL_LOCALEDIR=/usr/share/locale
|
|
-DKDE_INSTALL_MANDIR=/usr/share/man
|
|
-DKDE_INSTALL_INFODIR=/usr/share/info
|
|
-DKDE_INSTALL_SYSCONFDIR=/etc
|
|
-DCMAKE_DISTRIBUTION_NAME="Antergos NeXT"
|
|
-Wno-dev
|
|
)
|
|
|
|
cmake "${_cmake_options[@]}"
|
|
cmake --build build
|
|
}
|
|
|
|
package() {
|
|
DESTDIR="$pkgdir" cmake --install build
|
|
}
|