From 1420cfc7240b879d0dd69c615ad4e0f3bb28cd75 Mon Sep 17 00:00:00 2001 From: deltragon Date: Fri, 4 Oct 2024 19:48:31 +0200 Subject: [PATCH 1/3] remove dbus-python (unused since 2.2.2) --- io.github.slgobinath.SafeEyes.yaml | 3 +-- modules/dbus-python.yml | 10 ---------- modules/python3-requirements.yml | 4 ++-- 3 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 modules/dbus-python.yml diff --git a/io.github.slgobinath.SafeEyes.yaml b/io.github.slgobinath.SafeEyes.yaml index 0a4d847..0cb39a2 100644 --- a/io.github.slgobinath.SafeEyes.yaml +++ b/io.github.slgobinath.SafeEyes.yaml @@ -36,10 +36,9 @@ modules: - shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json # app indicator support - shared-modules/libappindicator/libappindicator-gtk3-12.10.json - # alsa-utils, dbus-python, libnotify, xprop -> anitya configured. + # alsa-utils, libnotify, xprop -> anitya configured. # wlrctl, xprintidle -> manual checks - modules/python3-requirements.yml # auto generated pip dependencies for safeeyes - - modules/dbus-python.yml # dbus - for tray - modules/xprop.yml # required for 'xorg do not disturb' plugin - modules/wlrctl.yml # required for 'wayland do not disturb' plugin (x86_64 only) - modules/alsa-utils.yml # required for 'audible alert' plugin diff --git a/modules/dbus-python.yml b/modules/dbus-python.yml deleted file mode 100644 index 93234d4..0000000 --- a/modules/dbus-python.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: dbus-python -buildsystem: autotools -sources: - - type: archive - url: "https://dbus.freedesktop.org/releases/dbus-python/dbus-python-1.3.2.tar.gz" - sha256: ad67819308618b5069537be237f8e68ca1c7fcc95ee4a121fe6845b1418248f8 - x-checker-data: - project-id: 402 - type: anitya - url-template: https://dbus.freedesktop.org/releases/dbus-python/dbus-python-$version.tar.gz \ No newline at end of file diff --git a/modules/python3-requirements.yml b/modules/python3-requirements.yml index bd4da5e..638e6d6 100644 --- a/modules/python3-requirements.yml +++ b/modules/python3-requirements.yml @@ -1,7 +1,7 @@ # To create this file use 'requires' in setup to generate requirements.txt file -> https://github.com/slgobinath/SafeEyes/blob/13bf3e8f0226b58497f9184ddc42dbdaa4a5f14b/setup.py#L6 -# do not add dbus-python and add --no-deps for safeeyes package +# add --no-deps for safeeyes package # order would be: -# meson-python -> pycairo -> other dependencies excluding dbus-python -> safeeyes (--no-deps) +# meson-python -> pycairo -> other dependencies -> safeeyes (--no-deps) # * remember to remove repeating packages for cleaner view # Generated with flatpak-pip-generator --yaml --checker-data --requirements-file=requirements.txt --output python3-requirements --runtime=org.freedesktop.Sdk//23.08 build-commands: [] From dd33499fa8b91ba9e6bfc007549f749b23eebc89 Mon Sep 17 00:00:00 2001 From: deltragon Date: Mon, 7 Oct 2024 11:51:25 +0200 Subject: [PATCH 2/3] remove libappindicator (unused since 2.2.2) --- io.github.slgobinath.SafeEyes.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/io.github.slgobinath.SafeEyes.yaml b/io.github.slgobinath.SafeEyes.yaml index 0cb39a2..05f3396 100644 --- a/io.github.slgobinath.SafeEyes.yaml +++ b/io.github.slgobinath.SafeEyes.yaml @@ -33,9 +33,6 @@ cleanup: - /lib/*.la modules: - - shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json # app indicator support - - shared-modules/libappindicator/libappindicator-gtk3-12.10.json - # alsa-utils, libnotify, xprop -> anitya configured. # wlrctl, xprintidle -> manual checks - modules/python3-requirements.yml # auto generated pip dependencies for safeeyes From 12b23346f38a27e99b8cc6b5e49cac8ca3f3ba01 Mon Sep 17 00:00:00 2001 From: deltragon Date: Mon, 7 Oct 2024 11:57:46 +0200 Subject: [PATCH 3/3] update runtime to 24.08; remove runtime provided packages --- README.md | 2 +- io.github.slgobinath.SafeEyes.yaml | 13 ++++--- modules/libnotify.yml | 15 -------- modules/python3-requirements.yml | 58 +++--------------------------- 4 files changed, 11 insertions(+), 77 deletions(-) delete mode 100644 modules/libnotify.yml diff --git a/README.md b/README.md index c42e8ed..50d6215 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ git clone --recursive https://github.com/flathub/io.github.slgobinath.SafeEyes & # install flatpak and flatpak-builder then add flathub sudo apt install flatpak flatpak-builder && flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo # install flatpak runtime -flatpak install -y org.freedesktop.Sdk/x86_64/23.08 +flatpak install -y org.freedesktop.Sdk/x86_64/24.08 # build flatpak-builder --user --install --force-clean build-dir io.github.slgobinath.SafeEyes.yaml ``` diff --git a/io.github.slgobinath.SafeEyes.yaml b/io.github.slgobinath.SafeEyes.yaml index 05f3396..95de7bd 100644 --- a/io.github.slgobinath.SafeEyes.yaml +++ b/io.github.slgobinath.SafeEyes.yaml @@ -1,7 +1,7 @@ id: io.github.slgobinath.SafeEyes sdk: org.freedesktop.Sdk runtime: org.freedesktop.Platform -runtime-version: "23.08" +runtime-version: "24.08" command: safeeyes finish-args: @@ -33,19 +33,18 @@ cleanup: - /lib/*.la modules: - # alsa-utils, libnotify, xprop -> anitya configured. + # alsa-utils, xprop -> anitya configured. # wlrctl, xprintidle -> manual checks - - modules/python3-requirements.yml # auto generated pip dependencies for safeeyes - modules/xprop.yml # required for 'xorg do not disturb' plugin - modules/wlrctl.yml # required for 'wayland do not disturb' plugin (x86_64 only) - modules/alsa-utils.yml # required for 'audible alert' plugin - - modules/libnotify.yml # notification support - modules/xprintidle.yml # idle detection other than gnome + - modules/python3-requirements.yml # auto generated pip dependencies for safeeyes - name: safeeyes buildsystem: simple build-commands: - - cp -r /app/lib/python3.11/site-packages/safeeyes/platform/icons/ /app/share/icons/ - - install -Dm644 /app/lib/python3.11/site-packages/safeeyes/platform/io.github.slgobinath.SafeEyes.desktop /app/share/applications/io.github.slgobinath.SafeEyes.desktop - - install -Dm644 /app/lib/python3.11/site-packages/safeeyes/platform/io.github.slgobinath.SafeEyes.metainfo.xml /app/share/metainfo/io.github.slgobinath.SafeEyes.metainfo.xml + - cp -r /app/lib/python3.12/site-packages/safeeyes/platform/icons/ /app/share/icons/ + - install -Dm644 /app/lib/python3.12/site-packages/safeeyes/platform/io.github.slgobinath.SafeEyes.desktop /app/share/applications/io.github.slgobinath.SafeEyes.desktop + - install -Dm644 /app/lib/python3.12/site-packages/safeeyes/platform/io.github.slgobinath.SafeEyes.metainfo.xml /app/share/metainfo/io.github.slgobinath.SafeEyes.metainfo.xml - desktop-file-edit --set-key=Exec --set-value=safeeyes /app/share/applications/io.github.slgobinath.SafeEyes.desktop diff --git a/modules/libnotify.yml b/modules/libnotify.yml deleted file mode 100644 index 8c75361..0000000 --- a/modules/libnotify.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: libnotify -buildsystem: meson -config-opts: - - -Dman=false - - -Dtests=false - - -Dgtk_doc=false - - -Ddocbook_docs=disabled -sources: - - type: archive - url: https://download.gnome.org/sources/libnotify/0.8/libnotify-0.8.3.tar.xz - sha256: ee8f3ef946156ad3406fdf45feedbdcd932dbd211ab4f16f75eba4f36fb2f6c0 - x-checker-data: - project-id: 13149 - type: anitya - url-template: https://download.gnome.org/sources/libnotify/$major.$minor/libnotify-$version.tar.xz diff --git a/modules/python3-requirements.yml b/modules/python3-requirements.yml index 638e6d6..213e87e 100644 --- a/modules/python3-requirements.yml +++ b/modules/python3-requirements.yml @@ -1,51 +1,13 @@ -# To create this file use 'requires' in setup to generate requirements.txt file -> https://github.com/slgobinath/SafeEyes/blob/13bf3e8f0226b58497f9184ddc42dbdaa4a5f14b/setup.py#L6 +# To create this file use 'requires' in setup to generate requirements.txt file -> https://github.com/slgobinath/SafeEyes/blob/v2.2.2/setup.py#L6 # add --no-deps for safeeyes package # order would be: -# meson-python -> pycairo -> other dependencies -> safeeyes (--no-deps) +# dependencies -> safeeyes (--no-deps) # * remember to remove repeating packages for cleaner view -# Generated with flatpak-pip-generator --yaml --checker-data --requirements-file=requirements.txt --output python3-requirements --runtime=org.freedesktop.Sdk//23.08 +# * remove runtime-provided packages like PyGObject and packaging +# Generated with flatpak-pip-generator --yaml --checker-data --requirements-file=requirements.txt --output python3-requirements --runtime=org.freedesktop.Sdk//24.08 build-commands: [] buildsystem: simple modules: - - name: python3-meson-python - buildsystem: simple - build-commands: - - pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}" - --prefix=${FLATPAK_DEST} "meson-python" --no-build-isolation - sources: - - type: file - url: https://files.pythonhosted.org/packages/91/c0/104cb6244c83fe6bc3886f144cc433db0c0c78efac5dc00e409a5a08c87d/meson_python-0.16.0-py3-none-any.whl - sha256: 842dc9f5dc29e55fc769ff1b6fe328412fe6c870220fc321060a1d2d395e69e8 - x-checker-data: - name: meson_python - packagetype: bdist_wheel - type: pypi - - type: file - url: https://files.pythonhosted.org/packages/08/aa/cc0199a5f0ad350994d660967a8efb233fe0416e4639146c089643407ce6/packaging-24.1-py3-none-any.whl - sha256: 5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124 - x-checker-data: - name: packaging - packagetype: bdist_wheel - type: pypi - - type: file - url: https://files.pythonhosted.org/packages/aa/5f/bb5970d3d04173b46c9037109f7f05fc8904ff5be073ee49bb6ff00301bc/pyproject_metadata-0.8.0-py3-none-any.whl - sha256: ad858d448e1d3a1fb408ac5bac9ea7743e7a8bbb472f2693aaa334d2db42f526 - x-checker-data: - name: pyproject_metadata - packagetype: bdist_wheel - type: pypi - - name: python3-pycairo - buildsystem: simple - build-commands: - - pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}" - --prefix=${FLATPAK_DEST} "pycairo" --no-build-isolation - sources: - - type: file - url: https://files.pythonhosted.org/packages/07/4a/42b26390181a7517718600fa7d98b951da20be982a50cd4afb3d46c2e603/pycairo-1.27.0.tar.gz - sha256: 5cb21e7a00a2afcafea7f14390235be33497a2cce53a98a19389492a60628430 - x-checker-data: - name: pycairo - type: pypi - name: python3-babel buildsystem: simple build-commands: @@ -98,18 +60,6 @@ modules: name: pytz packagetype: bdist_wheel type: pypi - - name: python3-PyGObject - buildsystem: simple - build-commands: - - pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}" - --prefix=${FLATPAK_DEST} "PyGObject" --no-build-isolation - sources: - - type: file - url: https://files.pythonhosted.org/packages/2b/58/d34e67a79631177e3c08e7d02b5165147f590171f2cae6769502af5f7f7e/pygobject-3.50.0.tar.gz - sha256: 4500ad3dbf331773d8dedf7212544c999a76fc96b63a91b3dcac1e5925a1d103 - x-checker-data: - name: pygobject - type: pypi - name: python3-python-xlib buildsystem: simple build-commands: