diff options
Diffstat (limited to 'system/gettext-tiny')
| -rw-r--r-- | system/gettext-tiny/APKBUILD | 12 | ||||
| -rw-r--r-- | system/gettext-tiny/cheap-hack-for-autopoint.patch | 470 | ||||
| -rw-r--r-- | system/gettext-tiny/omg-i-cant-believe-im-doing-ua-crap.patch | 18 |
3 files changed, 24 insertions, 476 deletions
diff --git a/system/gettext-tiny/APKBUILD b/system/gettext-tiny/APKBUILD index ec3ed5afc..ce3d9b1de 100644 --- a/system/gettext-tiny/APKBUILD +++ b/system/gettext-tiny/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gettext-tiny -pkgver=0.2.0 -pkgrel=4 +pkgver=0.3.0_pre1 +pkgrel=0 pkgdesc="An internationalisation and localisation system" url="https://github.com/sabotage-linux/gettext-tiny" arch="all" @@ -12,8 +12,8 @@ depends="!gettext" depends_dev="!gettext-dev" install="" subpackages="$pkgname-dev" -source="http://ftp.barfooze.de/pub/sabotage/tarballs/gettext-tiny-$pkgver.tar.xz - cheap-hack-for-autopoint.patch +source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz + omg-i-cant-believe-im-doing-ua-crap.patch respect-cflags.patch stop-doing-macro-crap.patch " @@ -28,7 +28,7 @@ package() { make DESTDIR="$pkgdir" prefix=/usr install } -sha512sums="4d8d9d02042adf023bfd2502fa7598f9b16ef2e03dd3d39fd3ba36f1be1d884d1b891600d9263e11948e3979909ea810a1d1b8cefc7e522feda8b422a1107a2e gettext-tiny-0.2.0.tar.xz -ffb10a0ee12acb843d94f160ae0f508cdd6e20a51a3207647ed312da4261247dcf0f16b7b5536b92c62fc0c274cf8ecc2de978fe936201d26d955b9723b1e1ea cheap-hack-for-autopoint.patch +sha512sums="3795b9923f6820ce6e2c6a27480365a4ee1cb1f8f8916256887a40c8e0f0b582ada049a528330297f8daa1bff7d5877a15169095332456c57dc3fdb49407ef98 gettext-tiny-0.3.0_pre1.tar.xz +afb9afd32bf3bb276da5dccd582bd4bba1a1baaa445e08fb88da5690abdb9b267f2452e9189aee89436aa8e3c685465d7368804b90395eb7bd66874cab7711e6 omg-i-cant-believe-im-doing-ua-crap.patch cea1596f3f20c8983e57d2e49e955a43ed2e261b244f6c4c2ae7d8b869e3cfce3bb87b0a17c16bdac59afd99703cef9c7ef4e93fca536bf1bf9aa5f9be9fa34f respect-cflags.patch d2a1a6b1f135c25172cf98dfed64739ff85f6016a31c3ce028b3a7aa72de0b55c1f9a54c5ba2c58817f5222c3d2a5bc3d03ec9058ae5fbae2c798df9227a4e52 stop-doing-macro-crap.patch" diff --git a/system/gettext-tiny/cheap-hack-for-autopoint.patch b/system/gettext-tiny/cheap-hack-for-autopoint.patch deleted file mode 100644 index 679be7035..000000000 --- a/system/gettext-tiny/cheap-hack-for-autopoint.patch +++ /dev/null @@ -1,470 +0,0 @@ ---- gettext-tiny-0.2.0/Makefile.old 2017-08-02 06:14:20.000000000 -0500 -+++ gettext-tiny-0.2.0/Makefile 2018-06-16 20:37:15.701390704 -0500 -@@ -27,7 +27,7 @@ - ALL_LIBS=libintl.a - endif - ALL_TOOLS=msgfmt msgmerge xgettext autopoint --ALL_M4S=$(sort $(wildcard m4/*.m4)) -+ALL_M4S=$(sort $(wildcard m4/*.m4)) Makefile.in.in - - CFLAGS=-O0 -fPIC - ---- gettext-tiny-0.2.0/src/autopoint.in.old 2017-08-02 06:14:20.000000000 -0500 -+++ gettext-tiny-0.2.0/src/autopoint.in 2018-06-16 20:34:27.871556867 -0500 -@@ -18,7 +18,6 @@ - - touch config.rpath ABOUT-NLS - --for i in intl/Makefile.in po/Makefile.in.in ; do -- [ -e "$i" ] && touch "$i" || gen_makefile "$i" --done -+[ -e "intl/Makefile.in" ] && touch "intl/Makefile.in" || gen_makefile "intl/Makefile.in" -+cp @m4dir@/Makefile.in.in po/Makefile.in.in - true ---- /dev/null 2018-05-24 00:39:40.269993297 -0500 -+++ gettext-tiny-0.2.0/Makefile.in.in 2018-06-16 20:36:34.551431446 -0500 -@@ -0,0 +1,444 @@ -+# Makefile for PO directory in any package using GNU gettext. -+# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu> -+# -+# This file can be copied and used freely without restrictions. It can -+# be used in projects which are not available under the GNU General Public -+# License but which still want to provide support for the GNU gettext -+# functionality. -+# 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 -+GETTEXT_MACRO_VERSION = 0.18 -+ -+PACKAGE = @PACKAGE@ -+VERSION = @VERSION@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+ -+SHELL = /bin/sh -+@SET_MAKE@ -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+VPATH = @srcdir@ -+ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+datarootdir = @datarootdir@ -+datadir = @datadir@ -+localedir = @localedir@ -+gettextsrcdir = $(datadir)/gettext/po -+ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+ -+# We use $(mkdir_p). -+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as -+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, -+# @install_sh@ does not start with $(SHELL), so we add it. -+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined -+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake -+# versions, $(mkinstalldirs) and $(install_sh) are unused. -+mkinstalldirs = $(SHELL) @install_sh@ -d -+install_sh = $(SHELL) @install_sh@ -+MKDIR_P = @MKDIR_P@ -+mkdir_p = @mkdir_p@ -+ -+GMSGFMT_ = @GMSGFMT@ -+GMSGFMT_no = @GMSGFMT@ -+GMSGFMT_yes = @GMSGFMT_015@ -+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) -+MSGFMT_ = @MSGFMT@ -+MSGFMT_no = @MSGFMT@ -+MSGFMT_yes = @MSGFMT_015@ -+MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) -+XGETTEXT_ = @XGETTEXT@ -+XGETTEXT_no = @XGETTEXT@ -+XGETTEXT_yes = @XGETTEXT_015@ -+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) -+MSGMERGE = msgmerge -+MSGMERGE_UPDATE = @MSGMERGE@ --update -+MSGINIT = msginit -+MSGCONV = msgconv -+MSGFILTER = msgfilter -+ -+POFILES = @POFILES@ -+GMOFILES = @GMOFILES@ -+UPDATEPOFILES = @UPDATEPOFILES@ -+DUMMYPOFILES = @DUMMYPOFILES@ -+DISTFILES.common = Makefile.in.in remove-potcdate.sin \ -+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) -+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \ -+$(POFILES) $(GMOFILES) \ -+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) -+ -+POTFILES = \ -+ -+CATALOGS = @CATALOGS@ -+ -+# Makevars gets inserted here. (Don't remove this line!) -+ -+.SUFFIXES: -+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update -+ -+.po.mo: -+ @echo "$(MSGFMT) -c -o $@ $<"; \ -+ $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ -+ -+.po.gmo: -+ @lang=`echo $* | sed -e 's,.*/,,'`; \ -+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ -+ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ -+ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo -+ -+.sin.sed: -+ sed -e '/^#/d' $< > t-$@ -+ mv t-$@ $@ -+ -+ -+all: check-macro-version 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@" \ -+ || { 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; \ -+ } -+ -+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no -+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because -+# we don't want to bother translators with empty POT files). We assume that -+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty. -+# In this case, stamp-po is a nop (i.e. a phony target). -+ -+# stamp-po is a timestamp denoting the last time at which the CATALOGS have -+# been loosely updated. Its purpose is that when a developer or translator -+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, -+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent -+# invocations of "make" will do nothing. This timestamp would not be necessary -+# if updating the $(CATALOGS) would always touch them; however, the rule for -+# $(POFILES) has been designed to not touch files that don't need to be -+# changed. -+stamp-po: $(srcdir)/$(DOMAIN).pot -+ test ! -f $(srcdir)/$(DOMAIN).pot || \ -+ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) -+ @test ! -f $(srcdir)/$(DOMAIN).pot || { \ -+ echo "touch stamp-po" && \ -+ echo timestamp > stamp-poT && \ -+ mv stamp-poT stamp-po; \ -+ } -+ -+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', -+# otherwise packages like GCC can not be built if only parts of the source -+# have been downloaded. -+ -+# 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. -+$(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 \ -+ package_gnu='GNU '; \ -+ else \ -+ package_gnu=''; \ -+ fi; \ -+ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ -+ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ -+ else \ -+ msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ -+ fi; \ -+ case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ -+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \ -+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ -+ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ -+ --files-from=$(srcdir)/POTFILES.in \ -+ --copyright-holder='$(COPYRIGHT_HOLDER)' \ -+ --msgid-bugs-address="$$msgid_bugs_address" \ -+ ;; \ -+ *) \ -+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ -+ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ -+ --files-from=$(srcdir)/POTFILES.in \ -+ --copyright-holder='$(COPYRIGHT_HOLDER)' \ -+ --package-name="$${package_gnu}@PACKAGE@" \ -+ --package-version='@VERSION@' \ -+ --msgid-bugs-address="$$msgid_bugs_address" \ -+ ;; \ -+ esac -+ test ! -f $(DOMAIN).po || { \ -+ if test -f $(srcdir)/$(DOMAIN).pot; then \ -+ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ -+ sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ -+ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ -+ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ -+ else \ -+ rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ -+ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ -+ fi; \ -+ else \ -+ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ -+ fi; \ -+ } -+ -+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at -+# every "make" invocation, only create it when it is missing. -+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update. -+$(srcdir)/$(DOMAIN).pot: -+ $(MAKE) $(DOMAIN).pot-update -+ -+# This target rebuilds a PO file if $(DOMAIN).pot has changed. -+# Note that a PO file is not touched if it doesn't need to be changed. -+$(POFILES): $(srcdir)/$(DOMAIN).pot -+ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ -+ if test -f "$(srcdir)/$${lang}.po"; then \ -+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ -+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ -+ cd $(srcdir) \ -+ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ -+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ -+ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ -+ *) \ -+ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ -+ esac; \ -+ }; \ -+ else \ -+ $(MAKE) $${lang}.po-create; \ -+ fi -+ -+ -+install: install-exec install-data -+install-exec: -+install-data: install-data-@USE_NLS@ -+ if test "$(PACKAGE)" = "gettext-tools"; then \ -+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ -+ for file in $(DISTFILES.common) Makevars.template; do \ -+ $(INSTALL_DATA) $(srcdir)/$$file \ -+ $(DESTDIR)$(gettextsrcdir)/$$file; \ -+ done; \ -+ for file in Makevars; do \ -+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ -+ done; \ -+ else \ -+ : ; \ -+ fi -+install-data-no: all -+install-data-yes: all -+ @catalogs='$(CATALOGS)'; \ -+ for cat in $$catalogs; do \ -+ cat=`basename $$cat`; \ -+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ -+ dir=$(localedir)/$$lang/LC_MESSAGES; \ -+ $(mkdir_p) $(DESTDIR)$$dir; \ -+ if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ -+ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ -+ echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ -+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ -+ if test -n "$$lc"; then \ -+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ -+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ -+ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ -+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ -+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ -+ for file in *; do \ -+ if test -f $$file; then \ -+ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ -+ fi; \ -+ done); \ -+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ -+ else \ -+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ -+ :; \ -+ else \ -+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ -+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ -+ fi; \ -+ fi; \ -+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ -+ ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ -+ ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ -+ cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ -+ echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \ -+ fi; \ -+ done; \ -+ done -+ -+install-strip: install -+ -+installdirs: installdirs-exec installdirs-data -+installdirs-exec: -+installdirs-data: installdirs-data-@USE_NLS@ -+ if test "$(PACKAGE)" = "gettext-tools"; then \ -+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ -+ else \ -+ : ; \ -+ fi -+installdirs-data-no: -+installdirs-data-yes: -+ @catalogs='$(CATALOGS)'; \ -+ for cat in $$catalogs; do \ -+ cat=`basename $$cat`; \ -+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ -+ dir=$(localedir)/$$lang/LC_MESSAGES; \ -+ $(mkdir_p) $(DESTDIR)$$dir; \ -+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ -+ if test -n "$$lc"; then \ -+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ -+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ -+ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ -+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ -+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ -+ for file in *; do \ -+ if test -f $$file; then \ -+ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ -+ fi; \ -+ done); \ -+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ -+ else \ -+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ -+ :; \ -+ else \ -+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ -+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ -+ fi; \ -+ fi; \ -+ fi; \ -+ done; \ -+ done -+ -+# Define this as empty until I found a useful application. -+installcheck: -+ -+uninstall: uninstall-exec uninstall-data -+uninstall-exec: -+uninstall-data: uninstall-data-@USE_NLS@ -+ if test "$(PACKAGE)" = "gettext-tools"; then \ -+ for file in $(DISTFILES.common) Makevars.template; do \ -+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ -+ done; \ -+ else \ -+ : ; \ -+ fi -+uninstall-data-no: -+uninstall-data-yes: -+ catalogs='$(CATALOGS)'; \ -+ for cat in $$catalogs; do \ -+ cat=`basename $$cat`; \ -+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ -+ for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ -+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ -+ done; \ -+ done -+ -+check: all -+ -+info dvi ps pdf html tags TAGS ctags CTAGS ID: -+ -+mostlyclean: -+ rm -f remove-potcdate.sed -+ rm -f stamp-poT -+ rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po -+ rm -fr *.o -+ -+clean: mostlyclean -+ -+distclean: clean -+ rm -f Makefile Makefile.in POTFILES *.mo -+ -+maintainer-clean: distclean -+ @echo "This command is intended for maintainers to use;" -+ @echo "it deletes files that may require special tools to rebuild." -+ rm -f stamp-po $(GMOFILES) -+ -+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -+dist distdir: -+ $(MAKE) update-po -+ @$(MAKE) dist2 -+# This is a separate target because 'update-po' must be executed before. -+dist2: stamp-po $(DISTFILES) -+ dists="$(DISTFILES)"; \ -+ if test "$(PACKAGE)" = "gettext-tools"; then \ -+ dists="$$dists Makevars.template"; \ -+ fi; \ -+ if test -f $(srcdir)/$(DOMAIN).pot; then \ -+ dists="$$dists $(DOMAIN).pot stamp-po"; \ -+ fi; \ -+ if test -f $(srcdir)/ChangeLog; then \ -+ dists="$$dists ChangeLog"; \ -+ fi; \ -+ for i in 0 1 2 3 4 5 6 7 8 9; do \ -+ if test -f $(srcdir)/ChangeLog.$$i; then \ -+ dists="$$dists ChangeLog.$$i"; \ -+ fi; \ -+ done; \ -+ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ -+ for file in $$dists; do \ -+ if test -f $$file; then \ -+ cp -p $$file $(distdir) || exit 1; \ -+ else \ -+ cp -p $(srcdir)/$$file $(distdir) || exit 1; \ -+ fi; \ -+ done -+ -+update-po: Makefile -+ $(MAKE) $(DOMAIN).pot-update -+ test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) -+ $(MAKE) update-gmo -+ -+# General rule for creating PO files. -+ -+.nop.po-create: -+ @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \ -+ echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \ -+ exit 1 -+ -+# General rule for updating PO files. -+ -+.nop.po-update: -+ @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ -+ if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ -+ tmpdir=`pwd`; \ -+ echo "$$lang:"; \ -+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ -+ echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ -+ cd $(srcdir); \ -+ if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ -+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ -+ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ -+ *) \ -+ $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ -+ esac; \ -+ }; then \ -+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ else \ -+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ -+ :; \ -+ else \ -+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ -+ exit 1; \ -+ fi; \ -+ fi; \ -+ else \ -+ echo "msgmerge for $$lang.po failed!" 1>&2; \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ fi -+ -+$(DUMMYPOFILES): -+ -+update-gmo: Makefile $(GMOFILES) -+ @: -+ -+# Recreate Makefile by invoking config.status. Explicitly invoke the shell, -+# because execution permission bits may not work on the current file system. -+# Use @SHELL@, which is the shell determined by autoconf for the use by its -+# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient. -+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ -+ cd $(top_builddir) \ -+ && @SHELL@ ./config.status $(subdir)/$@.in po-directories -+ -+force: -+ -+# Tell versions [3.59,3.63) of GNU make not to export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: diff --git a/system/gettext-tiny/omg-i-cant-believe-im-doing-ua-crap.patch b/system/gettext-tiny/omg-i-cant-believe-im-doing-ua-crap.patch new file mode 100644 index 000000000..8fd03a29e --- /dev/null +++ b/system/gettext-tiny/omg-i-cant-believe-im-doing-ua-crap.patch @@ -0,0 +1,18 @@ +It turns out CMake requires the format to be: + +^msgmerge \(.*\) (gettext-version-number-here) + +So, this fixes CMake's test suite, and properly sets GETTEXT_VERSION_STRING +to be the same as the m4 scripts shipped. + +--- gettext-tiny-0.3.0_pre1/src/msgmerge.c.old 2018-06-20 23:47:19.927932643 -0500 ++++ gettext-tiny-0.3.0_pre1/src/msgmerge.c 2018-06-20 23:55:12.997464272 -0500 +@@ -18,7 +18,7 @@ + __attribute__((noreturn)) + static void version(void) { + fprintf(stdout, +- "these are not (GNU gettext-tools) 99.9999.9999\n"); ++ "msgmerge (GNU gettext-tools; compatible) 0.19 (gettext-tiny) 0.3.0\n"); + exit(0); + } + |