From 186c98308e12d35fd3688b78268c64d613a83a91 Mon Sep 17 00:00:00 2001
From: wangqr <wangqr@wangqr.tk>
Date: Fri, 13 Sep 2019 17:59:38 -0400
Subject: [PATCH] Use gettext for desktop file instead of intltool

---
 CMakeLists.txt                                     |  2 +-
 configure.ac                                       |  2 +-
 packages/desktop/Makefile                          |  2 +-
 packages/desktop/aegisub.desktop.template.cmake.in | 13 -------------
 packages/desktop/aegisub.desktop.template.in       |  6 +++---
 5 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 packages/desktop/aegisub.desktop.template.cmake.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f18e497f1..a82d3e739 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -753,7 +753,7 @@ endif()
 if(NOT WIN32)
     set(AEGISUB_COMMAND "aegisub" CACHE STRING "The executable name of Aegisub")
     set_target_properties(Aegisub PROPERTIES OUTPUT_NAME "${AEGISUB_COMMAND}")
-    configure_file("packages/desktop/aegisub.desktop.template.cmake.in" "aegisub.desktop" @ONLY)
+    configure_file("packages/desktop/aegisub.desktop.template.in" "aegisub.desktop" @ONLY)
     install(FILES "${CMAKE_BINARY_DIR}/aegisub.desktop" DESTINATION "share/applications")
     install(FILES "packages/desktop/16x16.png" DESTINATION "share/icons/hicolor/16x16/apps" RENAME aegisub.png)
     install(FILES "packages/desktop/22x22.png" DESTINATION "share/icons/hicolor/22x22/apps" RENAME aegisub.png)
diff --git a/configure.ac b/configure.ac
index 09a2e21c7..491e7ed85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -510,7 +510,7 @@ AC_PCH_FLAG([-fpch-preprocess])
 # Internationalisation support
 ##############################
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.18.1])
+AM_GNU_GETTEXT_VERSION([0.19.7])
 
 ################
 # Update checker
diff --git a/packages/desktop/Makefile b/packages/desktop/Makefile
index b41a91569..13c528ed0 100644
--- a/packages/desktop/Makefile
+++ b/packages/desktop/Makefile
@@ -17,7 +17,7 @@ APPDATA_FILE_INSTALLED = $(DESTDIR)$(P_APPDATA)/$(notdir $(APPDATA_FILE))
 DISTCLEANFILES += $(APPDATA_FILE)
 
 %.desktop: %.desktop.template $(DESKTOP_FILE_PO)
-	intltool-merge --quiet --desktop-style $(DESKTOP_FILE_PO) $< $@
+	$(AM_V_GEN)$(BIN_MSGFMT) --desktop --template $< -o $@ $(DESKTOP_FILE_PO)
 
 %.appdata.xml: %.appdata.xml.template $(APPDATA_FILE_PO)
 	intltool-merge --quiet --xml-style $(APPDATA_FILE_PO) $< $@
diff --git a/packages/desktop/aegisub.desktop.template.cmake.in b/packages/desktop/aegisub.desktop.template.cmake.in
deleted file mode 100644
index de9dc07ef..000000000
--- a/packages/desktop/aegisub.desktop.template.cmake.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Aegisub
-GenericName=Subtitle Editor
-Comment=Create and edit subtitles for film and videos.
-Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f
-TryExec=@AEGISUB_COMMAND@
-Icon=aegisub
-Terminal=false
-Categories=AudioVideo;AudioVideoEditing;
-MimeType=application/x-srt;text/plain;text/x-ass;text/x-microdvd;text/x-ssa;
-StartupNotify=true
diff --git a/packages/desktop/aegisub.desktop.template.in b/packages/desktop/aegisub.desktop.template.in
index 8d6f0b9ec..de9dc07ef 100644
--- a/packages/desktop/aegisub.desktop.template.in
+++ b/packages/desktop/aegisub.desktop.template.in
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-_Name=Aegisub
-_GenericName=Subtitle Editor
-_Comment=Create and edit subtitles for film and videos.
+Name=Aegisub
+GenericName=Subtitle Editor
+Comment=Create and edit subtitles for film and videos.
 Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f
 TryExec=@AEGISUB_COMMAND@
 Icon=aegisub