Merge 0ce4eaebb7 into c43582e917

The current wayland display's clean_text function is missing
cairo_fill to actually clear the background, causing the text to overlap.

Signed-off-by: Leo Chung <gewalalb@gmail.com>

cmake/Conky.cmake

@@ -155,7 +155,7 @@ endif(OS_HAIKU)
 # Do version stuff
 set(VERSION_MAJOR "1")
 set(VERSION_MINOR "22")
-set(VERSION_PATCH "0")
+set(VERSION_PATCH "1")
 
 find_program(APP_AWK awk)
 

src/display-wayland.cc

@@ -926,6 +926,7 @@ void display_output_wayland::clear_text(int exposures) {
   cairo_set_operator(window->cr, CAIRO_OPERATOR_CLEAR);
   cairo_rectangle(window->cr, 0, 0, window->rectangle.width(),
                   window->rectangle.height());
+  cairo_fill(window->cr);
   cairo_restore(window->cr);
 }