diff --git a/.vscode/settings.json b/.vscode/settings.json index 440d07b..b16afe0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,5 @@ { - "C_Cpp.default.compileCommands": "builddir/vscode_compile_commands.json", + "C_Cpp.default.compileCommands": "_build/vscode_compile_commands.json", "files.watcherExclude": { "**/.dart_tool": true, ".flatpak/**": true, diff --git a/build-aux/com.lemmygtk.lemoa.Devel.json b/build-aux/com.lemmygtk.lemoa.Devel.json index 977eb9e..1a39896 100644 --- a/build-aux/com.lemmygtk.lemoa.Devel.json +++ b/build-aux/com.lemmygtk.lemoa.Devel.json @@ -10,9 +10,10 @@ "command": "lemoa", "finish-args": [ "--share=ipc", + "--share=network", + "--device=dri", "--socket=fallback-x11", "--socket=wayland", - "--device=dri", "--env=RUST_LOG=lemoa=debug", "--env=G_MESSAGES_DEBUG=none", "--env=RUST_BACKTRACE=1" @@ -40,7 +41,7 @@ "buildsystem": "meson", "builddir": true, "config-opts": [ - "-Dprofile=development" + "-Dprofile=default" ], "sources": [ { diff --git a/data/com.lemmygtk.lemoa.gschema.xml.in b/data/com.lemmygtk.lemoa.gschema.xml.in new file mode 100644 index 0000000..0f5545e --- /dev/null +++ b/data/com.lemmygtk.lemoa.gschema.xml.in @@ -0,0 +1,5 @@ + + + + + diff --git a/data/com.lemmygtk.lemoa.metainfo.xml.in b/data/com.lemmygtk.lemoa.metainfo.xml.in new file mode 100644 index 0000000..7a8b692 --- /dev/null +++ b/data/com.lemmygtk.lemoa.metainfo.xml.in @@ -0,0 +1,45 @@ + + + @BASE_ID@ + CC0 + GPL-3.0 + @NAME@ + Gtk client for Lemmy + +

A native Gtk client for the Lemmyverse

+
+ + + https://raw.githubusercontent.com/lemmy-gtk/lemoa/main/data/screenshots/posts.png + Posts view + + + https://raw.githubusercontent.com/lemmy-gtk/lemoa/main/data/screenshots/community.png + Community view + + + https://github.com/lemmy-gtk/lemoa + https://github.com/lemmy-gtk/lemoa/issues + + + + +
    +
  • Initial release
  • +
+
+
+
+ + + ModernToolkit + HiDpiIcon + + Bnyro + bnyro@tutanota.com + @app-id@.desktop + GTK 4 +
diff --git a/data/com.lemmygtk.lemoa-symbolic.svg b/data/icons/com.lemmygtk.lemoa-symbolic.svg similarity index 100% rename from data/com.lemmygtk.lemoa-symbolic.svg rename to data/icons/com.lemmygtk.lemoa-symbolic.svg diff --git a/data/com.lemmygtk.lemoa.svg b/data/icons/com.lemmygtk.lemoa.svg similarity index 100% rename from data/com.lemmygtk.lemoa.svg rename to data/icons/com.lemmygtk.lemoa.svg diff --git a/data/icons/meson.build b/data/icons/meson.build new file mode 100644 index 0000000..5d5027f --- /dev/null +++ b/data/icons/meson.build @@ -0,0 +1,13 @@ +# Scalable icon +install_data( + '@0@.svg'.format(base_id), + install_dir: iconsdir / 'hicolor' / 'scalable' / 'apps', + rename: '@0@.svg'.format(application_id) +) + +# Symbolic icon +install_data( + '@0@-symbolic.svg'.format(base_id), + install_dir: iconsdir / 'hicolor' / 'symbolic' / 'apps', + rename: '@0@-symbolic.svg'.format(application_id) +) diff --git a/data/meson.build b/data/meson.build index 88fde1e..ebbd145 100644 --- a/data/meson.build +++ b/data/meson.build @@ -2,6 +2,7 @@ desktop_conf = configuration_data() desktop_conf.set('NAME', meson.project_name()) desktop_conf.set('ICON', application_id) desktop_conf.set('APP_ID', application_id) +desktop_conf.set('BASE_ID', base_id) desktop_conf.set('EXEC', meson.project_name()) # Desktop file @@ -10,19 +11,24 @@ configure_file( output: '@BASENAME@', install: true, configuration: desktop_conf, - install_dir: applicationsdir + install_dir: metainfodir ) -# Scalable icon -install_data( - '@0@.svg'.format(base_id), - install_dir: iconsdir / 'hicolor' / 'scalable' / 'apps', - rename: '@0@.svg'.format(application_id) +# Metainfo file +configure_file( + input: '@0@.metainfo.xml.in'.format(base_id), + output: '@BASENAME@', + install: true, + configuration: desktop_conf, + install_dir: metainfodir ) -# Symbolic icon -install_data( - '@0@-symbolic.svg'.format(base_id), - install_dir: iconsdir / 'hicolor' / 'symbolic' / 'apps', - rename: '@0@-symbolic.svg'.format(application_id) +configure_file( + input: '@0@.gschema.xml.in'.format(base_id), + output: '@0@.gschema.xml'.format(application_id), + configuration: desktop_conf, + install: true, + install_dir: datadir / 'glib-2.0' / 'schemas' ) + +subdir('icons') diff --git a/meson.build b/meson.build index b385931..5b9366f 100644 --- a/meson.build +++ b/meson.build @@ -28,6 +28,7 @@ bindir = prefix / get_option('bindir') datadir = prefix / get_option('datadir') iconsdir = datadir / 'icons' applicationsdir = datadir / 'applications' +metainfodir = datadir / 'metainfo' pkgdatadir = datadir / meson.project_name() # Add a version suffix for devel builds diff --git a/src/config.rs b/src/config.rs index ec1efe1..c56c81b 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,4 +1,4 @@ pub const NAME: &str = "lemoa"; -pub const APP_ID: &str = "com.lemmygtk.lemoa.Devel"; +pub const APP_ID: &str = "com.lemmygtk.lemoa"; pub const PKGDATADIR: &str = "/app/share/lemoa"; -pub const VERSION: &str = "0.1.0-8e019361"; +pub const VERSION: &str = "0.1.0"; diff --git a/src/meson.build b/src/meson.build index c74c0eb..b2897cf 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,6 +1,6 @@ # Configuration file conf = configuration_data() -conf.set_quoted('NAME', meson.projet_name()) +conf.set_quoted('NAME', meson.project_name()) conf.set_quoted('APP_ID', application_id) conf.set_quoted('PKGDATADIR', pkgdatadir) conf.set_quoted('VERSION', version + version_suffix)