[PATCH 1/4] meson: Put metadata in /u/s/metainfo
Export this patch
/usr/share/appdata is a legacy location.
See https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location
---
data/meson.build | 2 + -
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/meson.build b/data/meson.build
index 60d7396..5dd7c16 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -65,7 +65,7 @@ appstream_file = i18n.merge_file(
output: 'net.kirgroup.confy.appdata.xml',
po_dir: '../po',
install: true,
- install_dir: join_paths(get_option('datadir'), 'appdata')
+ install_dir: join_paths(get_option('datadir'), 'metainfo')
)
appstream_cli = find_program('appstream-util', required: false)
--
2.29.2
[PATCH 2/4] desktop: Add Utility main category
Export this patch
See https://specifications.freedesktop.org/menu-spec/latest/apa.html
---
data/net.kirgroup.confy.desktop.in | 2 + -
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/net.kirgroup.confy.desktop.in b/data/net.kirgroup.confy.desktop.in
index c01297d..5d7cdaf 100644
--- a/data/net.kirgroup.confy.desktop.in
+++ b/data/net.kirgroup.confy.desktop.in
@@ -3,6 +3,6 @@ Name=Confy
Exec=confy
Terminal=false
Type=Application
- Categories=GTK;
+ Categories=Utility;GTK;
StartupNotify=true
Icon=net.kirgroup.confy
--
2.29.2
[PATCH 3/4] desktop: Add keywords to desktop file
Export this patch
---
data/net.kirgroup.confy.desktop.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/data/net.kirgroup.confy.desktop.in b/data/net.kirgroup.confy.desktop.in
index 5d7cdaf..d5659f9 100644
--- a/data/net.kirgroup.confy.desktop.in
+++ b/data/net.kirgroup.confy.desktop.in
@@ -6,3 +6,4 @@ Type=Application
Categories=Utility;GTK;
StartupNotify=true
Icon=net.kirgroup.confy
+ Keywords=Conference;Organize;
--
2.29.2
[PATCH 4/4] meson: install python modules in "purelib" folder
Export this patch
---
src/confy.in | 3 ++ -
src/meson.build | 7 +++++ --
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/confy.in b/src/confy.in
index d22d421..8b2fb55 100755
--- a/src/confy.in
+++ b/src/confy.in
@@ -24,9 +24,10 @@ import gettext
VERSION = '@VERSION@'
pkgdatadir = '@pkgdatadir@'
+ pythondir = '@pythondir@'
localedir = '@localedir@'
- sys.path.insert(1, pkgdatadir)
+ sys.path.insert(1, pythondir)
signal.signal(signal.SIGINT, signal.SIG_DFL)
gettext.install('confy', localedir)
diff --git a/src/meson.build b/src/meson.build
index 6277b76..a5fa534 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,5 +1,4 @@
pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
- moduledir = join_paths(pkgdatadir, 'confy')
gnome = import('gnome')
gnome.compile_resources('confy',
@@ -10,12 +9,16 @@ gnome.compile_resources('confy',
)
python = import('python')
+ python3 = python.find_installation('python3')
+ pythondir = join_paths(get_option('prefix'), python3.get_path('purelib'))
+ moduledir = join_paths(pythondir, 'confy')
conf = configuration_data()
- conf.set('PYTHON', python.find_installation('python3').path())
+ conf.set('PYTHON', python3.path())
conf.set('VERSION', meson.project_version())
conf.set('localedir', join_paths(get_option('prefix'), get_option('localedir')))
conf.set('pkgdatadir', pkgdatadir)
+ conf.set('pythondir', pythondir)
configure_file(
input: 'confy.in',
--
2.29.2
Thank yout for the patches!
I've
modified how pythondir is found in src/meson.build[0]:
instead of using "prefix" / "purelib", now it's using
'get_install_dir()'
This returns the correct path testing it with builder building for
native and also building for flatpak.
Please check if it works correctly also for you :)
_0:
https://git.sr.ht/~fabrixxm/confy/commit/6eccf13d916871bace29cfe90e8103024d33f4b1