Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

package/gettext-gnu: bupmp to version 0.22 #30

Open
wants to merge 1 commit into
base: 2023.02-op-build
Choose a base branch
from
+35 −207
Open

package/gettext-gnu: bupmp to version 0.22 #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions package/gettext-gnu/0001-error_print_progname.patch
View file

This file was deleted.

142 changes: 0 additions & 142 deletions package/gettext-gnu/0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch
View file

This file was deleted.

7 changes: 4 additions & 3 deletions package/gettext-gnu/gettext-gnu.hash
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# From https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html
sha1 62f4a6a2fd5f80bfd0e66c497a04094fa3e07b90 gettext-0.20.1.tar.xz
# Please keep in sync with package/gettext-tiny/gettext-tiny.hash
# From https://lists.gnu.org/archive/html/info-gnu/2023-06/msg00003.html
sha1 d9666d3b9c47a84c814d32e76fa75f60ec23756f gettext-0.22.tar.xz

# Locally calculated
sha256 53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800 gettext-0.20.1.tar.xz
sha256 0e60393a47061567b46875b249b7d2788b092d6457d656145bb0e7e6a3e26d93 gettext-0.22.tar.xz
sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING
sha256 3fe5361f24b7c49ba12911c08f5a33f9cb18871d95d9fb881f5b8a4793e04288 gettext-runtime/intl/COPYING.LIB
21 changes: 17 additions & 4 deletions package/gettext-gnu/gettext-gnu.mk
View file
Original file line number Diff line number Diff line change
@@ -4,17 +4,16 @@
#
################################################################################

# Please keep in sync with package/libtextstyle/libtextstyle.mk
GETTEXT_GNU_VERSION = 0.20.1
# Please keep in sync with package/libtextstyle/libtextstyle.mk and
# GETTEXT_TINY_ARCHIVE_VERSION in gettext-tiny/gettext-tiny.mk
GETTEXT_GNU_VERSION = 0.22
GETTEXT_GNU_SITE = $(BR2_GNU_MIRROR)/gettext
GETTEXT_GNU_SOURCE = gettext-$(GETTEXT_GNU_VERSION).tar.xz
GETTEXT_GNU_INSTALL_STAGING = YES
GETTEXT_GNU_LICENSE = LGPL-2.1+ (libintl), GPL-3.0+ (the rest)
GETTEXT_GNU_LICENSE_FILES = COPYING gettext-runtime/intl/COPYING.LIB
GETTEXT_GNU_CPE_ID_VENDOR = gnu
GETTEXT_GNU_CPE_ID_PRODUCT = gettext
# 0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch
GETTEXT_GNU_AUTORECONF = YES
GETTEXT_GNU_PROVIDES = gettext
GETTEXT_GNU_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)

@@ -67,6 +66,20 @@ endef
GETTEXT_GNU_POST_PATCH_HOOKS += HOST_GETTEXT_GNU_DISABLE_UNNEEDED
HOST_GETTEXT_GNU_POST_PATCH_HOOKS += HOST_GETTEXT_GNU_DISABLE_UNNEEDED

# gettext-tools depends on gettext-runtime
define HOST_GETTEXT_GNU_CONFIGURE_RUNTIME
cd $(@D)/$(GETTEXT_GNU_SUBDIR); \
$(HOST_CONFIGURE_OPTS) \
./configure --prefix=$(HOST_DIR) \
$(HOST_GETTEXT_GNU_CONF_OPTS)
endef
HOST_GETTEXT_GNU_PRE_CONFIGURE_HOOKS += HOST_GETTEXT_GNU_CONFIGURE_RUNTIME

define HOST_GETTEXT_GNU_BUILD_RUNTIME
$(HOST_MAKE_ENV) $(MAKE) -C $(@D)/$(GETTEXT_GNU_SUBDIR) install
endef
HOST_GETTEXT_GNU_PRE_BUILD_HOOKS += HOST_GETTEXT_GNU_BUILD_RUNTIME

define GETTEXT_GNU_REMOVE_UNNEEDED
$(RM) -rf $(TARGET_DIR)/usr/share/gettext/ABOUT-NLS
rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share/gettext
4 changes: 2 additions & 2 deletions package/gettext-tiny/gettext-tiny.hash
View file
Original file line number Diff line number Diff line change
@@ -2,5 +2,5 @@
sha256 29cc165e27e83d2bb3760118c2368eadab550830d962d758e51bd36eb860f383 gettext-tiny-0.3.2.tar.gz
sha256 4c938aa3d8fa3c184bba5e87a8a2febc89560627c9d0567536879e3eca1a7b4f LICENSE
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
# From https://lists.gnu.org/archive/html/info-gnu/2023-06/msg00003.html
sha1 d9666d3b9c47a84c814d32e76fa75f60ec23756f gettext-0.22.tar.xz
7 changes: 4 additions & 3 deletions package/gettext-tiny/gettext-tiny.mk
View file
Original file line number Diff line number Diff line change
@@ -13,8 +13,9 @@ HOST_GETTEXT_TINY_LICENSE_FILES = LICENSE extra/COPYING

GETTEXT_TINY_PROVIDES = gettext

# needed for gettextize
GETTEXT_TINY_ARCHIVE_VERSION = 0.20.1
# Please keep in sync with package/libtextstyle/libtextstyle.mk and
# package/gettext-gnu/gettext-gnu.mk
GETTEXT_TINY_ARCHIVE_VERSION = 0.22

GETTEXT_TINY_EXTRA_GETTEXT_FILES = \
gettext-tools/misc/gettextize.in \
@@ -95,7 +96,7 @@ define HOST_GETTEXT_TINY_INSTALL_CMDS
$(Q)touch $(HOST_DIR)/share/gettext-tiny/ABOUT-NLS

# for gettextize
ln -sf $(HOST_DIR)/share/gettext-tiny $(HOST_DIR)/share/gettext
ln -sf $(HOST_DIR)/usr/share/gettext-tiny $(HOST_DIR)/usr/share/gettext
endef

# Install simple echo wrapper for gettext tool
18 changes: 0 additions & 18 deletions package/gettext/Config.in
View file

This file was deleted.

10 changes: 0 additions & 10 deletions package/gettext/gettext.mk
View file

This file was deleted.

8 changes: 5 additions & 3 deletions package/libtextstyle/libtextstyle.hash
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# From https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html
sha1 62f4a6a2fd5f80bfd0e66c497a04094fa3e07b90 gettext-0.20.1.tar.xz
# Please keep in sync with package/gettext-tiny/gettext-tiny.hash
# From https://lists.gnu.org/archive/html/info-gnu/2023-06/msg00003.html
sha1 d9666d3b9c47a84c814d32e76fa75f60ec23756f gettext-0.22.tar.xz

# Locally calculated
sha256 53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800 gettext-0.20.1.tar.xz
sha256 0e60393a47061567b46875b249b7d2788b092d6457d656145bb0e7e6a3e26d93 gettext-0.22.tar.xz
sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING
sha256 3fe5361f24b7c49ba12911c08f5a33f9cb18871d95d9fb881f5b8a4793e04288 gettext-runtime/intl/COPYING.LIB
5 changes: 3 additions & 2 deletions package/libtextstyle/libtextstyle.mk
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,9 @@
#
################################################################################

# Please keep in sync with package/gettext-gnu/gettext-gnu.mk
LIBTEXTSTYLE_VERSION = 0.20.1
# Please keep in sync with package/gettext-gnu/gettext-gnu.mk and
# GETTEXT_TINY_ARCHIVE_VERSION in gettext-tiny/gettext-tiny.mk
LIBTEXTSTYLE_VERSION = 0.22
LIBTEXTSTYLE_SITE = $(BR2_GNU_MIRROR)/gettext
LIBTEXTSTYLE_SOURCE = gettext-$(LIBTEXTSTYLE_VERSION).tar.xz
LIBTEXTSTYLE_INSTALL_STAGING = YES