Use cairomm and pangomm

eugmes · Oct 6, 2021 · ac0bc0b · ac0bc0b
1 parent 1c85c08
commit ac0bc0b
Show file tree

Hide file tree

Showing 3 changed files with 176 additions and 183 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,13 +21,13 @@ jobs:
           blocks: -DUNICODE_BLOCKS=/usr/share/unicode/Blocks.txt
           install_packages: >
             sudo apt update &&
-            sudo apt install cmake gettext libcairo2-dev libglib2.0-dev libfmt-dev libfreetype6-dev libpango1.0-dev ninja-build pkg-config unicode-data
+            sudo apt install cmake gettext libcairo2-dev libcairomm-1.0-dev libglib2.0-dev libfmt-dev libfreetype6-dev libpango1.0-dev libpangomm-1.4-dev ninja-build pkg-config unicode-data
         - os: macos-latest
           env:
           - CMAKE_PREFIX_PATH: /usr/local/opt/gettext
           install_packages: >
             brew update &&
-            brew install cairo cmake fmt fontconfig freetype gettext glib pango ninja pkg-config
+            brew install cairo cairomm cmake fmt fontconfig freetype gettext glib pango pangomm ninja pkg-config
 
     runs-on: ${{matrix.os}}
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,11 +27,17 @@ endif()
 
 pkg_check_modules(pkgs REQUIRED IMPORTED_TARGET
   cairo>=1.15.4
+  cairomm-1.16
+  cairomm-ft-1.16
+  cairomm-pdf-1.16
+  cairomm-ps-1.16
+  cairomm-svg-1.16
   fontconfig
   freetype2
   glib-2.0
   pangocairo>=1.37.0
   pangoft2>=1.37.0
+  pangomm-2.48
 )
 
 include(DownloadUnicodeBlocks)