From b4ad447ebd63a58db8ad96b6731e461f738e24ba Mon Sep 17 00:00:00 2001 From: IdrisKalp Date: Wed, 11 Dec 2019 02:36:39 +0300 Subject: [PATCH 1/3] xz 5.3.1 alpha --- system/base/xz/pspec.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/system/base/xz/pspec.xml b/system/base/xz/pspec.xml index cd4b118a..4217f298 100644 --- a/system/base/xz/pspec.xml +++ b/system/base/xz/pspec.xml @@ -15,7 +15,7 @@ library XZ compression utilities XZ Utils provide a general purpose data compression library and command line tools. The .xz format supports multiple compression algorithms, which are called "filters" in context of XZ Utils. The primary filter is currently LZMA2. - http://tukaani.org/xz/xz-5.2.4.tar.xz + https://tukaani.org/xz/xz-5.3.1alpha.tar.xz @@ -61,6 +61,13 @@ + + 2019-12.11 + 5.3.1 + Version bump + Idris Kalp + idriskalp@gmail.com + 2018-11-28 5.2.4 From a9298ca8c9c722ac12df5aefb685b4e107e1d20c Mon Sep 17 00:00:00 2001 From: IdrisKalp Date: Wed, 11 Dec 2019 02:37:20 +0300 Subject: [PATCH 2/3] libxml2 2.9.10 --- system/base/libxml2/pspec.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/system/base/libxml2/pspec.xml b/system/base/libxml2/pspec.xml index 4844c185..fe2511b5 100755 --- a/system/base/libxml2/pspec.xml +++ b/system/base/libxml2/pspec.xml @@ -12,16 +12,13 @@ library Version 2 of the library to manipulate XML files Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform). - ftp://xmlsoft.org/libxml2/libxml2-2.9.8.tar.gz + ftp://xmlsoft.org/libxml2/libxml2-2.9.10.tar.gz python-devel xz-devel zlib-devel readline-devel - - - @@ -87,6 +84,13 @@ + + 2019-12-11 + 2.9.10 + Version bump + Idris Kalp + idriskalp@gmail.com + 2019-01-24 2.9.8 From 2af66d0b15575f40c395dfeddb3cc28bd82aca20 Mon Sep 17 00:00:00 2001 From: IdrisKalp Date: Wed, 11 Dec 2019 02:37:53 +0300 Subject: [PATCH 3/3] gettext 0.20.1 --- system/base/gettext/files/fix-empty-po.patch | 83 ++++++++++++++++++++ system/base/gettext/pspec.xml | 14 +++- 2 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 system/base/gettext/files/fix-empty-po.patch diff --git a/system/base/gettext/files/fix-empty-po.patch b/system/base/gettext/files/fix-empty-po.patch new file mode 100644 index 00000000..c6dc873c --- /dev/null +++ b/system/base/gettext/files/fix-empty-po.patch @@ -0,0 +1,83 @@ +From 2336451ed68d91ff4b5ae1acbc1eca30e47a86a9 Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Sun, 19 May 2019 13:10:06 +0200 +Subject: [PATCH] msgmerge: Fix behaviour of --for-msgfmt on PO files with no + translations. + +Reported by Don Lawrence +in +via Daiki Ueno +in . + +* gettext-tools/src/msgmerge.c (main): Treat force_po like true if for_msgfmt +is true. +* gettext-tools/tests/msgmerge-26: Add test of PO file with no translations. +--- + gettext-tools/src/msgmerge.c | 4 ++-- + gettext-tools/tests/msgmerge-26 | 36 +++++++++++++++++++++++++++++++++--- + 2 files changed, 35 insertions(+), 5 deletions(-) + +diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c +index cd762c0..92c9b7a 100644 +--- a/gettext-tools/src/msgmerge.c ++++ b/gettext-tools/src/msgmerge.c +@@ -520,8 +520,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\ + else + { + /* Write the merged message list out. */ +- msgdomain_list_print (result, output_file, output_syntax, force_po, +- false); ++ msgdomain_list_print (result, output_file, output_syntax, ++ for_msgfmt || force_po, false); + } + + exit (EXIT_SUCCESS); +diff --git a/gettext-tools/tests/msgmerge-26 b/gettext-tools/tests/msgmerge-26 +index cd3862e..b86f7a0 100755 +--- a/gettext-tools/tests/msgmerge-26 ++++ b/gettext-tools/tests/msgmerge-26 +@@ -73,7 +73,37 @@ msgstr "Papaya" + EOF + + : ${DIFF=diff} +-${DIFF} mm-test26.ok mm-test26.out +-result=$? ++${DIFF} mm-test26.ok mm-test26.out || Exit 1 + +-exit $result ++# Test with a PO file that has no translated messages. ++ ++cat <<\EOF > mm-test26a.in1 ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++ ++msgid "Hello world" ++msgstr "Hallo Welt" ++EOF ++ ++cat <<\EOF > mm-test26a.in2 ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=ASCII\n" ++ ++msgid "Hello, world!" ++msgstr "" ++EOF ++ ++: ${MSGMERGE=msgmerge} ++${MSGMERGE} --for-msgfmt -o mm-test26a.tmp mm-test26a.in1 mm-test26a.in2 \ ++ || Exit 1 ++LC_ALL=C tr -d '\r' < mm-test26a.tmp > mm-test26a.out || Exit 1 ++ ++cat <<\EOF > mm-test26a.ok ++msgid "" ++msgstr "Content-Type: text/plain; charset=UTF-8\n" ++EOF ++ ++: ${DIFF=diff} ++${DIFF} mm-test26a.ok mm-test26a.out || Exit 1 +-- +1.9.1 + +fix-empty-po.patch \ No newline at end of file diff --git a/system/base/gettext/pspec.xml b/system/base/gettext/pspec.xml index 156822de..346962d8 100644 --- a/system/base/gettext/pspec.xml +++ b/system/base/gettext/pspec.xml @@ -13,7 +13,7 @@ library GNU libraries and utilities for producing multi-lingual messages The GNU gettext package provides a set of tools and documentation for producing multi-lingual messages in programs. Tools include a set of conventions about how programs should be written to support message catalogs, a directory and file naming organization for the message catalogs, a runtime library which supports the retrieval of translated messages, and stand-alone programs for handling the translatable and the already translated strings. Gettext provides an easy to use library and tools for creating, using, and modifying natural language catalogs and is a powerful and simple method for internationalizing programs. - http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.8.1.tar.gz + http://ftp.gnu.org/pub/gnu/gettext/gettext-0.20.1.tar.gz acl-devel glib2-devel @@ -21,6 +21,9 @@ libunistring-devel libxml2-devel + + fix-empty-po.patch + @@ -48,7 +51,7 @@ /usr/bin /usr/lib - /usr/share/gettext-0.19.8 + /usr/share/gettext-0.20 /usr/share/gettext /usr/share/locale /usr/share/info @@ -73,6 +76,13 @@ + + 2019-09-30 + 0.20.1 + Version bump + Idris Kalp + idriskalp@gmail.com + 2018-07-20 0.19.8.1