diff options
author | Akira TAGOH <akira@tagoh.org> | 2018-01-05 22:12:37 +0900 |
---|---|---|
committer | Akira TAGOH <akira@tagoh.org> | 2018-01-05 22:12:37 +0900 |
commit | b2da36e92265c82e598cdea670ec436f9b592af0 (patch) | |
tree | 354643b36ac01f6c2979a0ce7c3c5a82d6a4e495 | |
parent | a2e0ebf3922d4ac682162e63ec7b209ef58f3c7c (diff) |
Use the native ITS support in gettext
and drop the dependency of itstool.
To get this working, need to patch out to fix a crash:
http://git.savannah.gnu.org/cgit/gettext.git/commit/?id=a0cab23332a254e3500cac2a3a984472d02180e5
-rw-r--r-- | configure.ac | 7 | ||||
-rw-r--r-- | po-conf/Makevars | 6 | ||||
-rw-r--r-- | po-conf/POTFILES.in | 34 | ||||
-rw-r--r-- | po/Makevars | 2 |
4 files changed, 39 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index dcacb2e4..c48180fd 100644 --- a/configure.ac +++ b/configure.ac @@ -109,13 +109,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) AM_GNU_GETTEXT_VERSION([0.19.8]) AM_GNU_GETTEXT([external]) -if test "$os_win32" = "no"; then -AC_PATH_PROG(ITSTOOL, [itstool]) -if test -z "$ITSTOOL"; then - AC_MSG_ERROR([The itstool were not found. Please install itstool.]) -fi -fi - dnl ========================================================================== if test "$os_win32" = "yes"; then diff --git a/po-conf/Makevars b/po-conf/Makevars index b3cf99a8..84118216 100644 --- a/po-conf/Makevars +++ b/po-conf/Makevars @@ -8,7 +8,7 @@ subdir = po-conf top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --its=$(top_srcdir)/src/fontconfig.its # 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 @@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ # 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 = Free Software Foundation, Inc. +COPYRIGHT_HOLDER = Fontconfig Author(s) # This tells whether or not to prepend "GNU " prefix to the package # name that gets inserted into the header of the $(DOMAIN).pot file. @@ -76,3 +76,5 @@ PO_DEPENDS_ON_POT = yes # "no". Set this to no if the POT file and PO files are maintained # externally. DIST_DEPENDS_ON_UPDATE_PO = yes + + diff --git a/po-conf/POTFILES.in b/po-conf/POTFILES.in index e69de29b..f4846ac2 100644 --- a/po-conf/POTFILES.in +++ b/po-conf/POTFILES.in @@ -0,0 +1,34 @@ +conf.d/10-autohint.conf +conf.d/10-hinting-full.conf +conf.d/10-hinting-medium.conf +conf.d/10-hinting-none.conf +conf.d/10-hinting-slight.conf +conf.d/10-no-sub-pixel.conf +conf.d/10-scale-bitmap-fonts.conf +conf.d/10-sub-pixel-bgr.conf +conf.d/10-sub-pixel-rgb.conf +conf.d/10-sub-pixel-vbgr.conf +conf.d/10-sub-pixel-vrgb.conf +conf.d/10-unhinted.conf +conf.d/11-lcdfilter-default.conf +conf.d/11-lcdfilter-legacy.conf +conf.d/11-lcdfilter-light.conf +conf.d/20-unhint-small-vera.conf +conf.d/25-unhint-nonlatin.conf +conf.d/30-metric-aliases.conf +conf.d/40-nonlatin.conf +conf.d/45-generic.conf +conf.d/45-latin.conf +conf.d/49-sansserif.conf +conf.d/50-user.conf +conf.d/51-local.conf +conf.d/60-generic.conf +conf.d/60-latin.conf +conf.d/65-fonts-persian.conf +conf.d/65-khmer.conf +conf.d/65-nonlatin.conf +conf.d/69-unifont.conf +conf.d/70-no-bitmaps.conf +conf.d/70-yes-bitmaps.conf +conf.d/80-delicious.conf +conf.d/90-synthetic.conf diff --git a/po/Makevars b/po/Makevars index 0d699cc9..32835328 100644 --- a/po/Makevars +++ b/po/Makevars @@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ # 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 = Free Software Foundation, Inc. +COPYRIGHT_HOLDER = Fontconfig Author(s) # This tells whether or not to prepend "GNU " prefix to the package # name that gets inserted into the header of the $(DOMAIN).pot file. |