From 3d518b5757c4b694d762cb1b70b9e70b1290aadb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Mon, 15 Jul 2019 19:03:30 +0200 Subject: [PATCH 1/4] build: Bump meson dep since we use '/' --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index e88826c9..269a451e 100644 --- a/meson.build +++ b/meson.build @@ -3,7 +3,7 @@ project( 'c', 'rust', version: '1.0.10', license: 'GPLv3', - meson_version: '>=0.43.0', + meson_version: '>=0.49.0', default_options: [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11' ], ) From c65583b911a6e0028788a3fb43e6199d435ce0ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 17 Jul 2019 19:38:14 +0200 Subject: [PATCH 2/4] Add a gitignore file Based on the phosh one to ignore (upcoming) translations, editor backup files and so forth. --- .gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..509ee703 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +.zanata-cache/ +_build +TAGS +tags +vgdump +*.swp +*~ +\#*# +.\#* From dbc8cc14bc7a59d3799c084895eb3efc48ae5615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 17 Jul 2019 19:40:52 +0200 Subject: [PATCH 3/4] Generate config.h This allows us to remove a lot of #ifdef's. Either we want to use a config.h or we don't. Since we'll want it for e.g. optional gsound support later on let's have it. --- eek/config.h | 0 eek/eek-container.c | 2 -- eek/eek-element.c | 2 -- eek/eek-gtk-keyboard.c | 2 -- eek/eek-gtk-renderer.c | 2 -- eek/eek-key.c | 2 -- eek/eek-keyboard-drawing.c | 2 -- eek/eek-keyboard.c | 2 -- eek/eek-keysym.c | 2 -- eek/eek-layout.c | 2 -- eek/eek-renderer.c | 2 -- eek/eek-section.c | 2 -- eek/eek-serializable.c | 2 -- eek/eek-symbol.c | 2 -- eek/eek-text.c | 2 -- eek/eek-theme-context.c | 2 -- eek/eek-theme-node.c | 2 -- eek/eek-types.c | 2 -- eek/eek-xml-layout.c | 2 -- eek/eek-xml.c | 2 -- eek/eek.c | 2 -- eekboard/eekboard-context-service.c | 2 -- eekboard/eekboard-context.c | 2 -- eekboard/eekboard-service.c | 2 -- meson.build | 12 ++++++++++++ src/config.h.in | 4 ++++ src/meson.build | 3 +++ src/server-context-service.c | 2 -- src/server-main.c | 2 -- tests/eek-xml-test.c | 2 -- 30 files changed, 19 insertions(+), 52 deletions(-) delete mode 100644 eek/config.h create mode 100644 src/config.h.in diff --git a/eek/config.h b/eek/config.h deleted file mode 100644 index e69de29b..00000000 diff --git a/eek/eek-container.c b/eek/eek-container.c index 042005bd..6d44dc63 100644 --- a/eek/eek-container.c +++ b/eek/eek-container.c @@ -26,9 +26,7 @@ * shall be used to implement #EekKeyboard and #EekSection. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include "eek-container.h" diff --git a/eek/eek-element.c b/eek/eek-element.c index 8e42a015..f44361d3 100644 --- a/eek/eek-element.c +++ b/eek/eek-element.c @@ -26,9 +26,7 @@ * shall be used to implement #EekKeyboard, #EekSection, or #EekKey. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include diff --git a/eek/eek-gtk-keyboard.c b/eek/eek-gtk-keyboard.c index f5b61447..dfe9a968 100644 --- a/eek/eek-gtk-keyboard.c +++ b/eek/eek-gtk-keyboard.c @@ -23,9 +23,7 @@ * @short_description: a #GtkWidget displaying #EekKeyboard */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #ifdef HAVE_LIBCANBERRA #include diff --git a/eek/eek-gtk-renderer.c b/eek/eek-gtk-renderer.c index 8e413978..9763d9da 100644 --- a/eek/eek-gtk-renderer.c +++ b/eek/eek-gtk-renderer.c @@ -18,9 +18,7 @@ * 02110-1301 USA */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include #include diff --git a/eek/eek-key.c b/eek/eek-key.c index 4a57bb84..7df2b81d 100644 --- a/eek/eek-key.c +++ b/eek/eek-key.c @@ -25,9 +25,7 @@ * The #EekKeyClass class represents a key. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include diff --git a/eek/eek-keyboard-drawing.c b/eek/eek-keyboard-drawing.c index 1ead5de2..5cd435c7 100644 --- a/eek/eek-keyboard-drawing.c +++ b/eek/eek-keyboard-drawing.c @@ -17,9 +17,7 @@ * Boston, MA 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include #include diff --git a/eek/eek-keyboard.c b/eek/eek-keyboard.c index dfe03662..5bbc4f28 100644 --- a/eek/eek-keyboard.c +++ b/eek/eek-keyboard.c @@ -27,9 +27,7 @@ * of one or more sections of the #EekSectionClass class. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include "eek-keyboard.h" #include "eek-marshalers.h" diff --git a/eek/eek-keysym.c b/eek/eek-keysym.c index bde422d4..f02a309e 100644 --- a/eek/eek-keysym.c +++ b/eek/eek-keysym.c @@ -23,9 +23,7 @@ * @short_description: an #EekSymbol represents an X keysym */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include #include diff --git a/eek/eek-layout.c b/eek/eek-layout.c index 23bb2600..fe1ce293 100644 --- a/eek/eek-layout.c +++ b/eek/eek-layout.c @@ -26,9 +26,7 @@ * arranges keyboard elements. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include "eek-layout.h" #include "eek-keyboard.h" diff --git a/eek/eek-renderer.c b/eek/eek-renderer.c index 1d7585b8..c9b15083 100644 --- a/eek/eek-renderer.c +++ b/eek/eek-renderer.c @@ -18,9 +18,7 @@ * 02110-1301 USA */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include #include diff --git a/eek/eek-section.c b/eek/eek-section.c index 5a04619c..400dbb25 100644 --- a/eek/eek-section.c +++ b/eek/eek-section.c @@ -27,9 +27,7 @@ * of one or more keys of the #EekKeyClass class. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include diff --git a/eek/eek-serializable.c b/eek/eek-serializable.c index f3882b42..82fea1ec 100644 --- a/eek/eek-serializable.c +++ b/eek/eek-serializable.c @@ -27,9 +27,7 @@ * method. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include "eek-serializable.h" diff --git a/eek/eek-symbol.c b/eek/eek-symbol.c index 846f9fd1..8352b11d 100644 --- a/eek/eek-symbol.c +++ b/eek/eek-symbol.c @@ -25,9 +25,7 @@ * The #EekSymbolClass class represents a symbol assigned to a key. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include "eek-symbol.h" #include "eek-serializable.h" diff --git a/eek/eek-text.c b/eek/eek-text.c index 258e9e97..6ef1ed4f 100644 --- a/eek/eek-text.c +++ b/eek/eek-text.c @@ -23,9 +23,7 @@ * @short_description: an #EekText represents a text symbol */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include "eek-text.h" #include "eek-serializable.h" diff --git a/eek/eek-theme-context.c b/eek/eek-theme-context.c index c6211e41..36b63370 100644 --- a/eek/eek-theme-context.c +++ b/eek/eek-theme-context.c @@ -19,9 +19,7 @@ * along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include "eek-theme.h" #include "eek-theme-context.h" diff --git a/eek/eek-theme-node.c b/eek/eek-theme-node.c index 33c089ad..a3bb3607 100644 --- a/eek/eek-theme-node.c +++ b/eek/eek-theme-node.c @@ -23,9 +23,7 @@ * along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include #include diff --git a/eek/eek-types.c b/eek/eek-types.c index a757bb7d..6bd1b9fa 100644 --- a/eek/eek-types.c +++ b/eek/eek-types.c @@ -24,9 +24,7 @@ * @short_description: Miscellaneous types used in Libeek */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include #include diff --git a/eek/eek-xml-layout.c b/eek/eek-xml-layout.c index 158b58bf..7c28b056 100644 --- a/eek/eek-xml-layout.c +++ b/eek/eek-xml-layout.c @@ -21,9 +21,7 @@ * @short_description: Layout engine which loads layout information from XML */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include /* GResource */ #include diff --git a/eek/eek-xml.c b/eek/eek-xml.c index cac9ea0d..de6dd307 100644 --- a/eek/eek-xml.c +++ b/eek/eek-xml.c @@ -22,9 +22,7 @@ * @short_description: #EekKeyboard to XML conversion utilities */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include #include diff --git a/eek/eek.c b/eek/eek.c index 6524b387..91ec19f3 100644 --- a/eek/eek.c +++ b/eek/eek.c @@ -23,9 +23,7 @@ * @title: Library Initialization */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include "eek.h" diff --git a/eekboard/eekboard-context-service.c b/eekboard/eekboard-context-service.c index 00a60cd7..94abf292 100644 --- a/eekboard/eekboard-context-service.c +++ b/eekboard/eekboard-context-service.c @@ -25,9 +25,7 @@ * implementation of eekboard input context service. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include "eekboard/eekboard-context-service.h" diff --git a/eekboard/eekboard-context.c b/eekboard/eekboard-context.c index f63f649a..a5bfddbc 100644 --- a/eekboard/eekboard-context.c +++ b/eekboard/eekboard-context.c @@ -24,9 +24,7 @@ * context. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include "eekboard/eekboard-context.h" //#include "eekboard/eekboard-marshalers.h" diff --git a/eekboard/eekboard-service.c b/eekboard/eekboard-service.c index 86d125c8..61a51e3f 100644 --- a/eekboard/eekboard-service.c +++ b/eekboard/eekboard-service.c @@ -26,9 +26,7 @@ * implementation of eekboard service. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include "eekboard/eekboard-service.h" diff --git a/meson.build b/meson.build index 269a451e..ff12a382 100644 --- a/meson.build +++ b/meson.build @@ -9,6 +9,8 @@ project( i18n = import('i18n') +conf_data = configuration_data() + if get_option('buildtype').startswith('debug') add_project_arguments('-DDEBUG=1', language : 'c') endif @@ -26,6 +28,16 @@ else endif dbusdir = join_paths(depdatadir, 'dbus-1/interfaces') +summary = [ + '', + '------------------', + 'squeekboard @0@'.format(meson.project_version()), + '', + '------------------', + '' +] +message('\n'.join(summary)) + subdir('data') subdir('protocols') subdir('eek') diff --git a/src/config.h.in b/src/config.h.in new file mode 100644 index 00000000..ae878778 --- /dev/null +++ b/src/config.h.in @@ -0,0 +1,4 @@ +/* + * Autogenerated by the Meson build system. + * Do not edit, your changes will be lost. + */ diff --git a/src/meson.build b/src/meson.build index 2f19c947..1a8dad20 100644 --- a/src/meson.build +++ b/src/meson.build @@ -4,7 +4,10 @@ dbus_src = gnome.gdbus_codegen( join_paths(meson.source_root() / 'data' / 'dbus', 'sm.puri.OSK0.xml') ) +config_h = configure_file(input: 'config.h.in', output: 'config.h',configuration: conf_data) + sources = [ + config_h, 'imservice.c', 'server-context-service.c', 'server-main.c', diff --git a/src/server-context-service.c b/src/server-context-service.c index c9ed3edf..1442078e 100644 --- a/src/server-context-service.c +++ b/src/server-context-service.c @@ -15,9 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include #include diff --git a/src/server-main.c b/src/server-main.c index ac8a0cfb..2263af18 100644 --- a/src/server-main.c +++ b/src/server-main.c @@ -23,9 +23,7 @@ #include #include -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #if HAVE_CLUTTER_GTK #include diff --git a/tests/eek-xml-test.c b/tests/eek-xml-test.c index 7beb7bc9..0ed814e4 100644 --- a/tests/eek-xml-test.c +++ b/tests/eek-xml-test.c @@ -21,9 +21,7 @@ /* For gdk_x11_display_get_xdisplay(). See main(). */ #include -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ #include "eek/eek.h" From 633d69bacafa6693c0ee4d5e0740b2f7d2db9cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 17 Jul 2019 19:45:10 +0200 Subject: [PATCH 4/4] Drop HAVE_CLUTTER_GTK We don't use it. --- src/server-main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/server-main.c b/src/server-main.c index 2263af18..96b37acd 100644 --- a/src/server-main.c +++ b/src/server-main.c @@ -25,10 +25,6 @@ #include "config.h" -#if HAVE_CLUTTER_GTK -#include -#endif - #include "eekboard/eekboard-service.h" #include "eek/eek.h" #include "imservice.h"