#4235 make it possible to call without cairo / pango installed

Xpra-org · May 21, 2024 · ead682a · ead682a
1 parent aadcc3a
commit ead682a
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/xpra/gtk/versions.py b/xpra/gtk/versions.py
@@ -52,8 +52,14 @@ def MAJORMICROMINOR(name, module):
 
     MAJORMICROMINOR("gtk", gi_import("Gtk"))
     MAJORMICROMINOR("glib", gi_import("GLib"))
-    import cairo
-    av("cairo", parse_version(cairo.version_info))  # pylint: disable=no-member
-    pango = gi_import("Pango")
-    av("pango", parse_version(pango.version_string()))
+    try:
+        import cairo
+        av("cairo", parse_version(cairo.version_info))  # pylint: disable=no-member
+    except ImportError:
+        pass
+    try:
+        pango = gi_import("Pango")
+        av("pango", parse_version(pango.version_string()))
+    except ImportError:
+        pass
     return GTK_VERSION_INFO.copy()