From 61a5e8d4fd91d7ff767af8eafd174c69ed77811d Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Tue, 2 Jul 2019 13:53:40 +0000
Subject: [PATCH] install: Don't distribute dbus definition

Instead, require virtboard to provide it.
---
 .gitlab-ci.yml             |  6 +++++-
 data/dbus/sm.puri.OSK0.xml | 20 --------------------
 data/meson.build           |  4 ----
 debian/control             |  1 +
 meson.build                |  7 ++++++-
 meson_options.txt          |  1 +
 src/meson.build            |  2 +-
 7 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 data/dbus/sm.puri.OSK0.xml
 create mode 100644 meson_options.txt

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index afca9262..ad79675e 100644
--- a/.gitlab-ci.yml
+++ b/.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 .
 
@@ -13,7 +17,7 @@ build_meson:
     - librem5
   script:
     - mkdir -p build
-    - meson build/
+    - meson build/ -Ddepdatadir=/usr/share
     - cd build
     - ninja install
 
diff --git a/data/dbus/sm.puri.OSK0.xml b/data/dbus/sm.puri.OSK0.xml
deleted file mode 100644
index a543ee1d..00000000
--- a/data/dbus/sm.puri.OSK0.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
-  <interface name="sm.puri.OSK0">
-    <method name="SetVisible">
-      <arg name="visible" type="b" direction="in"/>
-      <doc:doc><doc:description>
-        Switch keyboard visibility
-      </doc:description></doc:doc>
-    </method>
-    <method name="GetVisible">
-      <arg name="visible" type="b" direction="out"/>
-      <doc:doc><doc:description>
-        Get keyboard visibility
-      </doc:description></doc:doc>
-    </method>
-    <property name="Visible" type="b" access="read">
-    </property>
-  </interface>
-</node>
diff --git a/data/meson.build b/data/meson.build
index 9749cf0e..2aa9afa6 100644
--- a/data/meson.build
+++ b/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',
diff --git a/debian/control b/debian/control
index b4d16a57..85507c70 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends:
  libcroco3-dev,
  libwayland-dev (>= 1.16),
  rustc,
+ virtboard,
  wayland-protocols (>= 1.14)
 Standards-Version: 4.1.3
 Homepage: https://source.puri.sm/Librem5/squeekboard
diff --git a/meson.build b/meson.build
index 38e6db1e..2e91c424 100644
--- a/meson.build
+++ b/meson.build
@@ -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')
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 00000000..b74814dd
--- /dev/null
+++ b/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')
diff --git a/src/meson.build b/src/meson.build
index c5452cc1..5f849ec8 100644
--- a/src/meson.build
+++ b/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(dbusdir, 'sm.puri.OSK0.xml')
 )
 
 sources = [