Skip to content

Commit

Permalink
Revert to known good state
Browse files Browse the repository at this point in the history
  • Loading branch information
lainsce committed Jan 24, 2024
1 parent 7804e6c commit abd96ec
Show file tree
Hide file tree
Showing 78 changed files with 15,163 additions and 545 deletions.
67 changes: 67 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
Changes in 43.1
=================

- Close dialogs with the Escape key
- Translation updates

Changes in 43.0
=================

- Translation updates

Changes in 43.rc
=================

- Remember last app folder in the Filechooser portal
- Improve Closed signal emission in the RemoteDesktop/Screencast portal [#508]
- Translation updates

Changes in 43.beta
=================

- Don't show screenshot sharing dialog for non-interactive screenshots
- Fix restoring window screencast streams
- Translation updates

Changes in 43.alpha
=================

- Various fixes to the screencast dialog
- New Dynamic Launcher portal
- Plug various memory leaks
- Tweak wallpaper portal dialog
- Translation updates

Changes in 42.0.1
=================

- Adapt to xdg-desktop-portal screencast restore changes
- Don't send selection on remote desktop when nothing was selected
- Minor cleanups

Changes in 42.0
================

- Updated translations

Changes in 42.rc
================

- Support dark style preference
- Support virtual screen cast sources
- Redesign screencast portal window
- Implement screencast restoration
- Use libtau-desktop-4 for wallpapers
- Implement Account portal
- Implement Print portal

Changes in 41.0
================

- Use the systemd pkg-config file to find the unit directory

Changes in 41.alpha
================

- Initial release
- Port to GTK4
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# xdg-desktop-portal-tau

A backend implementation for [xdg-desktop-portal](http://github.com/flatpak/xdg-desktop-portal)
that is using GTK and various pieces of tauOS infrastructure.
that is using GTK and various pieces of GNOME infrastructure, such as the
org.tau.Shell.Screenshot or org.tau.SessionManager D-Bus interfaces.

## Building xdg-desktop-portal-tau

Expand Down
6 changes: 3 additions & 3 deletions anda.hcl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project "xdg-desktop-portal-tau" {
project "xdg-desktop-portal-tau-tau" {
rpm {
spec = "xdg-desktop-portal-tau.spec"
spec = "xdg-desktop-portal-tau-tau.spec"
}
}
}
29 changes: 8 additions & 21 deletions data/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,8 @@ libexecdir_conf = configuration_data()
libexecdir_conf.set('libexecdir', prefix / libexecdir)

# Portal
gnome_portal_interfaces = [
'org.freedesktop.impl.portal.Settings',
]
gnome_portal_conf = configuration_data()
gnome_portal_conf.set('PORTALS', ';'.join(gnome_portal_interfaces))

portal_dir = datadir / 'xdg-desktop-portal' / 'portals'
configure_file(
input: 'tau.portal.in',
output: 'tau.portal',
configuration: gnome_portal_conf,
install_dir: portal_dir,
)
install_data('tau.portal', install_dir: portal_dir)

# Service
configure_file(
Expand All @@ -27,14 +16,12 @@ configure_file(
)

# systemd unit
if systemduserunitdir != ''
configure_file(
input: 'xdg-desktop-portal-tau.service.in',
output: 'xdg-desktop-portal-tau.service',
configuration: libexecdir_conf,
install_dir: systemduserunitdir,
)
endif
configure_file(
input: 'xdg-desktop-portal-tau.service.in',
output: 'xdg-desktop-portal-tau.service',
configuration: libexecdir_conf,
install_dir: systemduserunitdir,
)

# Desktop file
desktop_in = configure_file(
Expand All @@ -47,7 +34,7 @@ i18n.merge_file(
type: 'desktop',
input: desktop_in,
output: 'xdg-desktop-portal-tau.desktop',
po_dir: meson.project_source_root() / 'po',
po_dir: meson.source_root() / 'po',
install: true,
install_dir: datadir / 'applications',
)
18 changes: 0 additions & 18 deletions data/mutter-x11-interop.xml

This file was deleted.

2 changes: 1 addition & 1 deletion data/org.freedesktop.impl.portal.desktop.tau.service.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=org.freedesktop.impl.portal.desktop.tau
Exec=@libexecdir@/xdg-desktop-portal-tau
SystemdService=xdg-desktop-portal-tau.service
SystemdService=xdg-desktop-portal-tau.service
16 changes: 0 additions & 16 deletions data/org.gnome.Mutter.ServiceChannel.xml

This file was deleted.

2 changes: 1 addition & 1 deletion data/org.gnome.Shell.Introspect.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@

<property name="version" type="u" access="read"/>
</interface>
</node>
</node>
4 changes: 4 additions & 0 deletions data/tau.portal
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[portal]
DBusName=org.freedesktop.impl.portal.desktop.tau
Interfaces=org.freedesktop.impl.portal.Settings;
UseIn=gnome
4 changes: 0 additions & 4 deletions data/tau.portal.in

This file was deleted.

6 changes: 3 additions & 3 deletions data/xdg-desktop-portal-tau.desktop.in.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=tauOS Portal
# TRANSLATORS: Don't translate this text (this is the icon name)
Name=Portal
# TRANSLATORS: Don't translate this text (this is icon name)
Icon=applications-system-symbolic
Exec=@libexecdir@/xdg-desktop-portal-tau
NoDisplay=true
NoDisplay=true
5 changes: 1 addition & 4 deletions data/xdg-desktop-portal-tau.service.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
[Unit]
Description=Portal service (tauOS implementation)
After=graphical-session.target
Requisite=graphical-session.target
PartOf=graphical-session.target

[Service]
Type=dbus
BusName=org.freedesktop.impl.portal.desktop.tau
ExecStart=@libexecdir@/xdg-desktop-portal-tau
ExecStart=@libexecdir@/xdg-desktop-portal-tau
20 changes: 7 additions & 13 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ project(
'xdg-desktop-portal-tau',
'c',
version: '1.1.14',
meson_version: '>= 0.53.0',
license: 'LGPLv2.1+'
)

Expand All @@ -10,16 +11,13 @@ datadir = get_option('datadir')
libdir = get_option('libdir')
libexecdir = get_option('libexecdir')

build_systemd_service = get_option('systemd')
systemduserunitdir = get_option('systemduserunitdir')
if systemduserunitdir == ''
systemd = dependency('systemd', version: '>= 242', required: build_systemd_service)
if build_systemd_service.allowed() and systemd.found()
systemduserunitdir = systemd.get_variable(
pkgconfig: 'systemduserunitdir',
pkgconfig_define: ['prefix', prefix]
)
endif
systemd = dependency('systemd', version: '>= 242')
systemduserunitdir = systemd.get_pkgconfig_variable(
'systemduserunitdir',
define_variable: ['prefix', get_option('prefix')]
)
endif

dbus_service_dir = get_option('dbus_service_dir')
Expand All @@ -37,9 +35,5 @@ summary({
'libdir': libdir,
'libexecdir': libexecdir,
'dbus_service_dir': dbus_service_dir,
})

summary({
'systemd-service': build_systemd_service,
'systemduserunitdir': systemduserunitdir,
}, section: 'systemd session service')
})
8 changes: 1 addition & 7 deletions meson_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@ option('dbus_service_dir',
description: 'Directory for D-Bus service files'
)

option('systemd',
type: 'feature',
value: 'auto',
description: 'Enable systemd support'
)

option('systemduserunitdir',
type: 'string',
description: 'Directory for systemd user service files'
)
)
45 changes: 45 additions & 0 deletions po/LINGUAS
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
ab
be
bg
ca
cs
da
de
el
en_GB
es
eu
fa
fi
fr
fur
gl
he
hr
hu
id
ie
is
it
ja
ka
kk
ko
lt
ne
nl
oc
pa
pl
pt
pt_BR
ro
ru
sk
sl
sr
sv
tr
uk
zh_CN
zh_TW
17 changes: 17 additions & 0 deletions po/POTFILES.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
# List of source files containing translatable strings.
data/xdg-desktop-portal-tau.desktop.in.in
src/accountdialog.c
src/accountdialog.ui
src/appchooserdialog.c
src/appchooserdialog.ui
src/background.c
src/dynamic-launcher.c
src/filechooser.c
src/remotedesktopdialog.c
src/remotedesktopdialog.ui
src/screencastdialog.ui
src/screencastwidget.c
src/screencastwidget.ui
src/screenshotdialog.c
src/screenshotdialog.ui
src/settings.c
src/wallpaperdialog.c
src/wallpaperdialog.ui
src/wallpaperpreview.ui
Loading

0 comments on commit abd96ec

Please sign in to comment.