diff options
author | Javier Jardón <jjardon@gnome.org> | 2016-07-25 09:23:02 +0100 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2016-07-28 21:15:37 +0100 |
commit | a0c98a084263ba724466b2a46dbca5793543e499 (patch) | |
tree | cc93031321b3bea50b97b36f8d7ef51288c84e6c | |
parent | f2939ecf4bb3af9e128d5f27ac3efa49520e9831 (diff) | |
download | libgnomekbd-a0c98a084263ba724466b2a46dbca5793543e499.tar.gz |
Use upstream gettext instead intltool
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile.am | 8 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | libgnomekbd/Makefile.am | 30 | ||||
-rw-r--r-- | libgnomekbd/gkbd-keyboard-display.desktop.in.in | 4 | ||||
-rw-r--r-- | po/.gitignore | 2 | ||||
-rw-r--r-- | po/Makevars | 78 | ||||
-rw-r--r-- | po/POTFILES.in | 8 |
8 files changed, 101 insertions, 36 deletions
@@ -12,7 +12,6 @@ configure depcomp INSTALL install-sh -intltool-*.in libgnomekbd.pc libgnomekbdui.pc libtool diff --git a/Makefile.am b/Makefile.am index 53f246c..5e395f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,18 +8,10 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} DISTCHECK_CONFIGURE_FLAGS = --enable-introspection -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update - EXTRA_DIST = \ m4/introspection.m4 \ libgnomekbd.pc.in \ libgnomekbdui.pc.in \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ README.cvs \ ChangeLog.libkbdraw ChangeLog.libgswitchit diff --git a/configure.ac b/configure.ac index 3327262..bdae02f 100644 --- a/configure.ac +++ b/configure.ac @@ -39,15 +39,13 @@ AM_PROG_LIBTOOL # **** # i18n # **** +AM_GNU_GETTEXT_VERSION([0.19.4]) +AM_GNU_GETTEXT([external]) GETTEXT_PACKAGE=libgnomekbd AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) -AM_GLIB_GNU_GETTEXT - -IT_PROG_INTLTOOL([0.35.0]) - # ***************************************************************************** AC_CHECK_FUNCS(setlocale) diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am index 6246760..3609998 100644 --- a/libgnomekbd/Makefile.am +++ b/libgnomekbd/Makefile.am @@ -13,9 +13,6 @@ icons_DATA = kbdled-caps-lock.svg \ gsettings_SCHEMAS = org.gnome.libgnomekbd.desktop.gschema.xml \ org.gnome.libgnomekbd.keyboard.gschema.xml \ org.gnome.libgnomekbd.gschema.xml -@GSETTINGS_RULES@ - -@INTLTOOL_XML_NOMERGE_RULE@ common_CFLAGS = \ -I$(top_srcdir) \ @@ -87,15 +84,12 @@ BUILT_SOURCES = gkbd-indicator-marshal.c \ gkbd-keyboard-drawing-marshal.h DISTCLEANFILES = $(BUILT_SOURCES) \ - $(gsettings_SCHEMAS) \ - gkbd-keyboard-display.desktop \ - gkbd-keyboard-display.desktop.in - + $(desktop_DATA) MAINTAINERCLEANFILES = \ + $(desktop_DATA) \ *~ \ - Makefile.in \ - $(gsettings_SCHEMAS:.xml=.valid) + Makefile.in gnomekbdincdir = $(includedir)/libgnomekbd gnomekbdinc_HEADERS = \ @@ -108,11 +102,17 @@ gnomekbdinc_HEADERS = \ gkbd-keyboard-drawing.h \ gkbd-util.h -sysdir = $(datadir)/applications -sys_in_in_files = gkbd-keyboard-display.desktop.in.in -sys_DATA = $(sys_in_in_files:.desktop.in.in=.desktop) +# Rule to create the .desktop files +desktopdir = $(datadir)/applications +desktop_in_files = gkbd-keyboard-display.desktop.in +desktop_DATA = gkbd-keyboard-display.desktop + +$(desktop_in_files): gkbd-keyboard-display.desktop.in.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ -@INTLTOOL_DESKTOP_RULE@ +# Substitute variables in a Desktop Entry file. +$(desktop_DATA): $(desktop_in_files) + $(AM_V_GEN) sed -e 's|@VERSION[@]|$(VERSION)|g' $< > $@ noinst_HEADERS = $(extra_nih) \ gkbd-config-private.h @@ -125,8 +125,8 @@ EXTRA_DIST = gkbd-indicator-marshal.list \ $(ui_DATA) \ $(convert_DATA) \ $(icons_DATA) \ - $(sys_in_in_files) \ - $(gsettings_SCHEMAS:.xml=.xml.in.in) + $(desktop_in_files) \ + $(gsettings_SCHEMAS:.xml=.xml.in) GLIB_GENMARSHAL = $(shell pkg-config --variable=glib_genmarshal glib-2.0) diff --git a/libgnomekbd/gkbd-keyboard-display.desktop.in.in b/libgnomekbd/gkbd-keyboard-display.desktop.in.in index 2fe92dc..656fa6d 100644 --- a/libgnomekbd/gkbd-keyboard-display.desktop.in.in +++ b/libgnomekbd/gkbd-keyboard-display.desktop.in.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Keyboard Layout -_Comment=Preview keyboard layouts +Name=Keyboard Layout +Comment=Preview keyboard layouts Icon=preferences-desktop-keyboard Exec=gkbd-keyboard-display Terminal=false diff --git a/po/.gitignore b/po/.gitignore index 5c20179..da9bbde 100644 --- a/po/.gitignore +++ b/po/.gitignore @@ -1,6 +1,4 @@ *.gmo -.intltool-merge-cache Makefile.in.in POTFILES stamp-it - diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 0000000..579ebd1 --- /dev/null +++ b/po/Makevars @@ -0,0 +1,78 @@ +# 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 = --keyword=_ --keyword=N_ + +# 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 = Free Software Foundation, Inc. + +# 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 = + +# 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 = + +# 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 5ce4cd1..6b21e8e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,8 +6,8 @@ libgnomekbd/gkbd-keyboard-config.c libgnomekbd/gkbd-status.c libgnomekbd/gkbd-util.c libgnomekbd/gkbd-keyboard-display.desktop.in.in -[type: gettext/xml]libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in -[type: gettext/xml]libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in.in -[type: gettext/xml]libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in.in -[type: gettext/glade]libgnomekbd/show-layout.ui +libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in +libgnomekbd/org.gnome.libgnomekbd.gschema.xml.in.in +libgnomekbd/org.gnome.libgnomekbd.keyboard.gschema.xml.in.in +libgnomekbd/show-layout.ui test/gkbd-indicator-test.c |