flatpak: automatically add <release> tag to LinGui appdata

Also add translation support for appdata

diff --git a/gtk/configure.ac b/gtk/configure.ac
index 3d4cd4879c4a9d8b9fa69883dbf9c49cb899f62c..54a63d488f31220bf54a5f0cd616a44b470b5a72 100644 (file)
--- a/gtk/configure.ac
+++ b/gtk/configure.ac
@@ -121,6 +121,7 @@ esac
 PKG_PROG_PKG_CONFIG
 
 #PKG_CHECK_MODULES([GHB_GTK_4_0], [gtk+-4.0 >= 3.92], [HAVE_GTK_400=1], [HAVE_GTK_400=0])
+HAVE_GTK_400=0
 PKG_CHECK_MODULES([GHB_GTK_3_16], [gtk+-3.0 >= 3.16], [HAVE_GTK_316=1], [HAVE_GTK_316=0])
 PKG_CHECK_MODULES([GHB_GTK_3_14], [gtk+-3.0 >= 3.14], [HAVE_GTK_314=1], [HAVE_GTK_314=0])
 PKG_CHECK_MODULES([GHB_GTK_3_12], [gtk+-3.0 >= 3.12], [HAVE_GTK_312=1], [HAVE_GTK_312=0])

diff --git a/gtk/module.defs b/gtk/module.defs
index bef536d22e485b391aaa670017d6d8df09b291a3..28b5ee38a8087036a48093b98b9d4298708e73df 100644 (file)
--- a/gtk/module.defs
+++ b/gtk/module.defs
@@ -47,3 +47,5 @@ endif
 ifeq (1,$(FEATURE.flatpak))
        GTK.CONFIGURE.extra += --enable-flatpak
 endif
+
+export HB.version HB.repo.date

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 2a610361caf94768f9cedbe352faece9cec84038..a7b8c72366ece01979c20cab936a2b97f86ac78e 100644 (file)
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -38,11 +38,21 @@ icons_dep = \
 if GHB_FLATPAK
 icons += fr.handbrake.ghb.svg
 hb_menu = fr.handbrake.ghb.desktop
-flatpak_appdata = fr.handbrake.ghb.appdata.xml
 else
 hb_menu = ghb.desktop
 endif
 
+@INTLTOOL_XML_RULE@
+appdatadir = $(datarootdir)/metainfo
+appdata_in_files = fr.handbrake.ghb.appdata.xml.in
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+dist_appdata_DATA = $(appdata_files)
+
+EXTRA_DIST = \
+       $(appdata_in_files)
+
+DISTCLEANFILES = \
+       $(appdata_files)
 
 AM_CPPFLAGS = \
        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@@ -167,6 +177,9 @@ widget_reverse.deps: makedeps.py
 widget.deps: makedeps.py
        python2 $(srcdir)/makedeps.py
 
+fr.handbrake.ghb.appdata.xml.in: fr.handbrake.ghb.appdata.xml.template
+       sed -e 's^RELEASE_TAG^<release version="$(HB.version)" date="$(word 1,$(HB.repo.date))" />^' $< > $@
+
 ghbcellrenderertext.$(OBJEXT): marshalers.h
 
 $(srcdir)/marshalers.h: marshalers.list
@@ -189,9 +202,6 @@ uninstall-local:
                echo "***   $(gtk_update_icon_cache)"; \
        fi
        rm -f $(DESTDIR)/$(datadir)/applications/$(hb_menu)
-       @-if test -n "$(flatpak_appdata)"; then \
-               rm -f $(DESTDIR)/$(datadir)/metainfo/$(flatpak_appdata); \
-       fi
 
 install-data-local:
        for icon in $(icons); do \
@@ -207,7 +217,3 @@ install-data-local:
        fi
        mkdir -p $(DESTDIR)/$(datadir)/applications/; \
        $(INSTALL_DATA) $(srcdir)/$(hb_menu) $(DESTDIR)/$(datadir)/applications/$(hb_menu)
-       @-if test -n "$(flatpak_appdata)"; then \
-               mkdir -p $(DESTDIR)/$(datadir)/metainfo/; \
-               $(INSTALL_DATA) $(srcdir)/$(flatpak_appdata) $(DESTDIR)/$(datadir)/metainfo/$(flatpak_appdata); \
-       fi

diff --git a/gtk/src/fr.handbrake.ghb.appdata.xml.template b/gtk/src/fr.handbrake.ghb.appdata.xml.template
index ab79a049441c60b4a7d804056969dcd6ad276645..5dc88d033fbb907b1cf4fef258ba11cc8653998d 100644 (file)
--- a/gtk/src/fr.handbrake.ghb.appdata.xml.template
+++ b/gtk/src/fr.handbrake.ghb.appdata.xml.template
@@ -2,22 +2,21 @@
 <!-- Copyright 2018 John Stebbins <your@email.com> -->
 <component type="desktop-application">
   <id>fr.handbrake.ghb</id>
+  <translation>ghb</translation>
+  <update_contact>jstebbins.hb_AT_gmail.com</update_contact>
   <launchable type="desktop-id">fr.handbrake.ghb.desktop</launchable>
-  <metadata_license>CC0</metadata_license>
+  <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
-  <name>HandBrake</name>
-  <summary>Video Transcoder</summary>
+  <_name>HandBrake</_name>
+  <_summary>Video Transcoder</_summary>
 
   <description>
-    <p>
-      HandBrake is a tool for converting video from nearly any format to a
-      selection of modern, widely supported codecs.
-    </p>
-    <p>Reasons you'll love Handbrake:</p>
+    <_p>HandBrake is a tool for converting video from nearly any format to a selection of modern, widely supported codecs.</_p>
+    <_p>Reasons you'll love Handbrake:</_p>
     <ul>
-      <li>Convert video from nearly any format</li>
-      <li>Free and Open Source</li>
-      <li>Multi-Platform (Windows, Mac and Linux)</li>
+      <_li>Convert video from nearly any format</_li>
+      <_li>Free and Open Source</_li>
+      <_li>Multi-Platform (Windows, Mac and Linux)</_li>
     </ul>
   </description>
 
@@ -60,15 +59,15 @@
   <screenshots>
     <screenshot type="default">
       <image>https://handbrake.fr/img/slides/slide1_lin.jpg</image>
-      <caption>Main window and settings summary</caption>
+      <_caption>Main window and settings summary</_caption>
     </screenshot>
     <screenshot>
       <image>https://handbrake.fr/img/slides/slide2_lin.jpg</image>
-      <caption>Video encoder settings</caption>
+      <_caption>Video encoder settings</_caption>
     </screenshot>
     <screenshot>
       <image>https://handbrake.fr/img/slides/slide3_lin.jpg</image>
-      <caption>Audio track selection and settings</caption>
+      <_caption>Audio track selection and settings</_caption>
     </screenshot>
   </screenshots>
 
@@ -76,5 +75,9 @@
     <binary>ghb</binary>
   </provides>
 
+  <releases>
+    RELEASE_TAG
+  </releases>
+
 </component>