Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pr/54'
Browse files Browse the repository at this point in the history
* origin/pr/54:
  ci: depend on python3-pyxdg explicitly
  debian: add explicit dependency on python3-xdg
  rpm: add explicit depenency on pyxdg
  • Loading branch information
marmarek committed Dec 17, 2024
2 parents ce4ffa0 + 745ad2c commit 0d50db0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ checks:pylint:
stage: checks
before_script:
- sudo dnf install -y python3-gobject gtk3 xorg-x11-server-Xvfb
python3-pip python3-mypy
python3-pip python3-mypy python3-pyxdg
- pip3 install --quiet -r ci/requirements.txt
- git clone https://github.com/QubesOS/qubes-core-admin-client ~/core-admin-client
script:
Expand All @@ -25,7 +25,7 @@ checks:tests:
- "PATH=$PATH:$HOME/.local/bin"
- sudo dnf install -y python3-gobject gtk3 python3-pytest python3-pytest-asyncio
python3-coverage xorg-x11-server-Xvfb python3-inotify sequoia-sqv
python3-pip
python3-pip python3-pyxdg
- pip3 install --quiet -r ci/requirements.txt
- git clone https://github.com/QubesOS/qubes-core-admin-client ~/core-admin-client
- git clone https://github.com/QubesOS/qubes-desktop-linux-manager ~/desktop-linux-manager
Expand Down
1 change: 1 addition & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Package: python3-qubes-menu
Architecture: any
Depends:
python3-qubesadmin,
python3-xdg,
${python3:Depends},
${misc:Depends}
Description: Qubes UI Applications
Expand Down
1 change: 1 addition & 0 deletions rpm_spec/qubes-desktop-linux-menu.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Requires: python%{python3_pkgversion}-setuptools
Requires: python%{python3_pkgversion}-gbulb
Requires: gtk3
Requires: python%{python3_pkgversion}-qubesadmin >= 4.1.8
Requires: python%{python3_pkgversion}-pyxdg
Requires: qubes-artwork >= 4.1.5
Requires: qubes-desktop-linux-manager
Provides: qubes_menu = %{version}-%{release}
Expand Down

0 comments on commit 0d50db0

Please sign in to comment.