From 327288055b3ec5ce3ba61a5a7a9571c49a7c5259 Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arun@asymptotic.io>
Date: Fri, 14 Jan 2022 18:35:50 -0500
Subject: [PATCH] i18n: Migrate to upstream gettext over intltool

Newer gettext has feature parity, rendering intltool obsolete. Details
at:

  https://wiki.gnome.org/MigratingFromIntltoolToGettext
---
 .gitignore                 | 3 ---
 Makefile.am                | 3 ---
 bootstrap.sh               | 1 -
 configure.ac               | 4 ++--
 po/POTFILES.in             | 1 -
 src/Makefile.am            | 5 +++--
 src/pavucontrol.desktop.in | 6 +++---
 7 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 194775a..91ce06a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,6 @@ ChangeLog
 config.guess
 config.rpath
 config.sub
-intltool-extract.in
-intltool-merge.in
-intltool-update.in
 aclocal.m4
 *.cache
 compile
diff --git a/Makefile.am b/Makefile.am
index 175caa7..01d7d4d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,9 +18,6 @@
 EXTRA_DIST = \
 	bootstrap.sh \
 	LICENSE \
-	intltool-merge.in \
-	intltool-update.in \
-	intltool-extract.in \
 	po/pavucontrol.pot
 
 SUBDIRS=src doc po
diff --git a/bootstrap.sh b/bootstrap.sh
index 4719e9c..133b70f 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -23,7 +23,6 @@ if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
     echo "Activated pre-commit hook."
 fi
 
-intltoolize --force --automake
 autoreconf --force --install --symlink
 
 if test "x$NOCONFIGURE" = "x"; then
diff --git a/configure.ac b/configure.ac
index 45f825e..156730a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,11 +67,11 @@ fi
 
 ZP_LYNX_DOC
 
-IT_PROG_INTLTOOL([0.35.0])
 GETTEXT_PACKAGE=pavucontrol
 AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
-AM_GLIB_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
 
 AC_CONFIG_FILES([
 po/Makefile.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e9d0f55..931f312 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,3 @@
-[encoding: UTF-8]
 src/pavucontrol.desktop.in
 src/pavucontrol.glade
 src/pavucontrol.cc
diff --git a/src/Makefile.am b/src/Makefile.am
index b5c0314..adec68e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,8 +21,11 @@ localedir = $(datadir)/locale
 
 bin_PROGRAMS=pavucontrol
 glade_DATA=pavucontrol.glade
+
 desktop_in_files=pavucontrol.desktop.in
 desktop_DATA=$(desktop_in_files:.desktop.in=.desktop)
+$(desktop_DATA): $(desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 pavucontrol_SOURCES= \
   minimalstreamwidget.h minimalstreamwidget.cc \
@@ -48,5 +51,3 @@ pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/pavucontrol.glade\"
 EXTRA_DIST = $(glade_DATA) $(desktop_in_files)
 
 CLEANFILES = $(desktop_DATA)
-
-@INTLTOOL_DESKTOP_RULE@
diff --git a/src/pavucontrol.desktop.in b/src/pavucontrol.desktop.in
index 06f55e7..7499e2e 100644
--- a/src/pavucontrol.desktop.in
+++ b/src/pavucontrol.desktop.in
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Version=1.0
-_Name=PulseAudio Volume Control
-_GenericName=Volume Control
-_Comment=Adjust the volume level
+Name=PulseAudio Volume Control
+GenericName=Volume Control
+Comment=Adjust the volume level
 Exec=pavucontrol
 Icon=multimedia-volume-control
 StartupNotify=true