calamares 3.1.3.1

updated rls notes, upstream 3.1.4rc
babe latest checkout, too broken, removed from build
appstream 0.11.4, moved to meson build sys, not building docs fails, gtk-doc is still called/needed
discover rebuild for new appstream, added sed line for appstream dir renaming

appstream/PKGBUILD

@@ -1,36 +1,37 @@
 
 pkgname=appstream
 _pkgname=AppStream
-pkgver=0.11.3
+pkgver=0.11.4
 pkgrel=1
 pkgdesc="Provides a standard for creating app stores across distributions"
 arch=('x86_64')
 url="https://github.com/ximion/appstream"
 license=('GPL')
 depends=('libyaml' 'libxml2' 'glib2' 'qt5-base')
-makedepends=('cmake' 'gobject-introspection' 'itstool' 'python2' 'xmlto')
+makedepends=('meson' 'ninja' 'gobject-introspection' 'itstool' 'python2' 'xmlto' 'gtk-doc')
 source=("https://www.freedesktop.org/software/appstream/releases/${_pkgname}-${pkgver}.tar.xz"
         'appstream.hook')
-md5sums=('c2d9636b324a247dac0bb88fc1944726'
+md5sums=('1a7971dc37af30f3bfbbf82c9d4b360d'
          'f244ccc7b89aacfe903facce393174ca')
 
 build() {
   mkdir -p build
   cd build
 
-  cmake ../${_pkgname}-${pkgver} \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DCMAKE_INSTALL_LIBDIR=lib \
-  -DQT=ON \
-  -DSTEMMING=OFF
-  make -j1
+   meson ../${_pkgname}-${pkgver} \
+    --prefix=/usr \
+    --buildtype=release \
+    --libexecdir=/usr/lib \
+    -Dqt=true \
+    -Dstemming=false \
+    -Ddocumentation=false
+  ninja
 }
 
 package() {
   cd build
 
-  make DESTDIR=${pkgdir} install
+  DESTDIR=${pkgdir} ninja install
 
   install -Dm644 ../appstream.hook ${pkgdir}/usr/share/libalpm/hooks/appstream.hook
 }

babe/PKGBUILD

@@ -1,7 +1,7 @@
 
 pkgname=babe
-pkgver=0.4.82
-_commit=89e87a179f40fcd9a7f92152906a18208e9b7ab2
+pkgver=0.4.83
+_commit=72f7debbbc0158392e7614fb8b2b493e066c51e7
 pkgrel=1
 arch=('x86_64')
 pkgdesc="Babe will handle your whole music collection, letting you create custom playlists to organize your music."
@@ -11,7 +11,7 @@ depends=('knotifications' 'ki18n' 'kconfig' 'qt5-multimedia' 'taglib' 'youtube-d
 makedepends=('extra-cmake-modules')
 source=("https://github.com/KDE/babe/archive/${_commit}.zip"
         "https://github.com/KDE/babe/commit/77958ad9a49f0d28a532cda787f6874866c0fd4b.diff")
-md5sums=('bcd27b4cc14942946ee8eb044af814ed'
+md5sums=('539eb6691af0d7211a648dd60e1f4ff4'
          '2fe60a444879b9d2658d94199809a565')
 
 prepare() {

calamares/PKGBUILD

@@ -1,6 +1,6 @@
 
 pkgname=calamares
-pkgver=3.1.3
+pkgver=3.1.3.1
 pkgrel=1
 pkgdesc='Distribution-independent installer framework'
 arch=('x86_64')
@@ -27,7 +27,7 @@ md5sums=('SKIP'
          '8b69a3a86923e2ee67a5a0725acb93e6'
          'fc92a5a0a1276a8e8f1a3327a0e567ee'
          'bb33b54d289cfe39ebfd78f172382880'
-         '6d43fbd382a66dd1524b384c49388817')
+         'e6357ef3ed301c9ea67ad970997bfba2')
 
 prepare () {
   cd ${pkgname}

calamares/release_notes.html

@@ -21,7 +21,7 @@ <h3>KaOS - 2017.09</h3>
 
     <p>As requested by KaOS users, the next ISO will also have a custom look for the bash prompt. This can be added to current installs too by installing powerline.  The Midna Splashscreen was rewritten. It now uses a few QML effects instead of just one.</p>
 
-    <p>A few more QML based applications have been added to the KaOS repositories.  Koko, new Image Gallery application and Kube, a modern Communication and Collaboration Client.  Kube might some day replace KMail in KaOS.
+    <p>It has been a few years, but finally there is an up to date (Qt5/kf5 based) firewall application available again. Nomad-firewall is available on this ISO.  A second scan application is added. Kooka, just ported to kf5. This application has quite a few more options then skanlite, so it is nice to be able to add a second (Qt/kf5 based) option for scanning.  Krita 3.2 has the new option to use the G’MIC plugin. For that gmic-qt is added to the repositories. With this, the options to add effects to any artwork/image are sheer endless.</p>
 
     <p>A new option is the addition to verify the authenticity of downloaded KaOS ISO files through GPG signature verification, see the Download page for further details and instructions.</p>
 
@@ -56,12 +56,12 @@ <h3>KaOS - 2017.09</h3>
 
     <p>To avoid any misunderstanding and confusion, KaOS is <b>not based upon, derived of, or inspired by</b> any one particular distribution. It is completely independent, build entirely from scratch with its own repositories. To read more about this see <b>http://kaosx.us/about/based/</b>. A <b>rolling release distribution</b> never has a "final" release, every ISO is mere a snapshot of the current status of the repositories. An idea what is currently available:</p>
 
-    <p>The ISO ships with <b>Frameworks 5.37.0, Plasma 5.10.5, KDE Applications 17.08.0 &amp; not yet released ports of KDE Applications</b>, Linux 4.12.9, Systemd 233, Kmod 24, NetworkManager 1.8.2, Calligra 3.0.1, Krita 3.2.0, Babe, Xorg-Server 1.19.3, Mesa 17.1.7, Glibc 2.25, GCC 6.4.0, non-free Nvidia 384.69, Pepperflash and Python3 3.6.2 to name a few.</p>
+    <p>The ISO ships with <b>Frameworks 5.37.0, Plasma 5.10.5, KDE Applications 17.08.0 &amp; not yet released ports of KDE Applications</b>, Linux 4.12.10, Systemd 234, Kmod 24, NetworkManager 1.8.2, Calligra 3.0.1, Krita 3.2.0, Babe, Xorg-Server 1.19.3, Mesa 17.1.8, Glibc 2.25, GCC 6.4.0, non-free Nvidia 384.69, Pepperflash and Python3 3.6.2 to name a few.</p>
 
     <p>The package manager is <strong>Pacman 5.0.2</strong>, with the simple but powerful Octopi 0.9dev as GUI frontend. Default web browser is Qt based Qupzilla 2.1.2. <b>GFXboot</b> is included with KaOS artwork, Grub theme is Midna, Look &amp; Feel is a KaOS exclusive version "Midna", fully redone for 2017.</p>
 
-    <p><b>Repositories</b> of KaOS will stay limited in size and expect it to stay at the current maximum of about 2100-2200. A gist of what is available, besides the stable kernel there is Linux-next 4.12, Libreoffice 5.4.0, bumblebee packages, VLC, Vokoscreen, Blender, XBMC, Calibre, Sigil, Librecad, a few games like 0ad and Knights.<br />
-    A limited number of the most well-known GTK applications are available, examples Firefox 55.0.2, Chrome 62, Ardour 5.10.0, Inkscape 0.92.2, GIMP 2.9.4 and Google-talkplugin 5.41.3.0.1.<br />
+    <p><b>Repositories</b> of KaOS will stay limited in size and expect it to stay at the current maximum of about 2100-2200. A gist of what is available, besides the stable kernel there is Linux-next 4.13, Libreoffice 5.4.0, bumblebee packages, VLC, Vokoscreen, Blender, XBMC, Calibre, Sigil, Librecad, a few games like 0ad and Knights.<br />
+    A limited number of the most well-known GTK applications are available, examples Firefox 55.0.3, Chrome 62, Ardour 5.10.0, Inkscape 0.92.2, GIMP 2.9.4 and Google-talkplugin 5.41.3.0.1.<br />
     Complete language packs are available for KDE, Calligra, Firefox, Libreoffice and Thunderbird. For IM, Fcitx 4.2.9.1 is available as a rather complete group.</p>
 
     <p><b>Known issues:</b></p>

discover/PKGBUILD

@@ -5,7 +5,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 pkgname=discover
 arch=('x86_64')
 pkgver=${_plasmaver}
-pkgrel=1
+pkgrel=2
 pkgdesc="An Application Installer for the 22nd Century"
 url="https://userbase.kde.org/Discover"
 license=('GPL' 'LGPL' 'FDL')
@@ -17,6 +17,12 @@ makedepends=('extra-cmake-modules' 'kdoctools')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/KDE/${pkgname}/archive/${_branch}.tar.gz")
 md5sums=(`grep ${pkgname}-${_plasmaver}.tar.gz ../kf5.md5 | cut -d" " -f1`)
 
+prepare() {
+  cd ${pkgname}-${__pkgver}
+
+  sed -i -e 's|<AppStream/appstream.h>|<appstream.h>|' libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp
+}
+
 build() {
   mkdir -p build
   cd build