package/libtextstyle: new package
PATCH v2 1/3 package/libtextstyle: new package
From: Adam Duskett <[email protected]>
This library provides an easy way to add styling to programs that produce output to a console or terminal emulator window.
libtextstyle is for you if your application produces text that is more readable when it is accompanied with styling information, such as color, font attributes (weight, posture), or underlining.
Newer versions of gettext-gnu require this package.
Tested with test-pkg -p gettext-tiny in Debian 10 and Centos 7
br-arm-full [1/6]: OK
br-arm-cortex-a9-glibc [2/6]: OK
br-arm-cortex-m4-full [3/6]: OK
br-x86-64-musl [4/6]: OK
br-arm-full-static [5/6]: OK
sourcery-arm [6/6]: OK--- DEVELOPERS | 1 + package/Config.in | 1 + package/libtextstyle/Config.in | 14 +++++++++++++ package/libtextstyle/libtextstyle.hash | 6 ++++++ package/libtextstyle/libtextstyle.mk | 28 ++++++++++++++++++++++++++ 5 files changed, 50 insertions(+) create mode 100644 package/libtextstyle/Config.in create mode 100644 package/libtextstyle/libtextstyle.hash create mode 100644 package/libtextstyle/libtextstyle.mk
DEVELOPERS +1 -0
@@ -47,6 +47,7 @@ F: package/libressl/ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ +F: package/libtextstyle/ F: package/libwebsockets/ F: package/mender-grubenv/ F: package/nginx-naxsi/
package/Config.in +1 -0
@@ -1889,6 +1889,7 @@ menu "Text and terminal handling" source "package/libiconv/Config.in" source "package/libunistring/Config.in" source "package/linenoise/Config.in" + source "package/libtextstyle/Config.in" source "package/ncurses/Config.in" source "package/newt/Config.in" source "package/oniguruma/Config.in"
package/libtextstyle/Config.in new file +14 -0
@@ -0,0 +1,14 @@ +config BR2_PACKAGE_LIBTEXTSTYLE + bool "libtextstyle" + depends on BR2_USE_WCHAR + help + This library provides an easy way to add styling to + programs that produce output to a console or terminal + emulator window. + + libtextstyle is for you if your application produces text + that is more readable when it is accompanied with styling + information, such as color, font attributes + (weight, posture), or underlining. + + http://www.gnu.org/software/gettext/
package/libtextstyle/libtextstyle.hash new file +6 -0
@@ -0,0 +1,6 @@ +# From https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html +sha1 62f4a6a2fd5f80bfd0e66c497a04094fa3e07b90 gettext-0.20.1.tar.xz + +# Locally calculated +sha256 53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800 gettext-0.20.1.tar.xz +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING
package/libtextstyle/libtextstyle.mk new file +28 -0
@@ -0,0 +1,28 @@ +################################################################################ +# +# libtextstyle +# +################################################################################ + +LIBTEXTSTYLE_VERSION = 0.20.1 +LIBTEXTSTYLE_SITE = $(BR2_GNU_MIRROR)/gettext +LIBTEXTSTYLE_SOURCE = gettext-$(LIBTEXTSTYLE_VERSION).tar.xz +LIBTEXTSTYLE_INSTALL_STAGING = YES +LIBTEXTSTYLE_LICENSE = GPL-3.0+ +LIBTEXTSTYLE_LICENSE_FILES = COPYING +LIBTEXTSTYLE_SUBDIR = libtextstyle +HOST_LIBTEXTSTYLE_SUBDIR = libtextstyle + +# gettext-tools require libtextstyle.m4 +define LIBTEXTSTYLE_INSTALL_M4 + $(INSTALL) -D -m 0755 $(@D)/libtextstyle/m4/libtextstyle.m4 $(ACLOCAL_DIR)/libtextstyle.m4 +endef +LIBTEXTSTYLE_POST_INSTALL_STAGING_HOOKS += LIBTEXTSTYLE_INSTALL_M4 + +define HOST_LIBTEXTSTYLE_INSTALL_M4 + $(INSTALL) -D -m 0755 $(@D)/libtextstyle/m4/libtextstyle.m4 $(ACLOCAL_HOST_DIR)/libtextstyle.m4 +endef +HOST_LIBTEXTSTYLE_POST_INSTALL_HOOKS += HOST_LIBTEXTSTYLE_INSTALL_M4 + +$(eval $(autotools-package)) +$(eval $(host-autotools-package))
Signature · 1 line
2.24.1
PATCH v2 2/3 package/gettext-gnu: bump version to 0.20.1
From: Adam Duskett <[email protected]>
Other changes:
- Update license hash due to http -> https URL changes.
- Depend on libtextstyle.
- Update 0001-error_print_progname.patch to apply cleanly.
- Remove upstream 0002-Update-after-gnulib-changed.patch
- Add 0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch which allows gettext-tools to build with an external libtextstyle.
Tested under Debian 8 with test-pkg -a:
44 builds, 5 skipped, 0 build failed, 0 legal-info failed
--- .../0001-error_print_progname.patch | 14 +- .../0002-Update-after-gnulib-changed.patch | 86 ----------- ...-buld-gettext-tools-seperately-part1.patch | 142 ++++++++++++++++++ package/gettext-gnu/Config.in | 1 + package/gettext-gnu/gettext-gnu.hash | 11 +- package/gettext-gnu/gettext-gnu.mk | 9 +- 6 files changed, 164 insertions(+), 99 deletions(-) delete mode 100644 package/gettext-gnu/0002-Update-after-gnulib-changed.patch create mode 100644 package/gettext-gnu/0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch
package/gettext-gnu/0001-error_print_progname.patch +10 -4
@@ -1,6 +1,11 @@ ---- gettext-0.16.1.oorig/gettext-tools/gnulib-lib/error.h 2006-11-27 18:14:50.000000000 +0100 -+++ gettext-0.16.1/gettext-tools/gnulib-lib/error.h 2007-06-20 13:29:32.000000000 +0200 -@@ -50,7 +50,10 @@ extern void error_at_line (int __status, +[Updated to apply cleanly with 0.20.1] +Signed-off-by: Adam Duskett <[email protected]> +--- +diff --git a/gettext-tools/gnulib-lib/error.h b/gettext-tools/gnulib-lib/error.h +index 61771cc..4221684 100644 +--- a/gettext-tools/gnulib-lib/error.h ++++ b/gettext-tools/gnulib-lib/error.h +@@ -68,7 +68,10 @@ extern void error_at_line (int __status, int __errnum, const char *__fname, /* If NULL, error will flush stdout, then print on stderr the program name, a colon and a space. Otherwise, error will call this function without parameters instead. */
@@ -10,5 +15,6 @@ +#endif +void (*error_print_progname) (void); - /* This variable is incremented each time `error' is called. */ + /* This variable is incremented each time 'error' is called. */ extern DLL_VARIABLE unsigned int error_message_count; +--
package/gettext-gnu/0002-Update-after-gnulib-changed.patch deleted +0 -86
86 lines not on this page · raw message
package/gettext-gnu/0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch new file +142 -0
142 lines not on this page · raw message
package/gettext-gnu/Config.in +1 -0
@@ -2,6 +2,7 @@ config BR2_PACKAGE_GETTEXT_GNU bool depends on BR2_USE_WCHAR select BR2_PACKAGE_HAS_GETTEXT + select BR2_PACKAGE_LIBTEXTSTYLE help The GNU `gettext' utilities are a set of tools that provide a framework to help other GNU packages produce multi-lingual
package/gettext-gnu/gettext-gnu.hash +6 -5
@@ -1,6 +1,7 @@ -# From http://lists.gnu.org/archive/html/bug-gettext/2016-06/msg00008.html -md5 df3f5690eaa30fd228537b00cb7b7590 gettext-0.19.8.1.tar.xz -sha1 e0fe90ede22f7f16bbde7bdea791a835f2773fc9 gettext-0.19.8.1.tar.xz -# License files, locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +# From https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html +sha1 62f4a6a2fd5f80bfd0e66c497a04094fa3e07b90 gettext-0.20.1.tar.xz + +# Locally calculated +sha256 53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800 gettext-0.20.1.tar.xz +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING sha256 3fe5361f24b7c49ba12911c08f5a33f9cb18871d95d9fb881f5b8a4793e04288 gettext-runtime/intl/COPYING.LIB
package/gettext-gnu/gettext-gnu.mk +5 -4
@@ -4,7 +4,7 @@ # ################################################################################ -GETTEXT_GNU_VERSION = 0.19.8.1 +GETTEXT_GNU_VERSION = 0.20.1 GETTEXT_GNU_SITE = $(BR2_GNU_MIRROR)/gettext GETTEXT_GNU_SOURCE = gettext-$(GETTEXT_GNU_VERSION).tar.xz GETTEXT_GNU_INSTALL_STAGING = YES
@@ -13,10 +13,10 @@ GETTEXT_GNU_LICENSE_FILES = COPYING gettext-runtime/intl/COPYING.LIB # 0002-Update-after-gnulib-changed.patch GETTEXT_GNU_AUTORECONF = YES GETTEXT_GNU_PROVIDES = gettext -GETTEXT_GNU_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) +GETTEXT_GNU_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) libtextstyle # Avoid using the bundled subset of libxml2 -HOST_GETTEXT_GNU_DEPENDENCIES = host-libxml2 +HOST_GETTEXT_GNU_DEPENDENCIES = host-libxml2 host-libtextstyle GETTEXT_GNU_CONF_OPTS += \ --disable-libasprintf \
@@ -38,7 +38,8 @@ HOST_GETTEXT_GNU_CONF_OPTS = \ --disable-native-java \ --disable-csharp \ --disable-relocatable \ - --without-emacs + --without-emacs \ + --with-installed-libtextstyle # Force the build of libintl, even if the C library provides a stub # gettext implementation
Signature · 1 line
2.24.1
PATCH v2 2/3 package/gettext-gnu: bump version to 0.20.1
Am Thu, 12 Mar 2020 13:10:02 -0700 schrieb
aduskett-Re5JQEeQqe8AvxtiuMwx3w:
Quoted 2 lines
# 0002-Update-after-gnulib-changed.patch
GETTEXT_GNU_AUTORECONF= YES
Hi Adam,
please update the comment to reflect the new patch file name:
0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch
Regards, Bernd
PATCH v2 3/3 package/gettext-tiny: support gettext 0.20.1
In reply to aduskett at gmail.comFrom: Adam Duskett <[email protected]>
Other changes:
- Update gettext to 0.20.1 and the respective hashes.
- Remove share/gettext-tiny/m4/lock.m4 from GETTEXT_TINY_EXTRA_GETTEXT_FILES and the install list, as this file was removed in commit 8c2bfdbddb13a480d88ceac4ab0e5886bda957cb.
Tested with test-pkg -p gettext-tiny in Debian 10 and Centos 7
br-arm-full [1/6]: OK
br-arm-cortex-a9-glibc [2/6]: OK
br-arm-cortex-m4-full [3/6]: OK
br-x86-64-musl [4/6]: OK
br-arm-full-static [5/6]: OK
sourcery-arm [6/6]: OK---
Changes v1 -> v2:
- Do not bump gettext-tiny's version, only gettext-gnu.
package/gettext-tiny/gettext-tiny.hash | 7 +++---- package/gettext-tiny/gettext-tiny.mk | 4 +--- 2 files changed, 4 insertions(+), 7 deletions(-)
package/gettext-tiny/gettext-tiny.hash +3 -4
@@ -1,7 +1,6 @@ # Locally Computed: sha256 efc740007c82a9b3a0d382fb50d212fa7dc0beddb9695409ee79684f9f2124b2 gettext-tiny-adaa9c64921e80f2b8dd3610ffb508618b9204f3.tar.gz sha256 b57aa4fdc1c614c28d41c1e2d5c4090935964c5f86291ba7d1c99ffd1d698b34 LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 extra/COPYING -# From http://lists.gnu.org/archive/html/bug-gettext/2016-06/msg00008.html -md5 df3f5690eaa30fd228537b00cb7b7590 gettext-0.19.8.1.tar.xz -sha1 e0fe90ede22f7f16bbde7bdea791a835f2773fc9 gettext-0.19.8.1.tar.xz +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b extra/COPYING +# From https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html +sha1 62f4a6a2fd5f80bfd0e66c497a04094fa3e07b90 gettext-0.20.1.tar.xz
package/gettext-tiny/gettext-tiny.mk +1 -3
@@ -14,12 +14,11 @@ HOST_GETTEXT_TINY_LICENSE_FILES = LICENSE extra/COPYING GETTEXT_TINY_PROVIDES = gettext # needed for gettextize -GETTEXT_TINY_ARCHIVE_VERSION = 0.19.8 +GETTEXT_TINY_ARCHIVE_VERSION = 0.20.1 GETTEXT_TINY_EXTRA_GETTEXT_FILES = \ gettext-tools/misc/gettextize.in \ gettext-tools/po/Makevars.template \ - gettext-runtime/m4/lock.m4 \ gettext-runtime/po/boldquot.sed \ gettext-runtime/po/en at boldquot.header \ gettext-runtime/po/en at quot.header \
@@ -83,7 +82,6 @@ define HOST_GETTEXT_TINY_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/gettextize $(HOST_DIR)/bin/gettextize $(INSTALL) -m 0644 -D $(@D)/build-aux/config.rpath $(HOST_DIR)/share/gettext-tiny/config.rpath - $(INSTALL) -m 0644 -D $(@D)/extra/lock.m4 $(HOST_DIR)/share/gettext-tiny/m4/lock.m4 $(INSTALL) -m 0644 -D $(@D)/extra/Makefile.in.in $(HOST_DIR)/share/gettext-tiny/po/Makefile.in.in $(INSTALL) -m 0644 -D $(@D)/extra/boldquot.sed $(HOST_DIR)/share/gettext-tiny/po/boldquot.sed $(INSTALL) -m 0644 -D $(@D)/extra/en at boldquot.header $(HOST_DIR)/share/gettext-tiny/po/en at boldquot.header
Signature · 1 line
2.24.1
PATCH v2 1/3 package/libtextstyle: new package
In reply to aduskett at gmail.comHi Adam,
Quoted 11 lines · aduskett at gmail.com
From: Adam Duskett <[email protected]>
This library provides an easy way to add styling to programs that produce output to a console or terminal emulator window.
libtextstyle is for you if your application produces text that is more readable when it is accompanied with styling information, such as color, font attributes (weight, posture), or underlining.
Newer versions of gettext-gnu require this package.
Quoted 8 lines
Tested with test-pkg -p gettext-tiny in Debian 10 and Centos 7
br-arm-full [1/6]: OK br-arm-cortex-a9-glibc [2/6]: OK br-arm-cortex-m4-full [3/6]: OK br-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK
I think it would be good to also test build of some amount of packages which requires gettext-gnu/gettext-tiny.
Quoted 110 lines
Signed-off-by Adam Duskett <[email protected]>--- DEVELOPERS | 1 + package/Config.in | 1 + package/libtextstyle/Config.in | 14 +++++++++++++ package/libtextstyle/libtextstyle.hash | 6 ++++++ package/libtextstyle/libtextstyle.mk | 28 ++++++++++++++++++++++++++ 5 files changed, 50 insertions(+) create mode 100644 package/libtextstyle/Config.in create mode 100644 package/libtextstyle/libtextstyle.hash create mode 100644 package/libtextstyle/libtextstyle.mkDEVELOPERS +1
-0@@ -47,6 +47,7 @@ F: package/libressl/ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ +F: package/libtextstyle/ F: package/libwebsockets/ F: package/mender-grubenv/ F: package/nginx-naxsi/package/Config.in +1
-0@@ -1889,6 +1889,7 @@ menu "Text and terminal handling" source "package/libiconv/Config.in" source "package/libunistring/Config.in" source "package/linenoise/Config.in" + source "package/libtextstyle/Config.in" source "package/ncurses/Config.in" source "package/newt/Config.in" source "package/oniguruma/Config.in"package/libtextstyle/Config.in new file +14
-0@@ -0,0 +1,14 @@ +config BR2_PACKAGE_LIBTEXTSTYLE + bool "libtextstyle" + depends on BR2_USE_WCHAR + help + This library provides an easy way to add styling to + programs that produce output to a console or terminal + emulator window. + + libtextstyle is for you if your application produces text + that is more readable when it is accompanied with styling + information, such as color, font attributes + (weight, posture), or underlining. + + http://www.gnu.org/software/gettext/package/libtextstyle/libtextstyle.hash new file +6
-0@@ -0,0 +1,6 @@ +# From https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html +sha1 62f4a6a2fd5f80bfd0e66c497a04094fa3e07b90 gettext-0.20.1.tar.xz + +# Locally calculated +sha256 53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800 gettext-0.20.1.tar.xz +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYINGpackage/libtextstyle/libtextstyle.mk new file +28
-0@@ -0,0 +1,28 @@ +################################################################################ +# +# libtextstyle +# +################################################################################ + +LIBTEXTSTYLE_VERSION = 0.20.1 +LIBTEXTSTYLE_SITE = $(BR2_GNU_MIRROR)/gettext +LIBTEXTSTYLE_SOURCE = gettext-$(LIBTEXTSTYLE_VERSION).tar.xz +LIBTEXTSTYLE_INSTALL_STAGING = YES +LIBTEXTSTYLE_LICENSE = GPL-3.0+ +LIBTEXTSTYLE_LICENSE_FILES = COPYING +LIBTEXTSTYLE_SUBDIR = libtextstyle +HOST_LIBTEXTSTYLE_SUBDIR = libtextstyle + +# gettext-tools require libtextstyle.m4 +define LIBTEXTSTYLE_INSTALL_M4 + $(INSTALL) -D -m 0755 $(@D)/libtextstyle/m4/libtextstyle.m4 $(ACLOCAL_DIR)/libtextstyle.m4 +endef +LIBTEXTSTYLE_POST_INSTALL_STAGING_HOOKS += LIBTEXTSTYLE_INSTALL_M4 + +define HOST_LIBTEXTSTYLE_INSTALL_M4 + $(INSTALL) -D -m 0755 $(@D)/libtextstyle/m4/libtextstyle.m4 $(ACLOCAL_HOST_DIR)/libtextstyle.m4 +endef +HOST_LIBTEXTSTYLE_POST_INSTALL_HOOKS += HOST_LIBTEXTSTYLE_INSTALL_M4 + +$(eval $(autotools-package)) +$(eval $(host-autotools-package))Signature · 6 lines
2.24.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Regards,
Vadym Kochan
PATCH v2 1/3 package/libtextstyle: new package
In reply to aduskett at gmail.comQuoted 13 lines · On Thu, 12 Mar 2020 13:10:01 -0700 aduskett at gmail.com wrote:
From: Adam Duskett <[email protected]>
This library provides an easy way to add styling to programs that produce output to a console or terminal emulator window.
libtextstyle is for you if your application produces text that is more readable when it is accompanied with styling information, such as color, font attributes (weight, posture), or underlining.
Newer versions of gettext-gnu require this package.
Tested with test-pkg -p gettext-tiny in Debian 10 and Centos 7
Quoted 8 lines
br-arm-full [1/6]: OK br-arm-cortex-a9-glibc [2/6]: OK br-arm-cortex-m4-full [3/6]: OK br-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OKSigned-off-by Adam Duskett <[email protected]>
I'm confused. Why do we need a separate for this, if this is part of gettext-gnu, and needed only by gettext-gnu ?
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 1/3 package/libtextstyle: new package
Thomas, All,
On 2020-03-14 15:25 +0100, Thomas Petazzoni spake thusly:
Quoted 23 lines
Quoted 20 lines · On Thu, 12 Mar 2020 13:10:01 -0700 aduskett at gmail.com wrote:
From: Adam Duskett <[email protected]>
This library provides an easy way to add styling to programs that produce output to a console or terminal emulator window.
libtextstyle is for you if your application produces text that is more readable when it is accompanied with styling information, such as color, font attributes (weight, posture), or underlining.
Newer versions of gettext-gnu require this package.
Tested with test-pkg -p gettext-tiny in Debian 10 and Centos 7
br-arm-full [1/6]: OK br-arm-cortex-a9-glibc [2/6]: OK br-arm-cortex-m4-full [3/6]: OK br-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK
Quoted 4 lines
Quoted 1 line
Signed-off-by Adam Duskett <[email protected]>I'm confused. Why do we need a separate for this, if this is part of gettext-gnu, and needed only by gettext-gnu ?
So, for the records, in cae you missed the IRC discussion:
- our gettext-gnu package has: HOST_GETTEXT_GNU_SUBDIR = gettext-tools so only the gettext-tools sub-directory is configured and built
- gettext-tools need libtextstyle, but that is not getting configured nor built
So we have three options:
- add hooks to configure + build libtextstyles as a pre-configure hook in gettext-gnu, and install it in a pre-install hook,
- add a separate package for libtextstyle,
- revert to building the whole of gettext.
Adam did some timings with BR2_JLEVEL=4, and he got:
- just getext-tools: 38.86s user 22.13s system 124% cpu 49.035 total - just libtextstyles: 40.78s user 14.57s system 146% cpu 37.817 total - whole of gettext: 203.18s user 122.87s system 161% cpu 3:22.39 total
So, the whole of gettext is still ~4x the time to build the tools and libtextstyle. This is not acceptable...
I think hacking the build of libtextstyles with hooks is not gonna fly far either.
So we're back at a separate package as the only viable solution, I'm afraid.
Does that make sense?
Of course, we need to write that down in a commit log somewhere... ;-)
Regards,
Yann E. MORIN.
Quoted 9 lines
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'