diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2020-03-26 19:45:54 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2020-03-26 20:04:26 -0400 |
| commit | 0897dd2643f70811ae8d69e2d3b5d47ab49627a9 (patch) | |
| tree | c821c7cdacdeeae4025b401c0cdc50d909bae2c7 /pcr-testing | |
| parent | 3502f05b9657fc630e2ed672b08b676489c69974 (diff) | |
[calamares]: upgrade to v3.2.20
Diffstat (limited to 'pcr-testing')
| -rw-r--r-- | pcr-testing/calamares/PKGBUILD | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/pcr-testing/calamares/PKGBUILD b/pcr-testing/calamares/PKGBUILD index 0756a5c55..8efee1428 100644 --- a/pcr-testing/calamares/PKGBUILD +++ b/pcr-testing/calamares/PKGBUILD @@ -2,23 +2,21 @@ pkgname=calamares -pkgver=3.2.16 +pkgver=3.2.20 pkgrel='parabola1' pkgdesc='Distribution-independent installer framework - Parabola edition' arch=('i686' 'x86_64') url=https://calamares.io/ license=('GPL') -depends=('boost-libs' 'ckbcomp' 'dmidecode' 'gptfdisk' 'hwinfo' 'icu' 'kconfig' \ - 'kcoreaddons' 'ki18n' 'kparts' 'kpmcore' 'libpwquality' 'polkit-qt5' 'python' \ - 'solid' 'qt5-base' 'qt5ct' 'qt5-svg' 'yaml-cpp' ) +depends=('boost-libs' 'ckbcomp' 'dmidecode' 'gptfdisk' 'hwinfo' 'icu' 'kconfig' + 'kcoreaddons' 'ki18n' 'kparts' 'kpmcore' 'libpwquality' 'polkit-qt5' 'python' + 'solid' 'qt5-base' 'qt5ct' 'qt5-svg' 'yaml-cpp') makedepends=('boost' 'extra-cmake-modules' 'git' 'kservice' 'kwindowsystem' 'qt5-tools') depends+=('os-prober') # FIXME: qemu+calamares+os-prober was buggy last build - try again # conflicts=('os-prober') # FIXME: qemu+calamares+os-prober is buggy again -_git_tag=v${pkgver}-${pkgrel%%.*} -_build_dir=${pkgname}/build -source=(git+https://git.parabola.nu/${pkgname}.git#tag=${_git_tag}) +source=(git+https://git.parabola.nu/${pkgname}.git#tag=v${pkgver}-${pkgrel%%.*} sha256sums=('SKIP') @@ -39,19 +37,16 @@ prepare() build() { - mkdir -p "${srcdir}/${_build_dir}" - cd "${srcdir}/${_build_dir}" + mkdir -p "${srcdir}"/${pkgname}/build + cd "${srcdir}"/${pkgname}/build - # FIXME: "-DBoost_NO_BOOST_CMAKE=ON" is a temporary fix for boost >= 1.70 - # https://github.com/calamares/calamares/issues/1242 cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DBoost_NO_BOOST_CMAKE=ON \ -DSKIP_MODULES="contextualprocess dracut dracutlukscfg dummycpp dummyprocess \ - dummypython dummypythonqt fsresizer initramfs initramfscfg \ - interactiveterminal license netinstall networkcfg oemid \ - openrcdmcryptcfg packagechooser packages plasmalnf plymouthcfg \ + dummypython dummypythonqt fsresizer hostinfo initramfs \ + initramfscfg interactiveterminal license netinstall networkcfg \ + notesqml oemid openrcdmcryptcfg packages plasmalnf plymouthcfg \ preservefiles rawfs removeuser shellprocess tracking unpackfs \ webview" .. make @@ -64,7 +59,7 @@ package() $(_version_constraint 'kpmcore' ) \ $(_version_constraint 'qt5-base' ) ) - cd "${srcdir}/${_build_dir}" + cd "${srcdir}"/${pkgname}/build make DESTDIR=${pkgdir} install } |