From 4ee8a91dfeda5f324714ab8edb7d82a32cf11c8f Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Mon, 18 Nov 2019 20:43:09 +0000
Subject: [PATCH] build: Bring back squeekboard as a first class executable

With styles no longer being inconsistent, there's no need to override styles by default. The override script remains for PureOS packaging purposes.
---
 debian/squeekboard.install                     |  2 +-
 debian/squeekboard.lintian-overrides           |  2 +-
 src/meson.build                                | 17 +++--------------
 tools/{squeekboard.in => squeekboard-restyled} |  2 +-
 4 files changed, 6 insertions(+), 17 deletions(-)
 rename tools/{squeekboard.in => squeekboard-restyled} (92%)

diff --git a/debian/squeekboard.install b/debian/squeekboard.install
index c87f05b7..7f2df323 100644
--- a/debian/squeekboard.install
+++ b/debian/squeekboard.install
@@ -1,2 +1,2 @@
-usr/bin/squeekboard-real /usr/bin
+tools/squeekboard-restyled usr/bin
 usr/bin/squeekboard /usr/bin
diff --git a/debian/squeekboard.lintian-overrides b/debian/squeekboard.lintian-overrides
index 0167bdc4..5be12589 100644
--- a/debian/squeekboard.lintian-overrides
+++ b/debian/squeekboard.lintian-overrides
@@ -1,2 +1,2 @@
 # yaml-rust 0.4.3 shares some roots with libyaml, including the string which lintian checks, creating a false positive
-squeekboard binary: embedded-library usr/bin/squeekboard-real: libyaml
+squeekboard binary: embedded-library usr/bin/squeekboard: libyaml
diff --git a/src/meson.build b/src/meson.build
index 36f817bb..fc1f5f4e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -97,20 +97,7 @@ libsqueekboard = static_library('libsqueekboard',
     '-DEEK_COMPILATION=1'],
 )
 
-# the straight binary needs to be demoted in favor of the wrapper script
-# due to styling being inconsistent
-bindir = join_paths(prefix, get_option('bindir'))
-wrapper_conf = configuration_data()
-wrapper_conf.set('bindir', bindir)
-configure_file(
-  input: '../tools/squeekboard.in',
-  output: 'squeekboard',
-  install_dir: bindir,
-  configuration: wrapper_conf,
-  install: true,
-)
-
-squeekboard = executable('squeekboard-real',
+squeekboard = executable('squeekboard',
   'server-main.c',
   wl_proto_sources,
   squeekboard_resources,
@@ -125,6 +112,8 @@ squeekboard = executable('squeekboard-real',
     '-DEEK_COMPILATION=1'],
 )
 
+bindir = join_paths(prefix, get_option('bindir'))
+
 test_layout = custom_target('squeekboard-test-layout',
     build_by_default: true,
     # meson doesn't track all inputs, cargo does
diff --git a/tools/squeekboard.in b/tools/squeekboard-restyled
similarity index 92%
rename from tools/squeekboard.in
rename to tools/squeekboard-restyled
index ea5d239c..ca6a6281 100755
--- a/tools/squeekboard.in
+++ b/tools/squeekboard-restyled
@@ -12,4 +12,4 @@ for DIR in ${DIRS}; do
   fi;
 done;
 
-exec @bindir@/squeekboard-real
+exec $(which squeekboard)