Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

2 files changed, 57 insertions, 20 deletions

diff --git a/pcr-testing/calamares/PKGBUILD b/pcr-testing/calamares/PKGBUILD
index 00b8cf132..4d155c8a6 100644
--- a/pcr-testing/calamares/PKGBUILD
+++ b/pcr-testing/calamares/PKGBUILD
@@ -2,39 +2,41 @@
 
 
 pkgname=calamares
-pkgver=3.1.0
-pkgrel=3
+pkgver=3.1.9
+pkgrel='parabola1.1'
 pkgdesc='Distribution-independent installer framework - Parabola edition'
 arch=('i686' 'x86_64')
 license=('GPL')
 url="https://calamares.io/"
 
-depends=('boost-libs' 'dmidecode' 'gptfdisk' 'hwinfo' 'kconfig' 'kcoreaddons' 'ki18n'
-         'kparts' 'kpmcore' 'polkit-qt5' 'python' 'squashfs-tools' 'solid' 'qt5ct'
-         'qt5-styleplugins' 'qt5-svg' 'yaml-cpp')
-makedepends=('boost' 'extra-cmake-modules' 'git' 'qt5-tools')
+_latest_version() { pacman -Si $1 | grep Version | cut -d ':' -f 2 | sed 's/\s//g' ; }
+_build_couplings=("boost=$(_latest_version 'boost')")
+_runtime_couplings=("boost-libs=$(_latest_version 'boost')"
+                    "kpmcore=$(_latest_version 'kpmcore')")
+makedepends=(${_build_couplings[@]} 'extra-cmake-modules' 'git' 'qt5-tools')
+depends=(${_runtime_couplings[@]} 'dmidecode' 'gptfdisk' 'hwinfo' 'kconfig' 'kcoreaddons'
+         'ki18n' 'kparts' 'os-prober' 'polkit-qt5' 'python' 'squashfs-tools' 'solid'
+         'qt5ct' 'qt5-styleplugins' 'qt5-svg' 'yaml-cpp')
 
-_git_tag="${pkgver}-parabola-alpha${pkgrel}"
+_git_tag="${pkgver}-${pkgrel%%.*}"
 source=("https://notabug.org/bill-auger/calamares/archive/v${_git_tag}.tar.gz")
-# sha256sums=('6ae55f567d5eafdb781dc84988dec184637fa7cf8bd55d7a2157b2d920880d52') # alpha1
-# sha256sums=('a118ad28e7fd9b9b9603a7b79374c7e7d5c6ca9d41d6ba06137db94cdce05e5c') # alpha2
-sha256sums=('7a6ccf64ce7f56527a99e0eee1c46d698308c6f5bcabac9813c9151c48bd17f6') # alpha3
+sha256sums=('4ce0da2894a7f474c10af65d4c32fd595640bf2307cddaffd0f6636a717f4b65')
 
 
-build() {
+build()
+{
   mkdir -p ${srcdir}/calamares/build
   cd ${srcdir}/calamares/build
-  cmake -DCMAKE_BUILD_TYPE=Debug                                               \
-        -DCMAKE_INSTALL_PREFIX=/usr                                            \
-        -DCMAKE_INSTALL_LIBDIR=lib                                             \
-        -DWITH_CRASHREPORTER=OFF                                               \
-        -DSKIP_MODULES="dracut dracutlukscfg dummycpp dummyprocess dummypython \
-                        dummypythonqt grubcfg initramfs initramfscfg           \
-                        interactiveterminal license luksbootkeyfile            \
-                        luksopenswaphookcfg plymouthcfg removeuser webview" ..
+  cmake -DCMAKE_BUILD_TYPE=Debug                                                    \
+        -DCMAKE_INSTALL_PREFIX=/usr                                                 \
+        -DCMAKE_INSTALL_LIBDIR=lib                                                  \
+        -DSKIP_MODULES="dracut dracutlukscfg dummycpp dummyprocess dummypython      \
+                        dummypythonqt initramfs initramfscfg interactiveterminal    \
+                        license plymouthcfg removeuser tracking webview"         ..
 }
 
-package() {
+package()
+{
   cd ${srcdir}/calamares/build
   make DESTDIR="$pkgdir" install
 }
diff --git a/pcr-testing/parabola-laf/PKGBUILD b/pcr-testing/parabola-laf/PKGBUILD
new file mode 100644
index 000000000..5446d8445
--- /dev/null
+++ b/pcr-testing/parabola-laf/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: bill-auger <bill-auger@programmer.net>
+
+
+pkgname=parabola-laf
+pkgver=0.5
+pkgrel=1
+pkgdesc="User skeleton, artwork, and utilities for Parabola graphical desktop systems"
+arch=('any')
+license=('GPL')
+url=https://wiki.parabola.nu/Parabola-LAF
+
+depends=()
+makedepends=()
+
+#_giturl=https://git.parabola.nu/packages/${pkgname}.git
+#source=("${_srcdir}::git+${_giturl}/tag/?h=v${pkgver}")
+source=("https://notabug.org/bill-auger/parabola-laf/archive/v${pkgver}.tar.gz")
+sha256sums=('075bf2685a1dbb6fb6806f50614e9f18516cd7ea1d94724a61e6701eccf66d45')
+
+
+package() {
+  mkdir -p $pkgdir/usr/share/backgrounds
+  mkdir -p $pkgdir/usr/share/pixmaps
+  mkdir -p $pkgdir/usr/bin
+  mkdir -p $pkgdir/boot/grub/themes
+  mkdir -p $pkgdir/usr/share/icons
+  mkdir -p $pkgdir/etc/skel
+
+  cp -r  ${srcdir}/${pkgname}/backgrounds $pkgdir/usr/share/backgrounds/${pkgname}
+  cp -r  ${srcdir}/${pkgname}/banners     $pkgdir/usr/share/pixmaps/${pkgname}
+  cp -rT ${srcdir}/${pkgname}/bin         $pkgdir/usr/bin
+  cp -r  ${srcdir}/${pkgname}/grub-theme  $pkgdir/boot/grub/themes/${pkgname}
+  cp -r  ${srcdir}/${pkgname}/icons       $pkgdir/usr/share/icons/${pkgname}
+  cp -rT ${srcdir}/${pkgname}/skel        $pkgdir/etc/skel
+}