gettext-minimal: update files from gettext 0.18.2

deleted file mode 100644
index 6dab00d165aa5dcc6c98fba8315fa4bb35a15303..0000000000000000000000000000000000000000
GIT binary patch

similarity index 100%
rename from meta/recipes-core/gettext/gettext-minimal-0.18.1.1/COPYING
rename to meta/recipes-core/gettext/gettext-minimal-0.18.2/COPYING

similarity index 95%
rename from meta/recipes-core/gettext/gettext-minimal-0.18.1.1/Makefile.in.in
rename to meta/recipes-core/gettext/gettext-minimal-0.18.2/Makefile.in.in
index 83d8838..fce63a6 100644
@@ -8,7 +8,7 @@
 # Please note that the actual code of GNU gettext is covered by the GNU
 # General Public License and is *not* in the public domain.
 #
-# Origin: gettext-0.18
+# Origin: gettext-0.18.2
 GETTEXT_MACRO_VERSION = 0.18
 
 PACKAGE = @PACKAGE@

@@ -96,14 +96,14 @@ CATALOGS = @CATALOGS@
 	mv t-$@ $@
 
 
-all: check-macro-version all-@USE_NLS@
+all: all-@USE_NLS@
 
 all-yes: stamp-po
 all-no:
 
 # Ensure that the gettext macros and this Makefile.in.in are in sync.
-check-macro-version:
-	@test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+CHECK_MACRO_VERSION = \
+	test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
 	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
 	       exit 1; \
 	     }

@@ -123,6 +123,7 @@ check-macro-version:
 # $(POFILES) has been designed to not touch files that don't need to be
 # changed.
 stamp-po: $(srcdir)/$(DOMAIN).pot
+	@$(CHECK_MACRO_VERSION)
 	test ! -f $(srcdir)/$(DOMAIN).pot || \
 	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
 	@test ! -f $(srcdir)/$(DOMAIN).pot || { \

@@ -137,8 +138,16 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+# The determination of whether the package xyz is a GNU one is based on the
+# heuristic whether some file in the top level directory mentions "GNU xyz".
+# If GNU 'find' is available, we avoid grepping through monster files.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-	if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
+	if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
+	       LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
+	     else \
+	       LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+	     fi; \
+	   } | grep -v 'libtool:' >/dev/null; then \
 	  package_gnu='GNU '; \
 	else \
 	  package_gnu=''; \

similarity index 76%
rename from meta/recipes-core/gettext/gettext-minimal-0.18.1.1/Makevars.template
rename to meta/recipes-core/gettext/gettext-minimal-0.18.2/Makevars.template
index 32692ab..4a9ff7d 100644
@@ -39,3 +39,15 @@ 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 =

new file mode 100644
index 0000000000000000000000000000000000000000..a97953049db2d2c6497a5814ed74cae1a4b74a69
GIT binary patch

235 lines not on this page · raw message

similarity index 100%
rename from meta/recipes-core/gettext/gettext-minimal-0.18.1.1/remove-potcdate.sin
rename to meta/recipes-core/gettext/gettext-minimal-0.18.2/remove-potcdate.sin

similarity index 98%
rename from meta/recipes-core/gettext/gettext-minimal-native_0.18.1.1.bb
rename to meta/recipes-core/gettext/gettext-minimal-native_0.18.2.bb
index f008a79..da6d3bc 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0854da868a929923087141d9d7aba7d5"
 
 inherit native
 
-PR = "r5"
+PR = "r0"
 
 S = "${WORKDIR}"