From patchwork Wed Feb 12 22:51:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1237135 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=EMaOPw1d; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48HvzJ4Vh8z9s1x for ; Thu, 13 Feb 2020 09:52:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D30DE87D75; Wed, 12 Feb 2020 22:52:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y-xAePlOTLFR; Wed, 12 Feb 2020 22:52:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id EF84A86132; Wed, 12 Feb 2020 22:52:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5A2DF1BF421 for ; Wed, 12 Feb 2020 22:52:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2B5CA86974 for ; Wed, 12 Feb 2020 22:52:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sJ55H3yvOdQI for ; Wed, 12 Feb 2020 22:52:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4A2318696A for ; Wed, 12 Feb 2020 22:52:05 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id 4so1956190pfz.9 for ; Wed, 12 Feb 2020 14:52:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9q4zQDmlAwWAEutCF6OBVHRkRAlYEsGiDR+UYxZ6hkY=; b=EMaOPw1dX214W7xA2gBDIypPEFX4s6u5vVoEWip9ZduE2F3rvdRxLijbJfnmQYDgFv TDP3FWTwV2QUn74fqSMTo7Z8Mm8HfbtKQ/pCMeHmB5aPJKQFU47w7seTrJSZ8rp3i0s6 hFngPjCx8N2LvpnymOXXVJish2Rk8bKBWXQkWCh1M1xWyN5I/VByLgzVzNs0LO4AxPyu IznssjBpPVSQHwiU1yf7cCiI8UPf8slrj38Kzvc1Efux5o2P/xYpesMD9u0P0bb5vrdw S0Q7rIeWg6g4io9ESIgoreW8EVcH+zGedD3IjCd/tiMUuDfxAEEE/hzV9KlnAkTLJH0Z BFCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9q4zQDmlAwWAEutCF6OBVHRkRAlYEsGiDR+UYxZ6hkY=; b=YlKpgq2UKidVdjAo7loo9YT3yPETGPdfJyZ5pqJpaqAxbTBP6Iw/pg0+16Q1QJ1vHI 0QdRV8yb/C4dmEoc+YCt9deE1AOEO2PWYA4jJEbkJRX7BitVRqs+PiQY5Zvo+E6LuRgu mp1SKYAIeZHOSI3AIudj5R4xxtFNqj33BzyZr9/RvI2iN64qwxWvp0DKFL/mf8PhKAuf RS2U+kDCm70e4UUzwb04A4pVoJH9VJ+RPgyrzW3FOn9eN4gC7teHAOsJ971cVm7g2y+E /CGlpOqoj+W3lZvO7ILH2ZjTPxTKlNPzdA2gb9dwRslQlrs5FkuRNkK9OyesAxdqpGSy FL5Q== X-Gm-Message-State: APjAAAVi3TI8m5a07US3AmGC+Ur7qNK7mB9GzrxEUuujzFbYZzlBFNko lGadl4EgaCuUrtBR3maQLBvInGNMZBw= X-Google-Smtp-Source: APXvYqzMqdtjLr7r7TyYvQu+9OwilXEQTIcaAQVLdC+7qNWhXySfYG7Zl+Uxho4PqWx1hfTet/F0iw== X-Received: by 2002:aa7:96b0:: with SMTP id g16mr10142642pfk.99.1581547924541; Wed, 12 Feb 2020 14:52:04 -0800 (PST) Received: from localhost.localdomain ([47.149.8.172]) by smtp.gmail.com with ESMTPSA id dw10sm267678pjb.11.2020.02.12.14.52.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2020 14:52:03 -0800 (PST) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Wed, 12 Feb 2020 14:51:59 -0800 Message-Id: <20200212225201.1919594-1-aduskett@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/3] package/libtextstyle: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett 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 Signed-off-by: Adam Duskett --- 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 diff --git a/DEVELOPERS b/DEVELOPERS index cb13035bc4..33190d79f9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -46,6 +46,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/ diff --git a/package/Config.in b/package/Config.in index dfa3f34b9d..481f619016 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1884,6 +1884,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" diff --git a/package/libtextstyle/Config.in b/package/libtextstyle/Config.in new file mode 100644 index 0000000000..6858be5bf6 --- /dev/null +++ b/package/libtextstyle/Config.in @@ -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/ diff --git a/package/libtextstyle/libtextstyle.hash b/package/libtextstyle/libtextstyle.hash new file mode 100644 index 0000000000..5c5aee85bf --- /dev/null +++ b/package/libtextstyle/libtextstyle.hash @@ -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 diff --git a/package/libtextstyle/libtextstyle.mk b/package/libtextstyle/libtextstyle.mk new file mode 100644 index 0000000000..e5b5706085 --- /dev/null +++ b/package/libtextstyle/libtextstyle.mk @@ -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)) From patchwork Wed Feb 12 22:52:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1237136 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=BJT47vnN; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48HvzL4vjHz9s1x for ; Thu, 13 Feb 2020 09:52:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2E47686B6B; Wed, 12 Feb 2020 22:52:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8JjYFrf8TctO; Wed, 12 Feb 2020 22:52:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id EE89D86B38; Wed, 12 Feb 2020 22:52:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A19AB1BF421 for ; Wed, 12 Feb 2020 22:52:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9E2BA86974 for ; Wed, 12 Feb 2020 22:52:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y+t6kU52Rbtq for ; Wed, 12 Feb 2020 22:52:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by whitealder.osuosl.org (Postfix) with ESMTPS id 47B938696A for ; Wed, 12 Feb 2020 22:52:07 +0000 (UTC) Received: by mail-pl1-f169.google.com with SMTP id d9so1503614plo.11 for ; Wed, 12 Feb 2020 14:52:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FlDdl2mEht9meqr/amlxU6qgRL+NZKBcgPa/gPXB8H8=; b=BJT47vnNkZMM1CFi6vGRfg18TTHynGlbCDc3oLj+Z2v4vTW+tBHBiRhnzTAYqNCg3v rf7k26mi2l9O6k7dMGoSP9okZLhJwh/OoNYgo22DK6uujoy6vvJa/R/R7BVIvcK+353J xpqNd/2nfUvgBcSOlhvYZ1xxe2kCq3PZelBGsJE0Z5GmUVUIn+zSnDw90dibOb295IOF 1jAUGyAwGm/gBLjMj/X/egzcD4rwkq42QNEunifwDr/DKgHDMe+SYp/qDbNZP8lCwodV NRpB58YB8VjZTMTxV6pWDdJhp0dGI8zVLVk/YIH1KxVhO3EeqL1WHMio5iEiGw+IykWb PbVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FlDdl2mEht9meqr/amlxU6qgRL+NZKBcgPa/gPXB8H8=; b=ZkhVuawxTuWDhMrrht8KgwwP1iDaSeVpSnG15PIvwUpkZIq8C7du7XTCBkT2s8tkB2 WnGDts5pHjCJ2wbPtPkHX5PjzouF1CFmh0Voq8ZswS2UT0WanqOl/wp9UXNjjG+R3P6v 4R7D6Ehd4fCJU4fveHtDZ7f36/K6r/5pmtu/eUtJlbk7N5n6pOqFUkkAfhcyp/Rnec2e usCB2MJDgsT7Vgz0qYXVGmVehVHZQ+pbCnxf0Pq3E39oedsCOTIFo2BdFGSNGBuvuAfZ fr32c1z2BlSTiBDgJLJq/Et4X/L5T5rYiNiuP9MISoAkpjRDH29LU1aiWpuq7OcA3CoP iYjQ== X-Gm-Message-State: APjAAAXXOmvD04aFpQavNLNE+rqGV0s+WdmOCoOy8aYMN43xlGvfQslQ pEYKcfE8cmk/gadlkTFxaLHM8WKD5Do= X-Google-Smtp-Source: APXvYqyMt1DjgjetuXCdPSz7VBqSkgqsyFnjjljRdSUC1i95JnYoisudoQ+rE0QkdhZWdneobtfo6g== X-Received: by 2002:a17:902:a715:: with SMTP id w21mr10618892plq.244.1581547926131; Wed, 12 Feb 2020 14:52:06 -0800 (PST) Received: from localhost.localdomain ([47.149.8.172]) by smtp.gmail.com with ESMTPSA id dw10sm267678pjb.11.2020.02.12.14.52.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2020 14:52:05 -0800 (PST) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Wed, 12 Feb 2020 14:52:00 -0800 Message-Id: <20200212225201.1919594-2-aduskett@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200212225201.1919594-1-aduskett@gmail.com> References: <20200212225201.1919594-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/3] package/gettext-gnu: bump version to 0.20.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett 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 Signed-off-by: Adam Duskett --- .../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 diff --git a/package/gettext-gnu/0001-error_print_progname.patch b/package/gettext-gnu/0001-error_print_progname.patch index 189d28b576..7e1d3c55cf 100644 --- a/package/gettext-gnu/0001-error_print_progname.patch +++ b/package/gettext-gnu/0001-error_print_progname.patch @@ -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 +--- +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; +-- diff --git a/package/gettext-gnu/0002-Update-after-gnulib-changed.patch b/package/gettext-gnu/0002-Update-after-gnulib-changed.patch deleted file mode 100644 index 5f5e5f6c25..0000000000 --- a/package/gettext-gnu/0002-Update-after-gnulib-changed.patch +++ /dev/null @@ -1,86 +0,0 @@ -From a6f9caf8cc7614665d1be694485dd7bc30399e0f Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Tue, 16 May 2017 00:27:57 +0200 -Subject: [PATCH] Update after gnulib changed. - -For buildroot we only need to update wint_t.m4 to fix autoreconf with -certain packages which already contain the updated version of this file. -Otherwise autoreconf will break: - -http://git.net/ml/bug-gnulib-gnu/2017-01/msg00067.html -https://git.busybox.net/buildroot/commit/package/wget?id=c36f0d65ad63589f1b21833ef53d429c018b6f8a - -Patch backported from upstream commit: -http://git.savannah.gnu.org/cgit/gettext.git/commit/?id=a6f9caf8cc7614665d1be694485dd7bc30399e0f - -Needed for coreutils bump to 8.27 - -Signed-off-by: Bernd Kuhls - -diff --git a/gettext-runtime/m4/wint_t.m4 b/gettext-runtime/m4/wint_t.m4 -index 8ff2a5b5a..d30b8bcf8 100644 ---- a/gettext-runtime/m4/wint_t.m4 -+++ b/gettext-runtime/m4/wint_t.m4 -@@ -1,11 +1,12 @@ --# wint_t.m4 serial 5 (gettext-0.18.2) --dnl Copyright (C) 2003, 2007-2016 Free Software Foundation, Inc. -+# wint_t.m4 serial 7 -+dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - dnl From Bruno Haible. --dnl Test whether has the 'wint_t' type. -+dnl Test whether has the 'wint_t' type and whether gnulib's -+dnl or would, if present, override 'wint_t'. - dnl Prerequisite: AC_PROG_CC - - AC_DEFUN([gt_TYPE_WINT_T], -@@ -28,5 +29,46 @@ AC_DEFUN([gt_TYPE_WINT_T], - [gt_cv_c_wint_t=no])]) - if test $gt_cv_c_wint_t = yes; then - AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.]) -+ -+ dnl Determine whether gnulib's or would, if present, -+ dnl override 'wint_t'. -+ AC_CACHE_CHECK([whether wint_t is too small], -+ [gl_cv_type_wint_t_too_small], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([[ -+/* Tru64 with Desktop Toolkit C has a bug: must be included before -+ . -+ BSD/OS 4.0.1 has a bug: , and must be -+ included before . */ -+#if !(defined __GLIBC__ && !defined __UCLIBC__) -+# include -+# include -+# include -+#endif -+#include -+ int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; -+ ]])], -+ [gl_cv_type_wint_t_too_small=no], -+ [gl_cv_type_wint_t_too_small=yes])]) -+ if test $gl_cv_type_wint_t_too_small = yes; then -+ GNULIB_OVERRIDES_WINT_T=1 -+ else -+ GNULIB_OVERRIDES_WINT_T=0 -+ fi -+ else -+ GNULIB_OVERRIDES_WINT_T=0 -+ fi -+ AC_SUBST([GNULIB_OVERRIDES_WINT_T]) -+]) -+ -+dnl Prerequisites of the 'wint_t' override. -+AC_DEFUN([gl_TYPE_WINT_T_PREREQ], -+[ -+ AC_CHECK_HEADERS_ONCE([crtdefs.h]) -+ if test $ac_cv_header_crtdefs_h = yes; then -+ HAVE_CRTDEFS_H=1 -+ else -+ HAVE_CRTDEFS_H=0 - fi -+ AC_SUBST([HAVE_CRTDEFS_H]) - ]) diff --git a/package/gettext-gnu/0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch b/package/gettext-gnu/0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch new file mode 100644 index 0000000000..5334a36bb7 --- /dev/null +++ b/package/gettext-gnu/0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch @@ -0,0 +1,142 @@ +From e4b3a3f56fa6fc2a51769e286545f0631bb4837c Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Sat, 18 May 2019 23:33:06 +0200 +Subject: [PATCH] build: Restore the ability to build gettext-tools separately, part 1. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reported by Hanspeter Niederstrasser +in . + +Code based on patch by Miguel Ángel Arruga Vivas . + +* autogen.sh: Copy libtextstyle.m4 for use by gettext-tools. +* gettext-tools/configure.ac: New option --with-installed-libtextstyle. +(USE_INSTALLED_LIBTEXTSTYLE): New conditional. +* gettext-tools/src/Makefile.am (textstyle.h): Disable rule if +USE_INSTALLED_LIBTEXTSTYLE is true. +(LT_LIBTEXTSTYLE): New variable. +(libgettextsrc_la_LDFLAGS): Use it instead of hardcoding a relative filename of +libtextstyle.la. +* configure.ac: Filter out --with-installed-libtextstyle from inherited --help +output. +* Makefile.am (distcheck-hook): Compare different copies of libtextstyle.m4. +* PACKAGING: Document that gettext-tools's configure needs to be invoked with +--with-installed-libtextstyle. + +Upstream-status: committed. +https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commitdiff;h=e4b3a3f56fa6fc2a51769e286545f0631bb4837c + +Signed-off-by: Bruno Haible +[Backported to 0.20.1] +Signed-off-by: Adam Duskett +--- + PACKAGING | 2 +- + autogen.sh | 1 + + configure.ac | 2 +- + gettext-tools/configure.ac | 16 ++++++++++++++++ + gettext-tools/src/Makefile.am | 8 +++++++- + 5 files changed, 26 insertions(+), 3 deletions(-) + +diff --git a/PACKAGING b/PACKAGING +index a8ce979..52b80ac 100644 +--- a/PACKAGING ++++ b/PACKAGING +@@ -42,7 +42,7 @@ The 'libtextstyle' binary package can be installed by doing + The 'gettext-tools' binary package can be installed by doing + + cd gettext-tools +- ./configure ++ ./configure --with-installed-libtextstyle + make + make install + +diff --git a/autogen.sh b/autogen.sh +index 5c28b6f..2ccf373 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -268,6 +268,7 @@ if ! $skip_gnulib; then + $GNULIB_TOOL --dir=gettext-tools --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --tests-base=gnulib-tests --makefile-name=Makefile.gnulib --libtool --with-tests --local-dir=gnulib-local --local-symlink \ + --import --avoid=array-list-tests --avoid=linkedhash-list-tests --avoid=hash-tests --avoid=fdutimensat-tests --avoid=futimens-tests --avoid=utime-tests --avoid=utimens-tests --avoid=utimensat-tests \ + `for m in $GNULIB_MODULES_TOOLS_LIBUNISTRING_TESTS; do echo --avoid=$m; done` $GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES $GNULIB_MODULES_TOOLS_OTHER || exit $? ++ $GNULIB_TOOL --copy-file m4/libtextstyle.m4 gettext-tools/gnulib-m4/libtextstyle.m4 || exit $? + # In gettext-tools/libgrep: + GNULIB_MODULES_TOOLS_FOR_LIBGREP=' + mbrlen +diff --git a/configure.ac b/configure.ac +index 38db6fd..0c84bdd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -49,7 +49,7 @@ AC_CANONICAL_HOST + dnl Optional Features: AC_ARG_ENABLE calls + dnl Optional Packages: AC_ARG_WITH calls + dnl Some influential environment variables: AC_ARG_VAR calls +-esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd libtextstyle && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | sed -f build-aux/ac-help.sed ]) ++esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd libtextstyle && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; { cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | grep -v installed.libtextstyle; } | sed -f build-aux/ac-help.sed ]) + + AC_CONFIG_FILES([Makefile]) + +diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac +index cf1dd73..a6816b8 100644 +--- a/gettext-tools/configure.ac ++++ b/gettext-tools/configure.ac +@@ -121,6 +121,22 @@ AM_CONDITIONAL([PACKAGE_IS_GETTEXT_TOOLS], [true]) + AM_CONDITIONAL([PRELOADABLE_LIBINTL], + [test $USE_INCLUDED_LIBINTL = no && test $GLIBC2 = yes]) + ++dnl This option allows to build gettext-tools without (re)building libtextstyle. ++AC_ARG_WITH([installed-libtextstyle], ++ [AS_HELP_STRING([--with-installed-libtextstyle], ++ [Use an already installed libtextstyle.])], ++ [gt_use_installed_libtextstyle=$withval], ++ [gt_use_installed_libtextstyle=no]) ++if test "$gt_use_installed_libtextstyle" != no; then ++ gl_LIBTEXTSTYLE ++else ++ test -f ../libtextstyle/Makefile || { ++ AC_MSG_ERROR([When building the gettext-tools package without building the entire gettext package, you need to pass the --with-installed-libtextstyle option to configure.]) ++ } ++fi ++AM_CONDITIONAL([USE_INSTALLED_LIBTEXTSTYLE], ++ [test "$gt_use_installed_libtextstyle" != no]) ++ + dnl This line internationalizes the bison generated parsers. + BISON_I18N + +diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am +index b98b7ab..af3dcee 100644 +--- a/gettext-tools/src/Makefile.am ++++ b/gettext-tools/src/Makefile.am +@@ -250,6 +250,9 @@ cldr_plurals_SOURCES = cldr-plural.y cldr-plural-exp.c cldr-plurals.c + cldr_plurals_CFLAGS = $(AM_CFLAGS) $(INCXML) + cldr_plurals_LDADD = libgettextsrc.la $(LDADD) + ++if USE_INSTALLED_LIBTEXTSTYLE ++LT_LIBTEXTSTYLE = @LTLIBTEXTSTYLE@ ++else + # How to get the include files of libtextstyle. + textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h: + here=`pwd`; \ +@@ -257,6 +260,9 @@ textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h: + $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here" + BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h + MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h ++# Where to find the built libtextstyle library. ++LT_LIBTEXTSTYLE = ../../libtextstyle/lib/libtextstyle.la ++endif + + # How to build libgettextsrc.la. + # Need ../gnulib-lib/libgettextlib.la. +@@ -268,7 +274,7 @@ MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyl + # use iconv(). + libgettextsrc_la_LDFLAGS = \ + -release @VERSION@ \ +- ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) ../../libtextstyle/lib/libtextstyle.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined ++ ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) $(LT_LIBTEXTSTYLE) @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined + + # OS/2 does not support a DLL name longer than 8 characters. + if OS2 +-- +2.24.1 + diff --git a/package/gettext-gnu/Config.in b/package/gettext-gnu/Config.in index 27e7a3da4c..85ddb62788 100644 --- a/package/gettext-gnu/Config.in +++ b/package/gettext-gnu/Config.in @@ -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 diff --git a/package/gettext-gnu/gettext-gnu.hash b/package/gettext-gnu/gettext-gnu.hash index 5a621ae2d3..4c17fb3e04 100644 --- a/package/gettext-gnu/gettext-gnu.hash +++ b/package/gettext-gnu/gettext-gnu.hash @@ -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 diff --git a/package/gettext-gnu/gettext-gnu.mk b/package/gettext-gnu/gettext-gnu.mk index 28662e0dec..937b0f5262 100644 --- a/package/gettext-gnu/gettext-gnu.mk +++ b/package/gettext-gnu/gettext-gnu.mk @@ -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 From patchwork Wed Feb 12 22:52:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1237137 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ApscWOGe; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48HvzM4vbGz9s3x for ; Thu, 13 Feb 2020 09:52:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A102686132; Wed, 12 Feb 2020 22:52:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qB9USILBgS-M; Wed, 12 Feb 2020 22:52:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DDB768618C; Wed, 12 Feb 2020 22:52:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id DF5301BF421 for ; Wed, 12 Feb 2020 22:52:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DB8D520528 for ; Wed, 12 Feb 2020 22:52:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7FLS6pDYAtYZ for ; Wed, 12 Feb 2020 22:52:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by silver.osuosl.org (Postfix) with ESMTPS id 9D5402037E for ; Wed, 12 Feb 2020 22:52:08 +0000 (UTC) Received: by mail-pj1-f65.google.com with SMTP id n96so1493988pjc.3 for ; Wed, 12 Feb 2020 14:52:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wNykifB4mL12yclTjIq1C5SJ+TDJ1jxxeRCaWyNJTKk=; b=ApscWOGeKdAx2QM3uJ8f5xqZomyLefAytoJIREixzbrdWgkuv07Whx1WbyKZ3I/X2Z ZQKk/V1xZhcfS5BEVJLhY/Qij0x2EEWSjG+g4t43gP645PzMVvpahZBOMPGGgyUaJUL/ lqnVu7HA3dPVSzeruNHFbpdUgcok1pWy5w8L07+r+rvEiPjP0PDvSA0x72cw7veeUIds r4NOCLQQdV9UIOXLMJIiCbhHVVb43XqASE7UTYYQiG90tljyhlLtt6FFrmykuCWX6GU2 0N7QPXOZNM+/NdkYRQeQ5tvBQjMnIeu57CKGbL8pDteJeObVEoMMEjZQKUu3W0rPNjkb 18Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wNykifB4mL12yclTjIq1C5SJ+TDJ1jxxeRCaWyNJTKk=; b=LCO645seMXdUpoOl+SsbyOvejMR0gTDOynAt+snU8HZmW5bTwT3s96vKrxrNdgrD61 6snq5ppymcpq9UiGyedKYunz5VPvYVlBbEby8NcpFdEJaot0MxOm4bOuHYoh/7IswzaU 1c/JoPK58HNtbwCR8FTgadqAWsBXKRv7ZtZoxL4bNwxmns6zwKzKgpJgK8gv6RPQry6v Yz4YnIYfVE25MGmtF1st1UtUaMNopE17mx/sqJBGaPhh4aEImk1KN2VgazA5lIsEeZp9 S6Wyi0IVH/Fz84HEhiYKJZnoLQs3OLWl2hXZMCTAJH5630D623nslUdpEwrQS149ajzS 4F4g== X-Gm-Message-State: APjAAAWPkOKYIG0a1AwbFxdKdubgHlctmBCU63GPdIcdIH8zjHdhhzRR vWJul6/1oG4aGPFOccKX9J8d+Pq+BUo= X-Google-Smtp-Source: APXvYqwcfLhbUAl6dY5sHx3uOANjVk0WdE37avaxGMM/Go2afvT27MOc5xlivz/czpOYrV++2RFG+w== X-Received: by 2002:a17:90a:f317:: with SMTP id ca23mr1520725pjb.20.1581547927707; Wed, 12 Feb 2020 14:52:07 -0800 (PST) Received: from localhost.localdomain ([47.149.8.172]) by smtp.gmail.com with ESMTPSA id dw10sm267678pjb.11.2020.02.12.14.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2020 14:52:07 -0800 (PST) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Wed, 12 Feb 2020 14:52:01 -0800 Message-Id: <20200212225201.1919594-3-aduskett@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200212225201.1919594-1-aduskett@gmail.com> References: <20200212225201.1919594-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/3] package/gettext-tiny: bump version to 0.3.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vadim Kochan , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett Other changes: - Update gettext to 0.20.1 - 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 Signed-off-by: Adam Duskett --- package/gettext-tiny/gettext-tiny.hash | 8 ++++---- package/gettext-tiny/gettext-tiny.mk | 8 +++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package/gettext-tiny/gettext-tiny.hash b/package/gettext-tiny/gettext-tiny.hash index 9232fe8530..91f6614cce 100644 --- a/package/gettext-tiny/gettext-tiny.hash +++ b/package/gettext-tiny/gettext-tiny.hash @@ -1,7 +1,7 @@ # Locally Computed: -sha256 efc740007c82a9b3a0d382fb50d212fa7dc0beddb9695409ee79684f9f2124b2 gettext-tiny-adaa9c64921e80f2b8dd3610ffb508618b9204f3.tar.gz +sha256 654dcd52f2650476c8822b60bee89c20a0aa7f6a1bf6001701eeacd71a9e388b gettext-tiny-0.3.1.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 +# From https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html +md5 9ed9e26ab613b668e0026222a9c23639 gettext-0.20.1.tar.xz +sha1 62f4a6a2fd5f80bfd0e66c497a04094fa3e07b90 gettext-0.20.1.tar.xz diff --git a/package/gettext-tiny/gettext-tiny.mk b/package/gettext-tiny/gettext-tiny.mk index 09a98f99b4..0aed1e4b1f 100644 --- a/package/gettext-tiny/gettext-tiny.mk +++ b/package/gettext-tiny/gettext-tiny.mk @@ -4,8 +4,8 @@ # ################################################################################ -GETTEXT_TINY_VERSION = adaa9c64921e80f2b8dd3610ffb508618b9204f3 -GETTEXT_TINY_SITE = $(call github,sabotage-linux,gettext-tiny,$(GETTEXT_TINY_VERSION)) +GETTEXT_TINY_VERSION = 0.3.1 +GETTEXT_TINY_SITE = $(call github,sabotage-linux,gettext-tiny,v$(GETTEXT_TINY_VERSION)) GETTEXT_TINY_LICENSE = MIT, GPL-3.0+ (extra gettext) GETTEXT_TINY_INSTALL_STAGING = YES GETTEXT_TINY_LICENSE_FILES = LICENSE @@ -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@boldquot.header \ gettext-runtime/po/en@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@boldquot.header $(HOST_DIR)/share/gettext-tiny/po/en@boldquot.header