[gucharmap] build: drop intltool

From: Christian Persch <chpe src gnome org>
To: commits-list gnome org
Cc:
Subject: [gucharmap] build: drop intltool
Date: Wed, 8 Aug 2018 15:41:22 +0000 (UTC)
commit e45c7c0dcf8f066037372f670babdd0b0bc24409
Author: Jan Tojnar <jtojnar gmail com>
Date:   Wed Aug 8 17:40:21 2018 +0200

    build: drop intltool
    
    Modern gettext will do the same job:
    
    https://wiki.gnome.org/MigratingFromIntltoolToGettext
    
    https://gitlab.gnome.org/GNOME/gucharmap/issues/11

 Makefile.am                   |  4 +-
 autogen.sh                    |  1 -
 configure.ac                  |  5 ++-
 data/Makefile.am              |  3 +-
 data/gucharmap.appdata.xml.in | 12 +++---
 gucharmap.desktop.in.in       |  6 +--
 po/Makevars                   | 94 +++++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in                |  3 +-
 8 files changed, 112 insertions(+), 16 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0138f492..50093c8e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,7 @@ EXTRA_DIST = \
        gtkrc.win32 \
        COPYING.GFDL \
        COPYING.UNICODE \
+       $(desktop_in_files) \
        $(NULL)
 
 DISTCHECK_CONFIGURE_FLAGS = \
@@ -75,6 +76,7 @@ dist: ChangeLog
 
 .PHONY: ChangeLog
 
-@INTLTOOL_DESKTOP_RULE@
+gucharmap.desktop: gucharmap.desktop.in
+       $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 -include $(top_srcdir)/git.mk
diff --git a/autogen.sh b/autogen.sh
index 1e312d0f..3b68ec28 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,7 +10,6 @@ cd "$srcdir"
 mkdir -p m4 >/dev/null 2>&1 || true
 gtkdocize --copy --flavour no-tmpl
 autoreconf --verbose --force --install
-intltoolize --force
 cd -
 
 test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/configure.ac b/configure.ac
index 560e9392..f0a039de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,8 @@ AC_USE_SYSTEM_EXTENSIONS
 
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
-IT_PROG_INTLTOOL([0.40.0])
+AM_GNU_GETTEXT_VERSION([0.19.8])
+
 
 AM_PROG_CC_C_O
 
@@ -235,7 +236,7 @@ fi
 GETTEXT_PACKAGE=gucharmap
 AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[The gucharmap gettext domain])
-AM_GLIB_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
 
 ##########################################################
 # Check for -Bsymbolic-functions linker flag used to avoid
diff --git a/data/Makefile.am b/data/Makefile.am
index 7b89f100..27f5611f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,7 +16,8 @@ DISTCLEANFILES = \
        $(nodist_appdata_DATA) \
        $(NULL)
 
-@INTLTOOL_XML_RULE@
+gucharmap.appdata.xml: gucharmap.appdata.xml.in
+       $(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 -include $(top_srcdir)/git.mk
 
diff --git a/data/gucharmap.appdata.xml.in b/data/gucharmap.appdata.xml.in
index 255c3ac8..b5d55e6a 100644
--- a/data/gucharmap.appdata.xml.in
+++ b/data/gucharmap.appdata.xml.in
@@ -34,20 +34,20 @@
   <id>gucharmap.desktop</id>
   <metadata_license>GPL-3.0+ or GFDL-1.3-only</metadata_license>
   <project_license>GPL-3.0+</project_license>
-  <_name>Character Map</_name>
-  <_summary>Insert special characters into documents</_summary>
+  <name>Character Map</name>
+  <summary>Insert special characters into documents</summary>
   <description>
-    <_p>
+    <p>
       GNOME Character Map is a Unicode character map program, part of GNOME desktop.
       This program allows characters to be displayed by unicode block or script type.
       It includes brief descriptions of related characters and occasionally meanings
       of the character in question.
-    </_p>
-    <_p>
+    </p>
+    <p>
       Gucharmap can also be used to input or enter characters (by copy and paste).
       The search functionality allows the use of several search methods, including
       by unicode name or code point of the character.
-    </_p>
+    </p>
   </description>
 <!--
   <screenshots>
diff --git a/gucharmap.desktop.in.in b/gucharmap.desktop.in.in
index a073aa2b..649f7c8b 100644
--- a/gucharmap.desktop.in.in
+++ b/gucharmap.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=Character Map
-_Comment=Insert special characters into documents
-_Keywords=font;unicode;
+Name=Character Map
+Comment=Insert special characters into documents
+Keywords=font;unicode;
 Exec=gucharmap
 Icon=accessories-character-map
 Terminal=false
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 00000000..0fbff945
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,94 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ \
+        --keyword=C_:1c,2 --keyword=NC_:1c,2 \
+        --keyword=g_dngettext:2,3 --add-comments \
+        --flag=g_dngettext:2:pass-c-format \
+        --flag=g_strdup_printf:1:c-format \
+        --flag=g_string_printf:2:c-format \
+        --flag=g_string_append_printf:2:c-format \
+        --flag=g_error_new:3:c-format \
+        --flag=g_set_error:4:c-format \
+        --flag=g_markup_printf_escaped:1:c-format \
+        --flag=g_log:3:c-format \
+        --flag=g_print:1:c-format \
+        --flag=g_printerr:1:c-format \
+        --flag=g_printf:1:c-format \
+        --flag=g_fprintf:2:c-format \
+        --flag=g_sprintf:2:c-format \
+        --flag=g_snprintf:3:c-format
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Translation copyright holder
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = https://gitlab.gnome.org/GNOME/gucharmap/issues
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = no
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = no
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 257fb1df..7ecf66c0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,10 @@
-[encoding: UTF-8]
 data/gucharmap.appdata.xml.in
 gucharmap.desktop.in.in
 gucharmap/gucharmap-block-chapters-model.c
 gucharmap/gucharmap-charmap.c
 gucharmap/gucharmap-chartable-accessible.c
 gucharmap/gucharmap-chartable.c
-[type: gettext/glade]gucharmap/gucharmap-menus.ui
+gucharmap/gucharmap-menus.ui
 gucharmap/gucharmap-mini-fontsel.c
 gucharmap/gucharmap-script-chapters-model.c
 gucharmap/gucharmap-script-codepoint-list.c
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]