Skip to content

feat(meson): build without admin dashboard #1325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(meson): build without admin dashboard #1325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
252 changes: 126 additions & 126 deletions build-aux/dev.geopjr.Tuba.Devel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
{
"app-id": "dev.geopjr.Tuba",
"runtime": "org.gnome.Platform",
"runtime-version": "47",
"sdk": "org.gnome.Sdk",
"add-extensions": {
"org.freedesktop.Platform.ffmpeg-full": {
"version": "24.08",
"directory": "lib/ffmpeg",
"add-ld-path": ".",
"no-autodownload": false,
"autodelete": false
},
"app-id": "dev.geopjr.Tuba",
"runtime": "org.gnome.Platform",
"runtime-version": "47",
"sdk": "org.gnome.Sdk",
"add-extensions": {
"org.freedesktop.Platform.ffmpeg-full": {
"version": "24.08",
"directory": "lib/ffmpeg",
"add-ld-path": ".",
"no-autodownload": false,
"autodelete": false
},
"com.github.rafostar.Clapper.Enhancers": {
"version": "stable",
"directory": "extensions/clapper/enhancers",
"add-ld-path": "lib",
"no-autodownload": false,
"autodelete": false
}
},
"sdk-extensions": [ "org.freedesktop.Sdk.Extension.llvm19" ],
"command": "dev.geopjr.Tuba",
"finish-args": [
"--device=dri",
"--share=ipc",
"--share=network",
"--socket=fallback-x11",
"--socket=wayland",
"--socket=pulseaudio",
"--own-name=org.mpris.MediaPlayer2.Tuba.*",
"version": "stable",
"directory": "extensions/clapper/enhancers",
"add-ld-path": "lib",
"no-autodownload": false,
"autodelete": false
}
},
"sdk-extensions": [ "org.freedesktop.Sdk.Extension.llvm19" ],
"command": "dev.geopjr.Tuba",
"finish-args": [
"--device=dri",
"--share=ipc",
"--share=network",
"--socket=fallback-x11",
"--socket=wayland",
"--socket=pulseaudio",
"--own-name=org.mpris.MediaPlayer2.Tuba.*",
"--env=CLAPPER_ENHANCERS_PATH=/app/extensions/clapper/enhancers/plugins",
"--env=PYTHONPATH=/app/extensions/clapper/enhancers/python/site-packages"
],
"cleanup": [
"/include",
"/lib/pkgconfig",
"/man",
"/share/doc",
"/share/gtk-doc",
"/share/man",
"/share/pkgconfig",
"/share/vala",
"*.la",
"*.a"
],
"cleanup-commands": [
"mkdir -p /app/lib/ffmpeg",
"--env=PYTHONPATH=/app/extensions/clapper/enhancers/python/site-packages"
],
"cleanup": [
"/include",
"/lib/pkgconfig",
"/man",
"/share/doc",
"/share/gtk-doc",
"/share/man",
"/share/pkgconfig",
"/share/vala",
"*.la",
"*.a"
],
"cleanup-commands": [
"mkdir -p /app/lib/ffmpeg",
"mkdir -p /app/extensions/clapper/enhancers"
],
"modules": [
],
"modules": [
{
"name": "libpeas",
"buildsystem": "meson",
Expand All @@ -70,85 +70,85 @@
}
]
},
{
"name": "clapper",
"buildsystem": "meson",
"config-opts": [
"-Dclapper=enabled",
"-Dclapper-gtk=enabled",
"-Dclapper-app=disabled",
"-Dintrospection=enabled",
"-Dvapi=enabled"
],
{
"name": "clapper",
"buildsystem": "meson",
"config-opts": [
"-Dclapper=enabled",
"-Dclapper-gtk=enabled",
"-Dclapper-app=disabled",
"-Dintrospection=enabled",
"-Dvapi=enabled"
],
"build-options": {
"arch": {
"aarch64": {
"append-path": "/usr/lib/sdk/llvm19/bin",
"prepend-ld-library-path": "/usr/lib/sdk/llvm19/lib",
"env": {
"CC": "clang"
}
}
}
},
"sources": [
{
"type": "git",
"url": "https://github.com/Rafostar/clapper.git",
"tag": "0.8.0"
}
]
},
{
"name": "libspelling",
"buildsystem": "meson",
"config-opts": [
"-Ddocs=false"
],
"build-options": {
"arch": {
"aarch64": {
"append-path": "/usr/lib/sdk/llvm19/bin",
"prepend-ld-library-path": "/usr/lib/sdk/llvm19/lib",
"env": {
"CC": "clang"
}
}
}
},
"sources": [
{
"type": "git",
"url": "https://github.com/Rafostar/clapper.git",
"tag": "0.8.0"
}
]
},
{
"name": "libspelling",
"buildsystem": "meson",
"config-opts": [
"-Ddocs=false"
],
"arch": {
"aarch64": {
"append-path": "/usr/lib/sdk/llvm19/bin",
"prepend-ld-library-path": "/usr/lib/sdk/llvm19/lib",
"env": {
"CC": "clang"
}
}
}
},
"sources": [
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/libspelling.git",
"tag": "0.4.5"
}
]
},
{
"name": "tuba",
"builddir": true,
"buildsystem": "meson",
"config-opts": [
"-Ddevel=true",
"-Dclapper=true"
],
"build-options": {
"arch": {
"aarch64": {
"append-path": "/usr/lib/sdk/llvm19/bin",
"prepend-ld-library-path": "/usr/lib/sdk/llvm19/lib",
"env": {
"CC": "clang"
}
}
}
},
"sources": [
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/libspelling.git",
"tag": "0.4.5"
}
]
},
{
"name": "tuba",
"builddir": true,
"buildsystem": "meson",
"config-opts": [
"-Ddevel=true",
"-Dclapper=true"
],
"build-options": {
"arch": {
"aarch64": {
"append-path": "/usr/lib/sdk/llvm19/bin",
"prepend-ld-library-path": "/usr/lib/sdk/llvm19/lib",
"env": {
"CC": "clang"
}
}
}
},
"sources": [
{
"type": "dir",
"path": "../"
}
]
}
]
"arch": {
"aarch64": {
"append-path": "/usr/lib/sdk/llvm19/bin",
"prepend-ld-library-path": "/usr/lib/sdk/llvm19/lib",
"env": {
"CC": "clang"
}
}
}
},
"sources": [
{
"type": "dir",
"path": "../"
}
]
}
]
}
16 changes: 8 additions & 8 deletions data/dev.geopjr.Tuba.gschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<key name="reply-to-old-post-reminder" type="b">
<default>true</default>
</key>
<key name="copy-private-link-reminder" type="b">
<key name="copy-private-link-reminder" type="b">
<default>true</default>
</key>
<key name="spellchecker-enabled" type="b">
Expand All @@ -112,25 +112,25 @@
<key name="proxy" type="s">
<default>''</default>
</key>
<key name="analytics" type="b">
<key name="analytics" type="b">
<default>false</default>
</key>
<key name="update-contributors" type="b">
<key name="update-contributors" type="b">
<default>false</default>
</key>
<key name="last-analytics-update" type="s">
<key name="last-analytics-update" type="s">
<default>''</default>
</key>
<key name="last-contributors-update" type="s">
<key name="last-contributors-update" type="s">
<default>''</default>
</key>
<key name="contributors" type="as">
<key name="contributors" type="as">
<default>['1021928818','2964685538','2486375860','3456423266','1352322503','445941323','3177176442','2813905310','2386917030','987913018','1837154139','4173902237','4223975552','3163563143','3320460562','4233664772','136476033','4041964504','3998595277','580879396']</default>
</key>
<key name="status-aria-verbosity" type="i">
<key name="status-aria-verbosity" type="i">
<default>3</default>
</key>
<key name="use-in-app-browser-if-available" type="b">
<key name="use-in-app-browser-if-available" type="b">
<default>true</default>
</key>

Expand Down
2 changes: 1 addition & 1 deletion data/ui/dialogs/new_account.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<signal name="entry_activated" handler="on_next_clicked" swapped="no"/>
<signal name="changed" handler="clear_errors" swapped="no"/>
<child type="suffix">
<object class="GtkButton">
<object class="GtkButton" id="settings_button">
<property name="icon-name">tuba-settings-symbolic</property>
<property name="valign">center</property>
<!-- translators: tooltip text for a button in the 'new account' window -->
Expand Down
5 changes: 5 additions & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ endif

devel = get_option('devel')
distro = get_option('distro')
without_admin_dashboard = get_option('without-admin-dashboard')

# Setup configuration file
config = configuration_data()
Expand Down Expand Up @@ -53,6 +54,10 @@ if devmode
add_project_arguments(['--define=DEV_MODE'], language: 'vala')
endif

if not without_admin_dashboard
add_project_arguments(['--define=ADMIN_DASHBOARD'], language: 'vala')
endif

if host_machine.system() == 'windows'
add_project_arguments(['--define=WINDOWS'], language: 'vala')
elif host_machine.system() == 'darwin'
Expand Down
3 changes: 3 additions & 0 deletions meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ option('devel', type: 'boolean', value: false)
option('distro', type: 'boolean', value: false)
option('clapper', type: 'boolean', value: true)
option('in-app-browser', type: 'boolean', value: true)

# Distros shouldn't enable this.
option('without-admin-dashboard', type: 'boolean', value: false)
16 changes: 10 additions & 6 deletions src/API/Notification.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,17 @@ public class Tuba.API.Notification : Entity, Widgetizable {
break;
case InstanceAccount.KIND_ADMIN_REPORT:
if (report != null) {
if (accounts.active.admin_mode) {
var admin_window = new Dialogs.Admin.Window ();
admin_window.present ();
admin_window.open_reports ();
} else {
#if ADMIN_DASHBOARD
if (accounts.active.admin_mode) {
var admin_window = new Dialogs.Admin.Window ();
admin_window.present ();
admin_window.open_reports ();
} else {
#endif
Host.open_url.begin (@"$(accounts.active.instance)/admin/reports/$(report.id)");
}
#if ADMIN_DASHBOARD
}
#endif
}
break;
case InstanceAccount.KIND_ANNUAL_REPORT:
Expand Down
13 changes: 9 additions & 4 deletions src/Application.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@ namespace Tuba {
{ "open-mutes-blocks", open_mutes_blocks },
{ "open-scheduled-posts", open_scheduled_posts },
{ "open-draft-posts", open_draft_posts },
{ "open-admin-dashboard", open_admin_dashboard },
#if ADMIN_DASHBOARD
// vala-lint=block-opening-brace-space-before
{ "open-admin-dashboard", open_admin_dashboard },
#endif // vala-lint=block-opening-brace-space-before
{ "open-last-fediwrapped", open_last_fediwrapped }
};

Expand Down Expand Up @@ -543,9 +546,11 @@ namespace Tuba {
close_sidebar ();
}

public void open_admin_dashboard () {
new Dialogs.Admin.Window ().present ();
}
#if ADMIN_DASHBOARD
public void open_admin_dashboard () {
new Dialogs.Admin.Window ().present ();
}
#endif

public void open_last_fediwrapped () {
accounts.active.open_latest_wrapped ();
Expand Down
Loading
Loading