Update CI

Add pango dependency for Wayland (adds pangocairo) Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
brndnmtthws · Apr 19, 2024 · e279109 · e279109
1 parent c1e6432
commit e279109
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/build-and-test-linux.yaml b/.github/workflows/build-and-test-linux.yaml
@@ -87,7 +87,7 @@ jobs:
             lcov \
             libaudclient-dev \
             libcairo2-dev \
-            libcurl4-gnutls-dev \
+            libpango1.0-dev \
             libcurl4-gnutls-dev \
             libdbus-glib-1-dev \
             libglib2.0-dev \
@@ -148,6 +148,7 @@ jobs:
             -DBUILD_IRC=ON                       \
             -DBUILD_JOURNAL=ON                   \
             -DBUILD_LUA_CAIRO=ON                 \
+            -DBUILD_LUA_CAIRO_XLIB=ON            \
             -DBUILD_LUA_IMLIB2=ON                \
             -DBUILD_LUA_RSVG=${RSVG_ENABLED}     \
             -DBUILD_MYSQL=ON                     \

diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
@@ -476,15 +476,19 @@ if(BUILD_WAYLAND)
   set(conky_libs ${conky_libs} ${CAIRO_LIBRARIES})
   set(conky_includes ${conky_includes} ${CAIRO_INCLUDE_DIR})
 
-  pkg_check_modules(PANGOCAIRO REQUIRED pangocairo)
+  pkg_check_modules(PANGO REQUIRED pango)
+  set(conky_libs ${conky_libs} ${PANGO_LIBRARIES})
+  set(conky_includes ${conky_includes} ${PANGO_INCLUDE_DIRS})
+
+  pkg_check_modules(PANGOCAIRO pangocairo)
   set(conky_libs ${conky_libs} ${PANGOCAIRO_LIBRARIES})
   set(conky_includes ${conky_includes} ${PANGOCAIRO_INCLUDE_DIRS})
 
-  pkg_check_modules(PANGOFC REQUIRED pangofc)
+  pkg_check_modules(PANGOFC pangofc)
   set(conky_libs ${conky_libs} ${PANGOFC_LIBRARIES})
   set(conky_includes ${conky_includes} ${PANGOFC_INCLUDE_DIRS})
 
-  pkg_check_modules(PANGOFT2 REQUIRED pangoft2)
+  pkg_check_modules(PANGOFT2 pangoft2)
   set(conky_libs ${conky_libs} ${PANGOFT2_LIBRARIES})
   set(conky_includes ${conky_includes} ${PANGOFT2_INCLUDE_DIRS})
 endif(BUILD_WAYLAND)