Add app data and xdg autostart support

Author: wengxt

CMakeLists.txt

@@ -27,6 +27,7 @@ option(ENABLE_PRESAGE "Enable presage for word predication" Off)
 option(ENABLE_WAYLAND "Enable wayland support" On)
 option(ENABLE_DOC "Build doxygen" Off)
 option(USE_SYSTEMD "Use systemd for event loop and dbus, will fallback to libevent/libdbus if not found." On)
+option(ENABLE_XDGAUTOSTART "Enable xdg autostart desktop file installation" On)
 
 #######################################################################
 # Find packages

Messages.sh

@@ -1,31 +1,3 @@
 #!/bin/bash
-DOMAIN=$(basename $PWD)
-POT_FILE=po/$DOMAIN.pot
-set -x
-XGETTEXT="xgettext --package-name=$DOMAIN --add-comments --sort-output [email protected]"
-source_files=$(find . -name \*.cpp -o -name \*.h)
-$XGETTEXT --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --language=C++ -o ${POT_FILE} $source_files
-sh_files=$(find . -name \*.sh)
-$XGETTEXT --keyword=_ --keyword=N_ --language=Shell -j -o ${POT_FILE} $sh_files
-desktop_files=$(find . -name \*.conf.in -o -name \*.conf.in.in -o -name \*.desktop.in -o -name \*.desktop.in.in)
-$XGETTEXT --language=Desktop -k --keyword=Name --keyword=GenericName --keyword=Comment --keyword=Keywords $desktop_files -j -o ${POT_FILE}
 
-sed -i 's|^"Content-Type: text/plain; charset=CHARSET\\n"|"Content-Type: text/plain; charset=utf-8\\n"|g' ${POT_FILE}
-
-# Due to transifex problem, delete the date.
-#sed -i '/^"PO-Revision-Date/d' ${POT_FILE}
-#sed -i '/^"PO-Revision-Date/d' ${POT_FILE}
-sed -i '/^# FIRST AUTHOR/d' ${POT_FILE}
-sed -i '/^#, fuzzy/d' ${POT_FILE}
-sed -i 's|^"Language: \\n"|"Language: LANG\\n"|g' ${POT_FILE}
-
-echo > po/LINGUAS
-
-for pofile in $(ls po/*.po | sort); do
-  pofilebase=$(basename $pofile)
-  pofilebase=${pofilebase/.po/}
-  msgmerge -U --backup=none $pofile ${POT_FILE}
-  project_line=$(grep "Project-Id-Version" ${POT_FILE} | head -n 1 | tr --delete '\n' | sed -e 's/[\/&]/\\&/g')
-  sed -i "s|.*Project-Id-Version.*|$project_line|g" $pofile
-  echo $pofilebase >> po/LINGUAS
-done
+gen_pot cxx:desktop:appdata:sh fcitx5 po .

data/CMakeLists.txt

@@ -2,18 +2,26 @@ add_subdirectory(icon)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcitx5-configtool.desktop.in.in
                ${CMAKE_CURRENT_BINARY_DIR}/fcitx5-configtool.desktop.in @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcitx5.desktop.in.in
-               ${CMAKE_CURRENT_BINARY_DIR}/fcitx5.desktop.in @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.fcitx.Fcitx5.desktop.in.in
+               ${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.desktop.in @ONLY)
 
 fcitx5_translate_desktop_file(${CMAKE_CURRENT_BINARY_DIR}/fcitx5-configtool.desktop.in
                               fcitx5-configtool.desktop)
 fcitx5_translate_desktop_file(${CMAKE_CURRENT_BINARY_DIR}/fcitx5.desktop.in
-                              fcitx5.desktop)
+                              org.fcitx.Fcitx5.desktop)
+fcitx5_translate_desktop_file(org.fcitx.Fcitx5.metainfo.xml.in
+                              org.fcitx.Fcitx5.metainfo.xml XML)
 
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/fcitx5.desktop"
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.desktop"
               "${CMAKE_CURRENT_BINARY_DIR}/fcitx5-configtool.desktop"
         DESTINATION "${FCITX_INSTALL_DATADIR}/applications")
 
+if (ENABLE_XDGAUTOSTART)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.desktop" DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/xdg)
+endif()
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.metainfo.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
+
 install(FILES fcitx5-configtool.sh RENAME fcitx5-configtool DESTINATION "${FCITX_INSTALL_BINDIR}" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
 GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(FILES fcitx5-diagnose.sh RENAME fcitx5-diagnose DESTINATION "${FCITX_INSTALL_BINDIR}" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE

data/fcitx5.desktop.in.in data/org.fcitx.Fcitx5.desktop.in.in

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop">
+  <id>org.fcitx.Fcitx5.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>LGPL-2.0+</project_license>
+  <name>Fcitx 5</name>
+  <summary>Input Method</summary>
+  <description>
+    <p>
+      Fcitx is an input method framework.
+      It can help you to type your own language. It also features variant choice of addons that improve your typing experience.
+    </p>
+  </description>
+  <url type="homepage">https://fcitx-im.org/</url>
+  <url type="bugtracker">https://github.com/fcitx/fcitx5</url>
+  <url type="help">https://fcitx-im.org/wiki/Fcitx</url>
+  <screenshots>
+    <screenshot type="default">
+      <caption>Typing with Fcitx and Kimpanel</caption>
+      <image>https://fcitx-im.org/images/8/80/Fcitx-Keyboard.png</image>
+    </screenshot>
+  </screenshots>
+  <provides>
+    <binary>fcitx5</binary>
+  </provides>
+  <releases>
+    <release version="5.0.0" date="2020-10-30"/>
+  </releases>
+</component>

data/org.fcitx.Fcitx5.metainfo.xml.in

@@ -101,7 +101,7 @@ function(_fcitx5_get_unique_target_name _name _unique_name)
 endfunction()
 
 function(fcitx5_translate_desktop_file SRC DEST)
-  set(options)
+  set(options XML)
   set(one_value_args PO_DIRECTORY)
   set(multi_value_args KEYWORDS)
   cmake_parse_arguments(FCITX5_TRANSLATE
@@ -128,8 +128,14 @@ function(fcitx5_translate_desktop_file SRC DEST)
     endforeach()
   endif()
 
+  if (FCITX5_TRANSLATE_XML)
+    set(TYPE_ARG "--xml")
+  else()
+    set(TYPE_ARG "--desktop")
+  endif()
+
   add_custom_command(OUTPUT "${DEST}"
-    COMMAND "${GETTEXT_MSGFMT_EXECUTABLE}" --desktop -d ${FCITX5_TRANSLATE_PO_DIRECTORY}
+    COMMAND "${GETTEXT_MSGFMT_EXECUTABLE}" "${TYPE_ARG}" -d ${FCITX5_TRANSLATE_PO_DIRECTORY}
             ${KEYWORD_ARGS} --template "${SRC}" -o "${DEST}"
     DEPENDS "${SRC}" ${PO_FILES})
   _fcitx5_get_unique_target_name("${SRC_BASE}-fmt" uniqueTargetName)