1From cb1dec373ec8dc5627ed3fa1e74f6eefe2a232e2 Mon Sep 17 00:00:00 2001
2From: Jeffy Chen <jeffy.chen@rock-chips.com>
3Date: Fri, 1 Jul 2022 18:15:50 +0800
4Subject: [PATCH 01/10] Fix compile error with wayland-only
5
6Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
7---
8 src/bin/e_includes.h                         | 2 ++
9 src/bin/tools/fprint/meson.build             | 1 -
10 src/modules/conf_randr/e_int_config_randr2.c | 2 ++
11 3 files changed, 4 insertions(+), 1 deletion(-)
12
13diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
14index c2b0e69a9..8d161b569 100644
15--- a/src/bin/e_includes.h
16+++ b/src/bin/e_includes.h
17@@ -151,8 +151,10 @@
18 #include "e_comp_canvas.h"
19 #include "e_utils.h"
20 #include "e_hints.h"
21+#ifndef HAVE_WAYLAND_ONLY
22 #include "e_comp_x_devices.h"
23 #include "e_comp_x_randr.h"
24+#endif
25 #include "e_watchdog.h"
26 #include "e_gesture.h"
27
28diff --git a/src/bin/tools/fprint/meson.build b/src/bin/tools/fprint/meson.build
29index 27a3b2840..405d2a16c 100644
30--- a/src/bin/tools/fprint/meson.build
31+++ b/src/bin/tools/fprint/meson.build
32@@ -16,7 +16,6 @@ efl_version = '>= 1.19.0'
33 elm  = dependency('elementary', required: true,  version: efl_version)
34 edje = dependency('edje',       required: true,  version: efl_version)
35 ecore = dependency('ecore', required: true,  version: efl_version)
36-ecorex = dependency('ecore-x', required: true,  version: efl_version)
37 depe = dependency('enlightenment', required: false)
38 #curl_dep = dependency('libcurl', version : '>= 7.35.0', required: true)
39
40diff --git a/src/modules/conf_randr/e_int_config_randr2.c b/src/modules/conf_randr/e_int_config_randr2.c
41index 9f2163b41..0712c0520 100644
42--- a/src/modules/conf_randr/e_int_config_randr2.c
43+++ b/src/modules/conf_randr/e_int_config_randr2.c
44@@ -392,9 +392,11 @@ _basic_screen_info_fill(E_Config_Dialog_Data *cfdata, E_Config_Randr2_Screen *cs
45           {
46              mode_cbdata->cfdata = cfdata;
47              mode_cbdata->mode = *m;
48+#ifndef HAVE_WAYLAND_ONLY
49              if (m->flags & ECORE_X_RANDR_MODE_DOUBLE_SCAN)
50                snprintf(buf, sizeof(buf), "%ix%i @ %1.2fHz (Doublescan)", m->w, m->h, m->refresh / 2);
51              else
52+#endif
53                snprintf(buf, sizeof(buf), "%ix%i @ %1.2fHz", m->w, m->h, m->refresh);
54              it = elm_list_item_append(cfdata->modes_obj, buf, NULL, NULL, _cb_mode_set, mode_cbdata);
55              cfdata->freelist = eina_list_append(cfdata->freelist, mode_cbdata);
56--
572.20.1
58
59