[gcr/wip/nielsdg/kill-intltool] Move from intltool to gettext
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcr/wip/nielsdg/kill-intltool] Move from intltool to gettext
- Date: Thu, 30 May 2019 19:08:20 +0000 (UTC)
commit 877843d3d11ed2f0b346f973aab972d0764e79d4
Author: Niels De Graef <nielsdegraef gmail com>
Date: Thu May 30 21:07:39 2019 +0200
Move from intltool to gettext
Intltool is deprecated; use gettext instead.
Makefile.am | 14 +-------------
autogen.sh | 1 -
configure.ac | 4 ++--
ui/Makefile.am | 5 +++--
ui/gcr-prompter.desktop.in.in | 4 ++--
ui/gcr-viewer.desktop.in.in | 5 +----
6 files changed, 9 insertions(+), 24 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9cdf14d..ff1aa94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
--with-pkcs11-modules=$(abs_srcdir)/$(top_distdir)/_inst/lib/
DISTCLEANFILES = \
- intltool-extract \
- intltool-merge \
- intltool-update
+ $(NULL)
dist-hook:
@if test -d "$(srcdir)/.git"; \
@@ -109,9 +107,6 @@ CLEANFILES = \
$(pkgconfig_DATA)
EXTRA_DIST = \
- intltool-extract.in \
- intltool-merge.in \
- intltool-update.in \
HACKING \
build/valgrind \
$(VALGRIND_SUPPRESSIONS) \
@@ -145,13 +140,6 @@ SED_SUBST = sed \
-e 's,[@]VERSION[@],$(VERSION),g' \
$(NULL)
-.desktop.in.in.desktop.in:
- $(V_SED) $(SED_SUBST) $< > $@
-
-@INTLTOOL_DESKTOP_RULE@
-
-.service.in.service:
- $(V_SED) $(SED_SUBST) $< > $@
ENUM_TEMPLATE_C = $(top_srcdir)/build/enum-template.c
ENUM_TEMPLATE_H = $(top_srcdir)/build/enum-template.h
diff --git a/autogen.sh b/autogen.sh
index 590b435..deab124 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -23,7 +23,6 @@ fi
aclocal --install || exit 1
gtkdocize --copy || exit 1
-intltoolize --force --copy --automake || exit 1
autoreconf --verbose --force --install || exit 1
cd $olddir
diff --git a/configure.ac b/configure.ac
index d08a50d..3909ed0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,13 +71,13 @@ AC_PROG_LN_S
AC_PROG_MAKE_SET
AM_DISABLE_STATIC
AM_PROG_LIBTOOL
-IT_PROG_INTLTOOL([0.35.0])
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
GETTEXT_PACKAGE=gcr
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name])
AC_SUBST(GETTEXT_PACKAGE)
-AM_GLIB_GNU_GETTEXT
# -----------------------------------------------------------------------------
# GLib and GTK+ stuff
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 2d2cfcd..0e30306 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -190,9 +190,10 @@ gcr-ui-expected.abi: ui/gcr-ui.symbols
$(AM_V_GEN) cpp -P $< | sort > $@
desktopdir = $(datadir)/applications
-desktop_in_in_files = ui/gcr-viewer.desktop.in.in ui/gcr-prompter.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+desktop_in_files = ui/gcr-viewer.desktop.in ui/gcr-prompter.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 $@
bin_PROGRAMS = gcr-viewer
diff --git a/ui/gcr-prompter.desktop.in.in b/ui/gcr-prompter.desktop.in.in
index 6d43e0c..67dfb93 100644
--- a/ui/gcr-prompter.desktop.in.in
+++ b/ui/gcr-prompter.desktop.in.in
@@ -1,6 +1,6 @@
[Desktop Entry]
-_Name=Access Prompt
-_Comment=Unlock access to passwords and other secrets
+Name=Access Prompt
+Comment=Unlock access to passwords and other secrets
Icon=security-medium
Exec=@libexecdir@/gcr-prompter
Terminal=false
diff --git a/ui/gcr-viewer.desktop.in.in b/ui/gcr-viewer.desktop.in.in
index d12e62c..d3b0f57 100644
--- a/ui/gcr-viewer.desktop.in.in
+++ b/ui/gcr-viewer.desktop.in.in
@@ -1,10 +1,7 @@
[Desktop Entry]
-_Name=View file
+Name=View file
MimeType=application/pkcs12;application/pkcs12+pem;application/pkcs7-mime;application/pkcs7-mime+pem;application/pkcs8;application/pkcs8+pem;application/pkix-cert;application/pkix-cert+pem;application/pkix-crl;application/pkix-crl+pem;application/x-pem-file;application/x-pem-key;application/x-pkcs12;application/x-pkcs7-certificates;application/x-x509-ca-cert;application/x-x509-user-cert;application/pkcs10;application/pkcs10+pem;application/x-spkac;application/x-spkac+base64;
Exec=@bindir@/gcr-viewer
Type=Application
Terminal=false
NoDisplay=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-keyring
-X-GNOME-Bugzilla-Component=gcr
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]