Make it build and run :)

.gitmodules

@@ -30,7 +30,7 @@
 	url = https://aur.archlinux.org/ofono.git
 [submodule "mir"]
 	path = mir
-	url = https://aur.archlinux.org/mir.git
+	url = https://github.com/mariogrip/mir-arch-pkg.git
 [submodule "mir-git"]
 	path = mir-git
 	url = https://aur.archlinux.org/mir-git.git

accountsservice-ubuntu/PKGBUILD

@@ -9,7 +9,7 @@ pkgver=0.6.42+12+gdac4254
 pkgrel=1
 pkgdesc='D-Bus interface for user account query and manipulation'
 url='https://www.freedesktop.org/software/accountsservice/'
-arch=(i686 x86_64)
+arch=(i686 x86_64 aarch64)
 license=(GPL3)
 depends=(glib2 polkit systemd)
 makedepends=(intltool gtk-doc gobject-introspection git)

biometryd/PKGBUILD

@@ -0,0 +1,48 @@
+# Maintainer: Marius Gripsgard <marius@ubports.com>
+
+pkgname=biometryd-git
+_pkgname=biometryd
+pkgver=r129.da7940e
+pkgrel=1
+pkgdesc='This project provides an implementation of the Free Desktop Notification server for Unity'
+url='https://github.com/ubports/biometryd'
+arch=(x86_64 i686 armv7h aarch64)
+license=(LGPL GPL)
+conflicts=(biometryd)
+provides=(biometryd)
+depends=(qt5-base dbus-cpp process-cpp cmake-extras-git boost-libs gtest libelf sqlite)
+makedepends=(git)
+checkdepends=()
+source=('git+https://github.com/ubports/biometryd.git'
+        'fix-new-gcc-and-boost.patch')
+sha256sums=('SKIP'
+            'SKIP')
+
+BUILD_DIR=build
+
+pkgver() {
+  cd ${_pkgname}
+  echo "r$(git rev-list --count HEAD).$(git describe --always)"
+}
+
+prepare() {
+  cd ${_pkgname}
+  git checkout bionic
+
+  patch -Np1 -i "${srcdir}/fix-new-gcc-and-boost.patch"
+}
+
+
+build() {
+  cd ${_pkgname}
+  mkdir -p ${BUILD_DIR}
+  cd ${BUILD_DIR}
+  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_INSTALL_LIBDIR="lib/" -DWANT_UI_SERVICES=off ..
+  make
+}
+
+package() {
+  cd ${_pkgname}/${BUILD_DIR}
+  make DESTDIR="${pkgdir}/" install
+  mv ${pkgdir}/usr/lib/qt5/ ${pkgdir}/usr/lib/qt/
+}

biometryd/fix-new-gcc-and-boost.patch

@@ -0,0 +1,79 @@
+diff --git a/src/biometry/devices/forwarding.cpp b/src/biometry/devices/forwarding.cpp
+index 0b5ac97..a751b7e 100644
+--- a/src/biometry/devices/forwarding.cpp
++++ b/src/biometry/devices/forwarding.cpp
+@@ -19,6 +19,8 @@
+
+ #include <biometry/devices/forwarding.h>
+
++#include <stdexcept>
++
+ biometry::devices::Forwarding::Forwarding(const std::shared_ptr<Device>& device)
+     : impl{device}
+ {
+diff --git a/src/biometry/runtime.cpp b/src/biometry/runtime.cpp
+index be345f7..feb168f 100644
+--- a/src/biometry/runtime.cpp
++++ b/src/biometry/runtime.cpp
+@@ -52,12 +52,12 @@ void exception_safe_run(boost::asio::io_service& service)
+ }
+ }
+
+-std::shared_ptr<biometry::Runtime> biometry::Runtime::create(std::uint32_t pool_size)
++std::shared_ptr<biometry::Runtime> biometry::Runtime::create(std::int32_t pool_size)
+ {
+     return std::shared_ptr<biometry::Runtime>(new biometry::Runtime(pool_size));
+ }
+
+-biometry::Runtime::Runtime(std::uint32_t pool_size)
++biometry::Runtime::Runtime(std::int32_t pool_size)
+     : pool_size_{pool_size},
+       service_{pool_size_},
+       strand_{service_},
+@@ -78,7 +78,7 @@ biometry::Runtime::~Runtime()
+
+ void biometry::Runtime::start()
+ {
+-    for (unsigned int i = 0; i < pool_size_; i++)
++    for (int i = 0; i < pool_size_; i++)
+         workers_.push_back(std::thread{exception_safe_run, std::ref(service_)});
+ }
+
+diff --git a/src/biometry/runtime.h b/src/biometry/runtime.h
+index 2c6d96c..ab4c150 100644
+--- a/src/biometry/runtime.h
++++ b/src/biometry/runtime.h
+@@ -44,7 +44,7 @@ public:
+
+     // create returns a Runtime instance with pool_size worker threads
+     // executing the underlying service.
+-    static std::shared_ptr<Runtime> create(std::uint32_t pool_size = worker_threads);
++    static std::shared_ptr<Runtime> create(std::int32_t pool_size = worker_threads);
+
+     Runtime(const Runtime&) = delete;
+     Runtime(Runtime&&) = delete;
+@@ -72,9 +72,9 @@ public:
+ private:
+     // Runtime constructs a new instance, firing up pool_size
+     // worker threads.
+-    Runtime(std::uint32_t pool_size);
++    Runtime(std::int32_t pool_size);
+
+-    std::uint32_t pool_size_;
++    std::int32_t pool_size_;
+     boost::asio::io_service service_;
+     boost::asio::io_service::strand strand_;
+     boost::asio::io_service::work keep_alive_;
+diff --git a/src/biometry/variant.cpp b/src/biometry/variant.cpp
+index 921dfcf..ad1d848 100644
+--- a/src/biometry/variant.cpp
++++ b/src/biometry/variant.cpp
+@@ -21,6 +21,8 @@
+
+ #include <boost/variant.hpp>
+
++#include <iostream>
++
+ namespace
+ {
+ typedef typename boost::make_recursive_variant

build-packages.sh

@@ -11,44 +11,50 @@ Options:
   clean|-c     -  Clean all packages
   uninstall|-u -  Uninstall all packages
   srcinfo|-s   -  Regenerate .SRCINFOs of all packages
+Environment Variables:
+  PROJECT_LIST - select list to use
 _EOF
   exit 0
 }
 
+PACKAGES=$(cat "${PROJECT_LIST:-projects.list}")
+
 cmd_build() {
   sudo test true
-  PACKAGES=$(cat projects.list)
   for package in $PACKAGES
   do
     cd ${package}
-    yes | makepkg -sfi
+    makepkg -si --noconfirm
     echo "----------------------"
     cd ..
   done
 }
 
 cmd_rebuild() {
-  for package in ./*/
+  sudo test true
+  for package in $PACKAGES
   do
     cd ${package}
-    yes | makepkg -sfr --holdver
+    makepkg -sfr --holdver --noconfirm
     echo "----------------------"
     cd ..
   done
 }
 
 cmd_needed() {
-  for package in ./*/
+  sudo test true
+  for package in $PACKAGES
   do
     cd ${package}
-    yes | makepkg -sr || true
+    makepkg -si --needed --noconfirm
     echo "----------------------"
     cd ..
   done
 }
 
 cmd_clean() {
-  for package in ./*/
+  sudo test true
+  for package in $PACKAGES
   do
     cd ${package}
     makepkg -dCo
@@ -58,7 +64,6 @@ cmd_clean() {
 
 cmd_uninstall() {
   sudo test true
-  PACKAGES=$(cat projects.list)
   for package in $PACKAGES
   do
     yes | sudo pacman -Rdd ${package} || true
@@ -67,7 +72,7 @@ cmd_uninstall() {
 }
 
 cmd_srcinfo() {
-  for package in ./*/
+  for package in $PACKAGES
   do
     cd ${package}
     makepkg --printsrcinfo > .SRCINFO

click-git/PKGBUILD

@@ -2,8 +2,8 @@
 
 pkgname=click-git
 _pkgname=click
-pkgver=r1079.28b9c13
-pkgrel=2
+pkgver=r1082.cc10894
+pkgrel=1
 pkgdesc='Click is a simplified packaging format'
 url='https://github.com/ubports/click'
 arch=(x86_64 i686 armv7h aarch64)

cmake-extras-git/PKGBUILD

@@ -2,8 +2,8 @@
 
 pkgname=cmake-extras-git
 _pkgname=cmake-extras
-pkgver=r241.820b661
-pkgrel=2
+pkgver=r251.4db1e08
+pkgrel=1
 pkgdesc='A collection of add-ons for the CMake build tool'
 url='https://github.com/ubports/cmake-extras'
 arch=(any)

geonames-git/PKGBUILD

@@ -2,8 +2,8 @@
 
 pkgname=geonames-git
 _pkgname=geonames
-pkgver=r4.fb9788a
-pkgrel=2
+pkgver=r5.ce158ce
+pkgrel=1
 pkgdesc='Parse and query the geonames database dump'
 url='https://github.com/ubports/geonames'
 arch=(x86_64 i686 armv7h aarch64)

gmenuharness-bzr/PKGBUILD

@@ -11,7 +11,7 @@ license=()
 conflicts=(gmenuharness)
 provides=(gmenuharness)
 depends=(unity-api-git gtest libqtdbustest-git)
-makedepends=(bzr cmake cmake-extras-git doxygen)
+makedepends=(bzr cmake cmake-extras-git doxygen python-dulwich)
 source=("bzr+lp:${_pkgname}"
         'Functional1.patch'
         'Functional2.patch')

gsettings-qt-git/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=gsettings-qt-git
 _pkgname=gsettings-qt
-pkgver=r185.c8ecb2b
+pkgver=r187.fa7454a
 pkgrel=1
 pkgdesc='Library to access GSettings from Qt'
 url='https://github.com/ubports/gsettings-qt'
@@ -12,7 +12,7 @@ depends=(qt5-base qt5-declarative)
 makedepends=(git)
 provides=(gsettings-qt)
 replaces=(gsettings-qt)
-source=('git+https://github.com/ubports/gsettings-qt.git')
+source=('git+https://gitlab.com/ubports/core/gsettings-qt.git')
 sha256sums=('SKIP')
 
 #BUILDENV+=('!check') 
@@ -22,11 +22,6 @@ pkgver() {
   echo "r$(git rev-list --count HEAD).$(git describe --always)"
 }
 
-prepare() {
-  cd ${_pkgname}
-  git checkout bionic
-}
-
 build() {
   cd ${_pkgname}
   qmake-qt5 PREFIX=/usr

gsettings-ubuntu-touch-schemas-git/PKGBUILD

@@ -2,8 +2,8 @@
 
 pkgname=gsettings-ubuntu-touch-schemas-git
 _pkgname=gsettings-ubuntu-touch-schemas
-pkgver=r199.0d029fa
-pkgrel=2
+pkgver=r202.b3bdf17
+pkgrel=1
 pkgdesc='GSettings desktop-wide schemas for Ubuntu Touch'
 url='https://github.com/ubports/gsettings-ubuntu-touch-schemas'
 arch=(x86_64 i686 armv7h aarch64)

history-service-git/PKGBUILD

@@ -2,8 +2,8 @@
 
 pkgname=history-service-git
 _pkgname=history-service
-pkgver=r940.75af530
-pkgrel=2
+pkgver=r1425.648b3ee
+pkgrel=1
 pkgdesc='History service to store messages and calls'
 url='https://github.com/ubports/history-service'
 arch=(x86_64 i686 armv7h aarch64)

indicator-network-git/PKGBUILD

@@ -2,15 +2,15 @@
 
 pkgname=indicator-network-git
 _pkgname=indicator-network
-pkgver=r1949.27fabbd2
-pkgrel=3
+pkgver=r2042.2539978c
+pkgrel=1
 pkgdesc='Network indicator'
 url='https://github.com/ubports/indicator-network'
 arch=(x86_64 i686 armv7h aarch64)
 license=(LGPL3 GPL3)
 conflicts=(indicator-network)
 provides=(indicator-network)
-depends=(lcov gcovr gsettings-qt ofono url-dispatcher-git libqofono libqtdbustest-git libqtdbusmock-git gmenuharness-bzr)
+depends=(lcov gcovr gsettings-qt ofono url-dispatcher-git libqofono-qt5 libqtdbustest-git libqtdbusmock-git gmenuharness-bzr)
 makedepends=(git cmake cmake-extras-git doxygen)
 checkdepends=()
 source=('git+https://github.com/ubports/indicator-network.git')

libertine-git/PKGBUILD

@@ -2,8 +2,8 @@
 
 pkgname=libertine-git
 _pkgname=libertine
-pkgver=r465.4ae89b2
-pkgrel=2
+pkgver=r467.e1c5b7b
+pkgrel=1
 pkgdesc='A sandbox for running legacy deb-based X11 applications'
 url='https://github.com/ubports/libertine'
 arch=(x86_64 i686 armv7h aarch64)

libqofono/PKGBUILD → libqofono-qt5/PKGBUILD

@@ -1,6 +1,7 @@
 # Maintainer: Ivan Semkin (ivan at semkin dot ru)
 
-pkgname=libqofono
+pkgname=libqofono-qt5
+_pkgname=libqofono
 pkgver=0.94
 pkgrel=1
 pkgdesc='A library for accessing the ofono daemon, and a declarative plugin for it'
@@ -15,18 +16,18 @@ sha256sums=('f5220a583f559f31f2b8592068f59ad0620e46d1e6bafc0d5d46da6771ecd472')
 BUILDENV+=('!check') # Tests can only be run AFTER the package is installed (maybe some prefix exists?)
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${_pkgname}-${pkgver}
   qmake
   make
 }
 
 check() {
-  cd ${pkgname}-${pkgver}
+  cd ${_pkgname}-${pkgver}
   make check TESTARGS="-silent"
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${_pkgname}-${pkgver}
   make INSTALL_ROOT="${pkgdir}/" install
 }
 # vim:set ts=2 sw=2 et:

libqtdbusmock-git/PKGBUILD

@@ -2,8 +2,8 @@
 
 pkgname=libqtdbusmock-git
 _pkgname=libqtdbusmock
-pkgver=r122.d6d1830
-pkgrel=2
+pkgver=r126.1e9fd84
+pkgrel=1
 pkgdesc='Library for mocking DBus interactions using Qt'
 url='https://github.com/ubports/libqtdbusmock'
 arch=(x86_64 i686 armv7h aarch64)

libusermetrics-git/PKGBUILD

@@ -2,8 +2,8 @@
 
 pkgname=libusermetrics-git
 _pkgname=libusermetrics
-pkgver=r477.a50ce9f
-pkgrel=3
+pkgver=r479.ed7dd5d
+pkgrel=1
 pkgdesc='Library for exporting anonymous metrics about users'
 url='https://github.com/ubports/libusermetrics'
 arch=(x86_64 i686 armv7h aarch64)