itdominator
/
pavucontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: Migrate to upstream gettext over intltool 

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

  https://wiki.gnome.org/MigratingFromIntltoolToGettext
This commit is contained in:
Arun Raghavan 2022-01-14 18:35:50 -05:00
parent 8b3a5999a6
commit 327288055b
7 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -4,9 +4,6 @@ ChangeLog
config.guess config.guess
config.rpath config.rpath
config.sub config.sub
intltool-extract.in
intltool-merge.in
intltool-update.in
aclocal.m4 aclocal.m4
*.cache *.cache
compile compile

3
Makefile.am
View File

@ -18,9 +18,6 @@
EXTRA_DIST = \ EXTRA_DIST = \
bootstrap.sh \ bootstrap.sh \
LICENSE \ LICENSE \
intltool-merge.in \
intltool-update.in \
intltool-extract.in \
po/pavucontrol.pot po/pavucontrol.pot
SUBDIRS=src doc po SUBDIRS=src doc po

1
bootstrap.sh
View File

@ -23,7 +23,6 @@ if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
echo "Activated pre-commit hook." echo "Activated pre-commit hook."
fi fi
intltoolize --force --automake
autoreconf --force --install --symlink autoreconf --force --install --symlink
if test "x$NOCONFIGURE" = "x"; then if test "x$NOCONFIGURE" = "x"; then

4
configure.ac
View File

@ -67,11 +67,11 @@ fi
ZP_LYNX_DOC ZP_LYNX_DOC
IT_PROG_INTLTOOL([0.35.0])
GETTEXT_PACKAGE=pavucontrol GETTEXT_PACKAGE=pavucontrol
AC_SUBST([GETTEXT_PACKAGE]) AC_SUBST([GETTEXT_PACKAGE])
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[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([ AC_CONFIG_FILES([
po/Makefile.in po/Makefile.in

1
po/POTFILES.in
View File

@ -1,4 +1,3 @@
[encoding: UTF-8]
src/pavucontrol.desktop.in src/pavucontrol.desktop.in
src/pavucontrol.glade src/pavucontrol.glade
src/pavucontrol.cc src/pavucontrol.cc

5
src/Makefile.am
View File

@ -21,8 +21,11 @@ localedir = $(datadir)/locale
bin_PROGRAMS=pavucontrol bin_PROGRAMS=pavucontrol
glade_DATA=pavucontrol.glade glade_DATA=pavucontrol.glade
desktop_in_files=pavucontrol.desktop.in desktop_in_files=pavucontrol.desktop.in
desktop_DATA=$(desktop_in_files:.desktop.in=.desktop) 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= \ pavucontrol_SOURCES= \
minimalstreamwidget.h minimalstreamwidget.cc \ minimalstreamwidget.h minimalstreamwidget.cc \
@ -48,5 +51,3 @@ pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/pavucontrol.glade\"
EXTRA_DIST = $(glade_DATA) $(desktop_in_files) EXTRA_DIST = $(glade_DATA) $(desktop_in_files)
CLEANFILES = $(desktop_DATA) CLEANFILES = $(desktop_DATA)
@INTLTOOL_DESKTOP_RULE@

6
src/pavucontrol.desktop.in
View File

@ -1,8 +1,8 @@
[Desktop Entry] [Desktop Entry]
Version=1.0 Version=1.0
_Name=PulseAudio Volume Control Name=PulseAudio Volume Control
_GenericName=Volume Control GenericName=Volume Control
_Comment=Adjust the volume level Comment=Adjust the volume level
Exec=pavucontrol Exec=pavucontrol
Icon=multimedia-volume-control Icon=multimedia-volume-control
StartupNotify=true StartupNotify=true