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

4 files changed, 61 insertions, 7 deletions

diff --git a/pcr-testing/calamares/PKGBUILD b/pcr-testing/calamares/PKGBUILD
index d57545e04..90779af2f 100644
--- a/pcr-testing/calamares/PKGBUILD
+++ b/pcr-testing/calamares/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=calamares
 pkgver=3.1.9
-pkgrel='parabola1.1'
+pkgrel='parabola5.1'
 pkgdesc='Distribution-independent installer framework - Parabola edition'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -19,8 +19,12 @@ depends=(${_runtime_couplings[@]} 'dmidecode' 'gptfdisk' 'hwinfo' 'kconfig' 'kco
          'qt5ct' 'qt5-styleplugins' 'qt5-svg' 'yaml-cpp')
 
 _git_tag="${pkgver}-${pkgrel%%.*}"
-source=("https://notabug.org/bill-auger/calamares/archive/v${_git_tag}.tar.gz")
-sha256sums=('4ce0da2894a7f474c10af65d4c32fd595640bf2307cddaffd0f6636a717f4b65')
+source=("https://notabug.org/bill-auger/calamares/archive/v${_git_tag}.tar.gz"
+        welcome-lxde.txt
+        welcome-mate.txt)
+sha256sums=('819fa6cb493592e99be5ef1cc7589b7fff00471eee7a622c6e53a8478abf4410'
+            'f4eac2d05a33daaf75e81b4240124dbbd98e662797335ab116501e92b20e9849'
+            '6211c6a404fc1a9437d291603fe9990580561f1057463a1f414f3662ff798a24')
 
 
 build()
@@ -33,7 +37,7 @@ build()
         -DCMAKE_INSTALL_LIBDIR=lib                                                  \
         -DSKIP_MODULES="dracut dracutlukscfg dummycpp dummyprocess dummypython      \
                         dummypythonqt initramfs initramfscfg interactiveterminal    \
-                        license plymouthcfg removeuser tracking webview"         ..
+                        license plymouthcfg removeuser webview"                  ..
 }
 
 package()
@@ -43,5 +47,6 @@ package()
   make DESTDIR=${pkgdir} install
 
   # ASSERT: one welcome-<DESKTOP>*.txt for each DESKTOP in calamares GS::DESKTOPS_KEY
+  install -d ${pkgdir}/usr/share/calamares/welcome/
   cp ${srcdir}/welcome-*.txt ${pkgdir}/usr/share/calamares/welcome/
 }
diff --git a/pcr-testing/parabola-laf/PKGBUILD b/pcr-testing/parabola-laf/PKGBUILD
index 29ca7ad89..7dda06277 100644
--- a/pcr-testing/parabola-laf/PKGBUILD
+++ b/pcr-testing/parabola-laf/PKGBUILD
@@ -2,7 +2,7 @@
 
 
 pkgname=parabola-laf
-pkgver=v0.6
+pkgver=0.8
 pkgrel=1
 pkgdesc="User skeleton, artwork, and utilities for Parabola graphical desktop systems"
 arch=('any')
@@ -18,12 +18,12 @@ sha256sums=('SKIP')
 
 pkgver() {
   cd "${pkgname}"
-  git tag | sort | tail -n1
+  git tag | sort | tail -n1 | sed 's|^v\(.*\)|\1|'
 }
 
 package() {
   cd "${pkgname}"
-  git checkout ${pkgver}
+  git checkout "v${pkgver}"
 
   mkdir -p $pkgdir/usr/share/backgrounds
   mkdir -p $pkgdir/usr/share/pixmaps
diff --git a/pcr-testing/wbar/PKGBUILD b/pcr-testing/wbar/PKGBUILD
new file mode 100644
index 000000000..ec8ee3f46
--- /dev/null
+++ b/pcr-testing/wbar/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: bill-auger <bill-auger@programmer.net>
+
+
+pkgname=wbar
+pkgver=2.3.4
+pkgrel=3
+pkgdesc="Minimalist quick-launch tool"
+arch=('i686' 'x86_64')
+license=('GPL')
+url=https://code.google.com/archive/p/wbar/
+
+depends=('imlib2')
+makedepends=('intltool' 'libglade')
+
+source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wbar/wbar-2.3.4.tgz
+        wbar-dock.png)
+sha256sums=('46a69849e4436529aefb5cfb2c94b520d05a53c237e7773b90207f67f97a93e3'
+            '902dbf06f596bf4453e60b5caa5f173cfc2644dd054e27b50b7e028d0968edd0')
+
+_build_dir=${pkgname}-${pkgver}
+
+
+prepare() {
+  cd ${_build_dir}
+
+  sed -i 's|AM_INIT_AUTOMAKE(\[\(.*\)\])|AM_INIT_AUTOMAKE(\[\1subdir-objects \])|' ./configure.ac
+  sed -i 's|\$(top_srcdir)/src/||g'                                                ./src/Makefile.am
+  sed -i 's|= PACKAGE_NAME" "DEFAULT_ARGV;|= PACKAGE_NAME " " DEFAULT_ARGV;|'      ./src/core/Main.cc
+  sed -i 's|= PACKAGE_NAME" "DEFAULT_ARGV;|= PACKAGE_NAME " " DEFAULT_ARGV;|'      ./src/config/Functions.cc
+  sed -i 's|("killall "PACKAGE_NAME)|("killall " PACKAGE_NAME)|'                   ./src/config/Run.cc
+  sed -i 's| PIXMAPDIR"/"PACKAGE_NAME"| PIXMAPDIR "/" PACKAGE_NAME "|'             ./src/config/Functions.cc
+}
+
+build() {
+  cd ${_build_dir}
+
+  autoreconf -fiv
+  ./configure
+  make
+}
+
+package() {
+  cd ${_build_dir}
+
+  make DESTDIR=${pkgdir} install
+
+  install -d usr/share/pixmaps/wbar
+  install -m 644 ${srcdir}/wbar-dock.png ${pkgdir}/usr/share/pixmaps/wbar/
+}
diff --git a/pcr-testing/wbar/wbar-dock.png b/pcr-testing/wbar/wbar-dock.png
new file mode 100644
index 000000000..353b3c65b
--- /dev/null
+++ b/pcr-testing/wbar/wbar-dock.png