From 16cbd4571636a6ad42d24c6ead0d403f70c18321 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Sat, 11 May 2019 08:17:34 -0400
Subject: [calamares]: upgrade to v3.2.8

---
 pcr-testing/calamares/PKGBUILD | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

(limited to 'pcr-testing')

diff --git a/pcr-testing/calamares/PKGBUILD b/pcr-testing/calamares/PKGBUILD
index 49cfcf706..cfe257c98 100644
--- a/pcr-testing/calamares/PKGBUILD
+++ b/pcr-testing/calamares/PKGBUILD
@@ -2,16 +2,16 @@
 
 
 pkgname=calamares
-pkgver=3.2.4
-pkgrel='parabola3'
+pkgver=3.2.8
+pkgrel='parabola2'
 pkgdesc='Distribution-independent installer framework - Parabola edition'
 arch=('i686' 'x86_64')
 url=https://calamares.io/
 license=('GPL')
 
-depends=('ckbcomp' 'dmidecode' 'gptfdisk' 'hwinfo' 'kconfig' 'kcoreaddons' 'ki18n' \
-         'kparts' 'libpwquality' 'os-prober' 'polkit-qt5' 'python' 'solid' 'qt5ct' \
-         'qt5-svg' 'yaml-cpp'                                                      )
+depends=('boost-libs' 'ckbcomp' 'dmidecode' 'gptfdisk' 'hwinfo' 'icu' 'kconfig' \
+         'kcoreaddons' 'ki18n' 'kparts' 'kpmcore' 'libpwquality' 'os-prober'    \
+         'polkit-qt5' 'python' 'solid' 'qt5-base' 'qt5ct' 'qt5-svg' 'yaml-cpp'  )
 makedepends=('boost' 'extra-cmake-modules' 'git' 'kservice' 'kwindowsystem' \
              'plasma-framework' 'qt5-tools'                                 )
 
@@ -21,13 +21,19 @@ source=(git+https://git.parabola.nu/${pkgname}.git#tag=${_git_tag})
 sha256sums=('SKIP')
 
 
-_version_constraint() # (_dep_pkgname)
+_version_constraint() # (dep_pkgname)
 {
-  _dep_pkgname=$1
-  _version=$(pacman -S --print-format='%v' ${_dep_pkgname})
-  _version_inc=${_version%.*}.$(( ${_version##*.} + 1 ))
+  local dep_pkgname=$1
+  local version=$(pacman -S --print-format='%v' ${dep_pkgname} | tail -n 1)
+  version=${version%-*}
+  version_inc=${version%.*}.$(( ${version##*.} + 1 ))
 
-  echo -n " ${_dep_pkgname}>=${_version} ${_dep_pkgname}<${_version_inc} "
+  echo -n "${dep_pkgname}>=${version}" "${dep_pkgname}<${version_inc}"
+}
+
+prepare()
+{
+  sed -i "s|_BUILD_DATE_|$(date +%Y.%m)|" ${srcdir}/${pkgname}/src/branding/parabola/branding.desc
 }
 
 build()
@@ -35,13 +41,14 @@ build()
   mkdir -p "${srcdir}/${_build_dir}"
   cd       "${srcdir}/${_build_dir}"
 
-  cmake -DCMAKE_BUILD_TYPE=Debug                                                       \
-        -DCMAKE_INSTALL_PREFIX=/usr                                                    \
-        -DCMAKE_INSTALL_LIBDIR=lib                                                     \
-        -DSKIP_MODULES="contextualprocess dracut dracutlukscfg dummycpp dummyprocess   \
-                        dummypython  dummypythonqt fsresizer initramfs initramfscfg    \
-                        interactiveterminal license openrcdmcryptcfg plymouthcfg       \
-                        preservefiles rawfs removeuser shellprocess tracking 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 networkcfg openrcdmcryptcfg      \
+                        packages plymouthcfg preservefiles rawfs removeuser          \
+                        shellprocess tracking unpackfs webview"                      ..
   make
 }
 
-- 
cgit v1.2.3