From 7d5fb4f37d5845ec14f7967252310572bbd9a8a6 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Mon, 2 Sep 2019 05:48:09 -0400 Subject: [calamares]: upgrade to v3.2.12 --- pcr-testing/calamares/PKGBUILD | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pcr-testing/calamares/PKGBUILD b/pcr-testing/calamares/PKGBUILD index c8c70aa7d..0c5c376bd 100644 --- a/pcr-testing/calamares/PKGBUILD +++ b/pcr-testing/calamares/PKGBUILD @@ -2,19 +2,19 @@ pkgname=calamares -pkgver=3.2.8 -pkgrel='parabola2.2' +pkgver=3.2.12 +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' ) -makedepends=('boost' 'extra-cmake-modules' 'git' 'kservice' 'kwindowsystem' \ - 'plasma-framework' 'qt5-tools' ) -conflicts=('os-prober') # FIXME: calamares+os-prober is buggy again +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 @@ -42,14 +42,15 @@ build() mkdir -p "${srcdir}/${_build_dir}" cd "${srcdir}/${_build_dir}" - cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DSKIP_MODULES="contextualprocess dracut dracutlukscfg dummycpp dummyprocess \ - dummypython dummypythonqt fsresizer initramfs initramfscfg \ - interactiveterminal license networkcfg openrcdmcryptcfg \ - packages plymouthcfg preservefiles rawfs removeuser \ - shellprocess tracking unpackfs webview" .. + cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DSKIP_MODULES="contextualprocess dracut dracutlukscfg dummycpp dummyprocess \ + dummypython dummypythonqt fsresizer initramfs initramfscfg \ + interactiveterminal license netinstall networkcfg oemid \ + openrcdmcryptcfg packagechooser packages plasmalnf plymouthcfg \ + preservefiles rawfs removeuser shellprocess tracking unpackfs \ + webview" .. make } -- cgit v1.2.3