Skip to content

Commit

Permalink
build: Get rid of libportal
Browse files Browse the repository at this point in the history
  • Loading branch information
swick authored and GeorgesStavracas committed Feb 4, 2025
1 parent c8363f8 commit 8ad6aee
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 31 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ jobs:
-Dinstalled-tests=true \
-Dpytest=enabled \
-Db_sanitize=${{ matrix.sanitizer }} \
-Db_lundef=false \
-Dforce_fallback_for=libportal
-Db_lundef=false
meson compile -C _build
- name: Run xdg-desktop-portal tests
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
__pycache__
subprojects/libportal/
3 changes: 1 addition & 2 deletions doc/building-and-running.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ replace ``[name]`` with the backend name, e.g. ``gnome`` or ``kde`` or ``wlr``):
Testing
-------

To execute the test suite present in XDG Desktop Portal, make sure you built it
with ``-Dlibportal=enabled``, and run:
To execute the test suite present in XDG Desktop Portal, run:

.. code-block:: shell
Expand Down
18 changes: 0 additions & 18 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -118,18 +118,6 @@ geoclue_dep = dependency(
version: '>= 2.5.2',
required: get_option('geoclue'),
)
libportal_dep = dependency(
'libportal',
version: '>= 0.9.0',
required: get_option('libportal'),
fallback: ['libportal', 'libportal_dep'],
default_options: [
'introspection=false',
'vapi=false',
'docs=false',
'tests=false',
],
)
pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.2.90')
libsystemd_dep = dependency('libsystemd', required: get_option('systemd'))
gudev_dep = dependency('gudev-1.0', required: get_option('gudev'))
Expand Down Expand Up @@ -160,11 +148,6 @@ if not bwrap.found()
''')
endif

have_libportal = libportal_dep.found()
if have_libportal
config_h.set('HAVE_LIBPORTAL', 1)
endif

have_geoclue = geoclue_dep.found()
if have_geoclue
config_h.set('HAVE_GEOCLUE', 1)
Expand Down Expand Up @@ -237,7 +220,6 @@ summary({
'Enable documentation': build_documentation,
'Enable libsystemd support': have_libsystemd,
'Enable geoclue support': have_geoclue,
'Enable libportal support': have_libportal,
'Enable gudev support': have_gudev,
'Enable installed tests:': enable_installed_tests,
'Enable python test suite': enable_pytest,
Expand Down
4 changes: 0 additions & 4 deletions meson_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ option('systemd-user-unit-dir',
type: 'string',
value: '',
description: 'directory for systemd user service files (default: PREFIX/lib/systemd/user)')
option('libportal',
type: 'feature',
value: 'auto',
description: 'Enable libportal support. Needed for tests')
option('geoclue',
type: 'feature',
value: 'auto',
Expand Down
4 changes: 0 additions & 4 deletions subprojects/libportal.wrap

This file was deleted.

0 comments on commit 8ad6aee

Please sign in to comment.