[ptxdist] [PATCH 1/3] gettext: version bump 0.19.8.1 -> 0.20.2

[ptxdist] [PATCH 1/3] gettext: version bump 0.19.8.1 -> 0.20.2

[Bruno Thomsen]

Configuration parameters removed:
--disable-native-java
--with-included-glib
--with-included-libcroco

Configuration parameters added:
--enable-cross-guesses
--enable-namespacing

License hash updated since urls has been updated from
http to https.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/gettext.make | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/rules/gettext.make b/rules/gettext.make
index dd1d22ffb..f4360aa2a 100644
--- a/rules/gettext.make
+++ b/rules/gettext.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GETTEXT) += gettext
 #
 # Paths and names
 #
-GETTEXT_VERSION	:= 0.19.8.1
-GETTEXT_MD5	:= df3f5690eaa30fd228537b00cb7b7590
+GETTEXT_VERSION	:= 0.20.2
+GETTEXT_MD5	:= 0cf5f68338d5d941bbf9ac93b847310f
 GETTEXT		:= gettext-$(GETTEXT_VERSION)
 GETTEXT_SUFFIX	:= tar.xz
 GETTEXT_URL	:= $(call ptx/mirror, GNU, gettext/$(GETTEXT).$(GETTEXT_SUFFIX))
@@ -25,7 +25,7 @@ GETTEXT_SOURCE	:= $(SRCDIR)/$(GETTEXT).$(GETTEXT_SUFFIX)
 GETTEXT_DIR	:= $(BUILDDIR)/$(GETTEXT)
 GETTEXT_LICENSE	:= GPL-3.0-or-later AND LGPL-2.1-or-later
 GETTEXT_LICENSE_FILES := \
-	file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+	file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \
 	file://gettext-runtime/intl/COPYING.LIB;md5=a4b192f7208753fc0fc8d88c733e6106 \
 
 # ----------------------------------------------------------------------------
@@ -41,7 +41,7 @@ GETTEXT_ENV 	:= $(CROSS_ENV)
 GETTEXT_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-java \
-	--disable-native-java \
+	--enable-namespacing \
 	--disable-csharp \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--enable-threads=posix \
@@ -49,6 +49,7 @@ GETTEXT_AUTOCONF := \
 	--disable-nls \
 	--disable-rpath \
 	--enable-c++ \
+	--enable-cross-guesses=conservative \
 	--disable-relocatable \
 	--enable-libasprintf \
 	--disable-acl \

base-commit: 9fe5462616de2ce93663f409f471ea83a6d5fbb5
-- 
2.26.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 2/3] gettext: cli/lib install options

[Bruno Thomsen]

This users to deselect parts not needed, e.g. if you
only need envsubst tool.

Fixed runtime issue with xgettext missing libtextstyle.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/gettext.in   | 13 +++++++++++++
 rules/gettext.make |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/rules/gettext.in b/rules/gettext.in
index e2d3c042a..b7399e0e9 100644
--- a/rules/gettext.in
+++ b/rules/gettext.in
@@ -25,4 +25,17 @@ config GETTEXT_ENVSUBST
 	help
 	  Substitutes environment variables in shell format strings
 
+config GETTEXT_TOOLS
+	bool
+	prompt "gettext/xgettext cli"
+	select GETTEXT_LIBS
+	help
+	  Command line tools for translations.
+
+config GETTEXT_LIBS
+	bool
+	prompt "gettext libs"
+	help
+	  System libraries for translations.
+
 endif
diff --git a/rules/gettext.make b/rules/gettext.make
index f4360aa2a..83638543e 100644
--- a/rules/gettext.make
+++ b/rules/gettext.make
@@ -76,13 +76,18 @@ ifdef PTXCONF_GETTEXT_ENVSUBST
 	@$(call install_copy, gettext, 0, 0, 0755, -, /usr/bin/envsubst)
 endif
 
+ifdef PTXCONF_GETTEXT_TOOLS
 	@$(call install_copy, gettext, 0, 0, 0755, -, /usr/bin/xgettext)
 	@$(call install_copy, gettext, 0, 0, 0755, -, /usr/bin/gettext)
+endif
 
+ifdef PTXCONF_GETTEXT_LIBS
 	@$(call install_lib, gettext, 0, 0, 0644, libgettextlib-$(GETTEXT_VERSION))
 	@$(call install_lib, gettext, 0, 0, 0644, libasprintf)
 	@$(call install_lib, gettext, 0, 0, 0644, libgettextpo)
-	@$(call install_lib, gettext, 0, 0, 0644,libgettextsrc-$(GETTEXT_VERSION))
+	@$(call install_lib, gettext, 0, 0, 0644, libgettextsrc-$(GETTEXT_VERSION))
+	@$(call install_lib, gettext, 0, 0, 0644, libtextstyle)
+endif
 
 	@$(call install_finish, gettext)
 
-- 
2.26.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 2/3] gettext: cli/lib install options

[Bruno Thomsen]

Den tir. 14. jul. 2020 kl. 18.54 skrev Bruno Thomsen <bruno.thomsen@gmail.com>:
>
> This users to deselect parts not needed, e.g. if you
> only need envsubst tool.

Typo in commit message.

This allows users to deselect parts...


> Fixed runtime issue with xgettext missing libtextstyle.
>
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> ---
>  rules/gettext.in   | 13 +++++++++++++
>  rules/gettext.make |  7 ++++++-
>  2 files changed, 19 insertions(+), 1 deletion(-)

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 2/3] gettext: cli/lib install options

[Michael Olbrich]

On Thu, Jul 16, 2020 at 02:18:36PM +0200, Bruno Thomsen wrote:
> Den tir. 14. jul. 2020 kl. 18.54 skrev Bruno Thomsen <bruno.thomsen@gmail.com>:
> >
> > This users to deselect parts not needed, e.g. if you
> > only need envsubst tool.
> 
> Typo in commit message.
> 
> This allows users to deselect parts...

I can fix that when I apply the patch.

Michael

> > Fixed runtime issue with xgettext missing libtextstyle.
> >
> > Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> > ---
> >  rules/gettext.in   | 13 +++++++++++++
> >  rules/gettext.make |  7 ++++++-
> >  2 files changed, 19 insertions(+), 1 deletion(-)
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] gettext: cli/lib install options

[Michael Olbrich]

Thanks, applied as b9a52493d874fb4d671f950607365372163010bd.

Michael

[sent from post-receive hook]

On Fri, 17 Jul 2020 13:57:08 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> This allows users to deselect parts not needed, e.g. if you
> only need envsubst tool.
> 
> Fixed runtime issue with xgettext missing libtextstyle.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20200714165405.4622-2-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/gettext.in b/rules/gettext.in
> index dc05739120ec..3c823eca402b 100644
> --- a/rules/gettext.in
> +++ b/rules/gettext.in
> @@ -20,4 +20,17 @@ config GETTEXT_ENVSUBST
>  	help
>  	  Substitutes environment variables in shell format strings
>  
> +config GETTEXT_TOOLS
> +	bool
> +	prompt "gettext/xgettext cli"
> +	select GETTEXT_LIBS
> +	help
> +	  Command line tools for translations.
> +
> +config GETTEXT_LIBS
> +	bool
> +	prompt "gettext libs"
> +	help
> +	  System libraries for translations.
> +
>  endif
> diff --git a/rules/gettext.make b/rules/gettext.make
> index f4360aa2a852..83638543e4cb 100644
> --- a/rules/gettext.make
> +++ b/rules/gettext.make
> @@ -76,13 +76,18 @@ ifdef PTXCONF_GETTEXT_ENVSUBST
>  	@$(call install_copy, gettext, 0, 0, 0755, -, /usr/bin/envsubst)
>  endif
>  
> +ifdef PTXCONF_GETTEXT_TOOLS
>  	@$(call install_copy, gettext, 0, 0, 0755, -, /usr/bin/xgettext)
>  	@$(call install_copy, gettext, 0, 0, 0755, -, /usr/bin/gettext)
> +endif
>  
> +ifdef PTXCONF_GETTEXT_LIBS
>  	@$(call install_lib, gettext, 0, 0, 0644, libgettextlib-$(GETTEXT_VERSION))
>  	@$(call install_lib, gettext, 0, 0, 0644, libasprintf)
>  	@$(call install_lib, gettext, 0, 0, 0644, libgettextpo)
> -	@$(call install_lib, gettext, 0, 0, 0644,libgettextsrc-$(GETTEXT_VERSION))
> +	@$(call install_lib, gettext, 0, 0, 0644, libgettextsrc-$(GETTEXT_VERSION))
> +	@$(call install_lib, gettext, 0, 0, 0644, libtextstyle)
> +endif
>  
>  	@$(call install_finish, gettext)
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 3/3] Revert "gettext: move to staging"

[Bruno Thomsen]

From: Bruno Thomsen <bth@kamstrup.com>

Package has been updated and envsubst is a really useful
tool when doing template configuration of a service based
on environment variables.

This reverts commit f78373b3d18d37d4feb24862c49bac822667ed3b.
---
 rules/gettext.in | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/rules/gettext.in b/rules/gettext.in
index b7399e0e9..3c823eca4 100644
--- a/rules/gettext.in
+++ b/rules/gettext.in
@@ -1,6 +1,4 @@
-## SECTION=staging
-## old section:
-### SECTION=system_libraries
+## SECTION=system_libraries
 menuconfig GETTEXT
 	tristate
 	prompt "gettext (gnu)                 "
@@ -13,9 +11,6 @@ menuconfig GETTEXT
 	  message into the user's language, by looking up
 	  the translation in a message catalog.
 
-	  STAGING: remove in ptxdist-2021.04.0
-	  Old unused version. Not really needed on the target in most cases.
-
 
 if GETTEXT
 
-- 
2.26.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] Revert "gettext: move to staging"

[Michael Olbrich]

Thanks, applied as f528ecee36632cfe15a0065f943e8bedf3eaf4da.

Michael

[sent from post-receive hook]

On Fri, 17 Jul 2020 13:57:08 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Package has been updated and envsubst is a really useful
> tool when doing template configuration of a service based
> on environment variables.
> 
> This reverts commit f78373b3d18d37d4feb24862c49bac822667ed3b.
> Message-Id: <20200714165405.4622-3-bruno.thomsen@gmail.com>
> 
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/gettext.in b/rules/gettext.in
> index e2d3c042ad87..dc05739120ec 100644
> --- a/rules/gettext.in
> +++ b/rules/gettext.in
> @@ -1,6 +1,4 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=system_libraries
> +## SECTION=system_libraries
>  menuconfig GETTEXT
>  	tristate
>  	prompt "gettext (gnu)                 "
> @@ -13,9 +11,6 @@ menuconfig GETTEXT
>  	  message into the user's language, by looking up
>  	  the translation in a message catalog.
>  
> -	  STAGING: remove in ptxdist-2021.04.0
> -	  Old unused version. Not really needed on the target in most cases.
> -
>  
>  if GETTEXT
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] gettext: version bump 0.19.8.1 -> 0.20.2

[Michael Olbrich]

Thanks, applied as 0a22112141fade71a7811bce482aca46009c0614.

Michael

[sent from post-receive hook]

On Fri, 17 Jul 2020 13:57:07 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Configuration parameters removed:
> --disable-native-java
> --with-included-glib
> --with-included-libcroco
> 
> Configuration parameters added:
> --enable-cross-guesses
> --enable-namespacing
> 
> License hash updated since urls has been updated from
> http to https.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20200714165405.4622-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/gettext.make b/rules/gettext.make
> index dd1d22ffb8f1..f4360aa2a852 100644
> --- a/rules/gettext.make
> +++ b/rules/gettext.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GETTEXT) += gettext
>  #
>  # Paths and names
>  #
> -GETTEXT_VERSION	:= 0.19.8.1
> -GETTEXT_MD5	:= df3f5690eaa30fd228537b00cb7b7590
> +GETTEXT_VERSION	:= 0.20.2
> +GETTEXT_MD5	:= 0cf5f68338d5d941bbf9ac93b847310f
>  GETTEXT		:= gettext-$(GETTEXT_VERSION)
>  GETTEXT_SUFFIX	:= tar.xz
>  GETTEXT_URL	:= $(call ptx/mirror, GNU, gettext/$(GETTEXT).$(GETTEXT_SUFFIX))
> @@ -25,7 +25,7 @@ GETTEXT_SOURCE	:= $(SRCDIR)/$(GETTEXT).$(GETTEXT_SUFFIX)
>  GETTEXT_DIR	:= $(BUILDDIR)/$(GETTEXT)
>  GETTEXT_LICENSE	:= GPL-3.0-or-later AND LGPL-2.1-or-later
>  GETTEXT_LICENSE_FILES := \
> -	file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> +	file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \
>  	file://gettext-runtime/intl/COPYING.LIB;md5=a4b192f7208753fc0fc8d88c733e6106 \
>  
>  # ----------------------------------------------------------------------------
> @@ -41,7 +41,7 @@ GETTEXT_ENV 	:= $(CROSS_ENV)
>  GETTEXT_AUTOCONF := \
>  	$(CROSS_AUTOCONF_USR) \
>  	--disable-java \
> -	--disable-native-java \
> +	--enable-namespacing \
>  	--disable-csharp \
>  	$(GLOBAL_LARGE_FILE_OPTION) \
>  	--enable-threads=posix \
> @@ -49,6 +49,7 @@ GETTEXT_AUTOCONF := \
>  	--disable-nls \
>  	--disable-rpath \
>  	--enable-c++ \
> +	--enable-cross-guesses=conservative \
>  	--disable-relocatable \
>  	--enable-libasprintf \
>  	--disable-acl \

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de