Merge branch 'master' of https://github.com/alainm23/planify

alainm23 · Jul 30, 2024 · e11719a · e11719a
2 parents 283c066 + c1f786e
commit e11719a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,6 @@ build-aux/flatpak_build
 build-aux/.flatpak-builder
 build-aux/io.github.alainm23.planify.Devel.flatpak
 .flatpak-builder/
-subprojects/gxml
+subprojects/gxml**/
 *.snap
 planify*txt
diff --git a/data/io.github.alainm23.planify.desktop.in.in b/data/io.github.alainm23.planify.desktop.in.in
@@ -5,7 +5,7 @@ Name=Planify
 GenericName=Planify
 Comment=Never worry about forgetting things again
 Categories=Utility;Office;ProjectManagement;Calendar;
-Exec=io.github.alainm23.planify
+Exec=@exec@
 Icon=@icon@
 Terminal=false
 Type=Application

diff --git a/data/meson.build b/data/meson.build
@@ -3,6 +3,7 @@
 ###########
 
 desktop_conf = configuration_data()
+desktop_conf.set('exec', application_id)
 desktop_conf.set('icon', application_id)
 desktop_file = i18n.merge_file(
   input: configure_file(

diff --git a/subprojects/gxml-0.20.wrap b/subprojects/gxml-0.20.wrap
@@ -0,0 +1,7 @@
+[wrap-git]
+directory=gxml-0.20
+url=https://gitlab.gnome.org/GNOME/gxml.git
+revision=gxml-0.20
+
+[provide]
+gxml-0.20 = libgxml_dep
diff --git a/subprojects/gxml.wrap b/subprojects/gxml.wrap