Merge branch 'conflict' into 'squeekboard'

Fix virtboard conflict

See merge request Librem5/squeekboard!20

.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,8 @@ build_meson:
   tags:
     - librem5
   script:
-    - mkdir -p ../build
-    - meson ../build/
-    - cd ../build
+    - mkdir -p build
+    - meson build/ -Ddepdatadir=/usr/share
+    - cd build
     - ninja install
 

data/dbus/sm.puri.OSK0.xml

@@ -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>

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/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

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')

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(dbusdir, 'sm.puri.OSK0.xml')
 )
 
 sources = [