diff --git a/checkbox-core-snap/series16/snap/snapcraft.yaml b/checkbox-core-snap/series16/snap/snapcraft.yaml index 1eaaf0854b..f8856df925 100644 --- a/checkbox-core-snap/series16/snap/snapcraft.yaml +++ b/checkbox-core-snap/series16/snap/snapcraft.yaml @@ -133,6 +133,7 @@ parts: - python3-requests-unixsocket - python3-serial - python3-setuptools + - python3-tk - python3-yaml - pyotherside - libbluetooth3 diff --git a/checkbox-core-snap/series18/snap/snapcraft.yaml b/checkbox-core-snap/series18/snap/snapcraft.yaml index 7a3d3b8c94..0e1ebb9b1d 100644 --- a/checkbox-core-snap/series18/snap/snapcraft.yaml +++ b/checkbox-core-snap/series18/snap/snapcraft.yaml @@ -129,6 +129,7 @@ parts: source-type: local stage-packages: - python3-requests-unixsocket + - python3-tk - libbluetooth3 - libsystemd0 - v4l-utils diff --git a/checkbox-core-snap/series20/snap/snapcraft.yaml b/checkbox-core-snap/series20/snap/snapcraft.yaml index 6a9ccf1aa1..20fe3b8db8 100644 --- a/checkbox-core-snap/series20/snap/snapcraft.yaml +++ b/checkbox-core-snap/series20/snap/snapcraft.yaml @@ -148,6 +148,7 @@ parts: - python3-distutils - python3-pkg-resources - python3.8-minimal + - python3-tk build-packages: - libbluetooth-dev - libsystemd-dev diff --git a/checkbox-core-snap/series22/snap/snapcraft.yaml b/checkbox-core-snap/series22/snap/snapcraft.yaml index cf44bc88fa..bc4c45bb19 100644 --- a/checkbox-core-snap/series22/snap/snapcraft.yaml +++ b/checkbox-core-snap/series22/snap/snapcraft.yaml @@ -152,6 +152,7 @@ parts: - python3-distutils - python3-pkg-resources - python3.10-minimal + - python3-tk build-packages: - libbluetooth-dev - libsystemd-dev diff --git a/checkbox-core-snap/series24/snap/snapcraft.yaml b/checkbox-core-snap/series24/snap/snapcraft.yaml index ebd6142caa..ebd718522e 100644 --- a/checkbox-core-snap/series24/snap/snapcraft.yaml +++ b/checkbox-core-snap/series24/snap/snapcraft.yaml @@ -116,6 +116,7 @@ parts: - python3-minimal - python3-pkg-resources - python3.12-minimal + - python3-tk build-packages: - libbluetooth-dev - libsystemd-dev diff --git a/providers/base/bin/resolution_test.py b/providers/base/bin/resolution_test.py index a2b52ac266..498ce193a7 100755 --- a/providers/base/bin/resolution_test.py +++ b/providers/base/bin/resolution_test.py @@ -2,6 +2,7 @@ import gi import sys +import tkinter as tk from argparse import ArgumentParser @@ -19,12 +20,16 @@ def check_resolution(): def compare_resolution(min_h, min_v): - # Evaluate just the primary display - screen = Gdk.Screen.get_default() - geom = screen.get_monitor_geometry(screen.get_primary_monitor()) + try: + root = tk.Tk() + except tk.TclError as e: + print(e) + print("Are you sure the device is logged in and has a screen?") + width = root.winfo_screenwidth() + height = root.winfo_screenheight() print("Minimum acceptable display resolution: %d x %d" % (min_h, min_v)) - print("Detected display resolution: %d x %d" % (geom.width, geom.height)) - return geom.width >= min_h and geom.height >= min_v + print("Detected display resolution: %d x %d" % (width, height)) + return width >= min_h and height >= min_v def main(): diff --git a/providers/base/units/graphics/packaging.pxu b/providers/base/units/graphics/packaging.pxu index fa2a3ab3b3..57d82d762a 100644 --- a/providers/base/units/graphics/packaging.pxu +++ b/providers/base/units/graphics/packaging.pxu @@ -6,3 +6,7 @@ Depends: gnome-randr unit: packaging meta-data os-id: debian Depends: gnome-screenshot + +unit: packaging meta-data +os-id: debian +Depends: python3-tk