Merge pull request slgobinath#793 from slgobinath/master

New version 3.1.0

Author: archisman-panigrahi

.github/workflows/build-deb.yml

@@ -1,6 +1,8 @@
 name: Build Debian Package
 
 on:
+  pull_request:
+  push:
   release:
     types: [published]
   workflow_dispatch:
@@ -33,7 +35,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Save .deb as workflow artifact
-        if: github.event_name != 'release'
         uses: actions/upload-artifact@v4
         with:
           name: deb-package

.github/workflows/mypy.yml

@@ -33,6 +33,6 @@ jobs:
       - run: |
           sudo apt-get update
           sudo apt-get install -y libwayland-dev libcairo2-dev libgirepository-2.0-dev
-      - run: uv pip install -r pyproject.toml --extra wayland --extra x11
+      - run: uv pip install -r pyproject.toml --extra wayland
       - run: uv pip install --group types
       - run: mypy safeeyes

README.md

@@ -50,7 +50,7 @@ It is also available in Ubuntu PPA, Arch AUR and Python PyPI. You can choose any
 
 ### Ubuntu, Linux Mint and other Ubuntu Derivatives
 
-The [Official PPA for Safe Eyes](https://launchpad.net/~safeeyes-team/+archive/ubuntu/safeeyes) hosts the latest version of safeeyes **for Ubuntu 22.04 and above**. 
+The [Official PPA for Safe Eyes](https://launchpad.net/~safeeyes-team/+archive/ubuntu/safeeyes) hosts the latest (as much as allowed by dependencies) version of safeeyes **for Ubuntu 22.04 and above**. 
 ```bash
 sudo add-apt-repository ppa:safeeyes-team/safeeyes
 sudo apt update
@@ -87,7 +87,7 @@ Available on the [praiskup/safeeyes](https://copr.fedorainfracloud.org/coprs/pra
 sudo dnf -y copr enable praiskup/safeeyes
 sudo dnf -y install python3-safeeyes
 ```
-For smart pause plugin, you may have to install the latest xprintidle from: [alonid/xprintidle](https://copr.fedorainfracloud.org/coprs/alonid/xprintidle/)
+For smartpause in Wayland, install the `python3-pywayland` package (in case the installer does not automatically install it as a dependency). For smart pause plugin in X11, you may have to install the latest xprintidle from: [alonid/xprintidle](https://copr.fedorainfracloud.org/coprs/alonid/xprintidle/). 
 
 ### OpenSUSE Tumbleweed
 

debian/changelog

@@ -1,3 +1,11 @@
+safeeyes (3.1.0) noble; urgency=medium
+
+  * Ensure compatibility with older Wayland
+
+  * Made xlib a mandatory dependency so that it does not break in x11.
+
+ -- Archisman Panigrahi <[email protected]>  Sun, 21 Sep 2025 15:28:01 +0000
+
 safeeyes (3.0.1) noble; urgency=medium
 
   * bugfix release

debian/control

@@ -17,9 +17,9 @@ Depends: ${misc:Depends}, ${python3:Depends},
  python3-packaging,
  gir1.2-notify-0.7,
  gir1.2-gtk-4.0,
- ffmpeg | pipewire
+ ffmpeg | pipewire,
+ python3-xlib
 Recommends:
- python3-xlib,
  python3-pywayland
 Suggests:
  xprintidle

pyproject.toml

@@ -1,8 +1,8 @@
 [project]
 name = "safeeyes"
-version = "3.0.1"
+version = "3.1.0"
 description = "Protect your eyes from eye strain using this continuous breaks reminder."
-license = "GPL-3.0-or-later"
+license = {text = "GPL-3.0-or-later"}
 keywords = ["linux utility health eye-strain safe-eyes"]
 readme = "README.md"
 authors = [
@@ -24,20 +24,20 @@ dependencies = [
     "PyGObject",
     "babel",
     "packaging",
+    "python-xlib"
 ]
 requires-python = ">=3.10"
 
 [project.urls]
 Homepage = "https://github.com/slgobinath/SafeEyes"
-Downloads = "https://github.com/slgobinath/SafeEyes/archive/v3.0.1.tar.gz"
+Downloads = "https://github.com/slgobinath/SafeEyes/archive/v3.1.0.tar.gz"
 
 [project.scripts]
 safeeyes = "safeeyes.__main__:main"
 
 [project.optional-dependencies]
 healthstats = ["croniter"]
 wayland = ["pywayland"]
-x11 = ["python-xlib"]
 
 [build-system]
 requires = ["setuptools"]

safeeyes/glade/about_dialog.glade

@@ -64,7 +64,7 @@ along with this program.  If not, see &lt;https://www.gnu.org/licenses/&gt;.</pr
                 <property name="valign">center</property>
                 <property name="margin-top">10</property>
                 <property name="margin-bottom">10</property>
-                <property name="label">Safe Eyes 3.0.1</property>
+                <property name="label">Safe Eyes 3.1.0</property>
                 <property name="justify">center</property>
                 <property name="hexpand">1</property>
                 <property name="vexpand">1</property>

safeeyes/platform/io.github.slgobinath.SafeEyes.metainfo.xml

@@ -53,6 +53,7 @@
     <url type="homepage">https://slgobinath.github.io/SafeEyes/</url>
 
     <releases>
+        <release version="3.1.0" date="2025-09-21" />
         <release version="3.0.1" date="2025-09-11" />
         <release version="3.0.0" date="2025-08-24" />
         <release version="3.0.0~b6" date="2025-08-24" />

safeeyes/plugins/smartpause/ext_idle_notify.py

@@ -27,10 +27,25 @@
 
 from pywayland.client import Display
 from pywayland.protocol.wayland.wl_seat import WlSeat
-from pywayland.protocol.ext_idle_notify_v1 import (
-    ExtIdleNotifierV1,
-    ExtIdleNotificationV1,
-)
+
+
+if typing.TYPE_CHECKING:
+    from pywayland.protocol.ext_idle_notify_v1 import (
+        ExtIdleNotifierV1,
+        ExtIdleNotificationV1,
+    )
+
+try:
+    from pywayland.protocol.ext_idle_notify_v1 import (
+        ExtIdleNotifierV1,
+        ExtIdleNotificationV1,
+    )
+except Exception as e:
+    logging.warning("The ext_idle_notify_v1 feature is not available. Exception: %s", e)
+    logging.warning("This is likely due to an older version of Wayland.")
+    EXT_IDLE_NOTIFY_IMPORT_ERROR = True
+else:
+    EXT_IDLE_NOTIFY_IMPORT_ERROR = False
 
 from .interface import IdleMonitorInterface
 from safeeyes import utility

safeeyes/plugins/smartpause/plugin.py

@@ -159,8 +159,18 @@ def on_start() -> None:
         elif use_swayidle:
             idle_monitor = IdleMonitorSwayidle()
         elif use_ext_idle_notify:
-            from .ext_idle_notify import IdleMonitorExtIdleNotify
+            from .ext_idle_notify import (
+                IdleMonitorExtIdleNotify,
+                EXT_IDLE_NOTIFY_IMPORT_ERROR,
+            )
 
+            if EXT_IDLE_NOTIFY_IMPORT_ERROR:
+                logging.warning(
+                    "SmartPause plugin disabled:"
+                    " ext_idle_notify_v1 not available on this system."
+                )
+                idle_monitor_unsupported = True
+                return
             idle_monitor = IdleMonitorExtIdleNotify()
         else:
             idle_monitor = IdleMonitorX11()