Document changes and release 1.0.10+nmu1

This let's us drop the virtboard build dependency.

.gitlab-ci.yml

@@ -4,6 +4,10 @@ stages:
   - build
 
 before_script:
+  - apt-get -y update
+  - apt-get -y install wget gnupg2
+  - echo "deb http://ci.puri.sm/ scratch librem5" > /etc/apt/sources.list.d/ci.list
+  - wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
   - apt-get -y update
   - apt-get -y build-dep .
 
@@ -12,8 +16,6 @@ build_meson:
   tags:
     - librem5
   script:
-    - mkdir -p ../build
-    - meson ../build/
-    - cd ../build
-    - ninja install
+    - meson . _build/ -Ddepdatadir=/usr/share
+    - ninja -C _build install
 

data/meson.build

@@ -14,10 +14,6 @@ install_data(
     install_dir: pkgdatadir + '/keyboards/geometry/',
 )
 
-install_data('dbus/sm.puri.OSK0.xml',
-    install_dir: dbusdir
-)
-
 symbols = [
     'ar.xml',
     'as-inscript.xml',

debian/changelog

@@ -1,3 +1,17 @@
+squeekboard (1.0.10+nmu1) amber-phone; urgency=medium
+
+  * Add dbus protocol definition.
+    This let's us drop the virtboard build dependency.
+  * debian: Drop virtboard build-dependency
+
+ -- Guido Günther <agx@sigxcpu.org>  Mon, 07 Oct 2019 09:31:18 +0200
+
+squeekboard (1.0.10) unstable; urgency=medium
+
+  * Use a shared DBus definition
+
+ -- Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>  Tue, 02 Jul 2019 20:12:02 +0000
+
 squeekboard (1.0.9) unstable; urgency=medium
 
   * Initial release.

meson.build

@@ -1,7 +1,7 @@
 project(
     'squeekboard',
     'c', 'rust',
-    version: '1.0.9',
+    version: '1.0.10',
     license: 'GPLv3',
     meson_version: '>=0.43.0',
     default_options: [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11' ],
@@ -19,7 +19,12 @@ endif
 prefix = get_option('prefix')
 datadir = join_paths(prefix, get_option('datadir'))
 pkgdatadir = join_paths(datadir, meson.project_name())
-dbusdir = join_paths(datadir, 'dbus-1/interfaces')
+if get_option('depdatadir') == ''
+  depdatadir = datadir
+else
+  depdatadir = get_option('depdatadir')
+endif
+dbusdir = join_paths(depdatadir, 'dbus-1/interfaces')
 
 subdir('data')
 subdir('protocols')

meson_options.txt

@@ -0,0 +1 @@
+option('depdatadir', type : 'string', value : '', description : 'System data path. Will be searched for definitions instead of datadir when provided')

src/meson.build

@@ -1,7 +1,7 @@
 gnome = import('gnome')
 dbus_src = gnome.gdbus_codegen(
     'sm.puri.OSK0',
-    '../data/dbus/sm.puri.OSK0.xml'
+    join_paths(meson.source_root() / 'data' / 'dbus', 'sm.puri.OSK0.xml')
 )
 
 sources = [
@@ -56,14 +56,16 @@ deps = [
   dependency('xkbcommon'),
   cc.find_library('m'),
   cc.find_library('rt'),
+  cc.find_library('dl'),
+  cc.find_library('pthread'),
 #  dependency('libxklavier'), # FIXME remove
 ]
 
 # Replacement for eekboard-server
-rslib = library(
+rslib = static_library(
   'rslib',
-  sources:['imservice.rs'],
-  install: true
+  sources: ['imservice.rs'],
+  rust_crate_type: 'staticlib'
 )
 
 squeekboard = executable('squeekboard',