1
0

Accepting request 636595 from Base:System

- Add patch msgfmt-reset-msg-length-after-remove.patch
  which does reset the length of message string after a line
  has been removed (boo#1106843)

OBS-URL: https://build.opensuse.org/request/show/636595
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gettext-runtime?expand=0&rev=76
This commit is contained in:
Dominique Leuenberger 2018-10-01 07:02:05 +00:00 committed by Git OBS Bridge
commit 81dc3d16b3
4 changed files with 33 additions and 0 deletions

View File

@ -75,6 +75,8 @@ Patch9: gettext-needlessly_init_vars.patch
Patch10: msgfmt-remove-pot-creation-date.patch Patch10: msgfmt-remove-pot-creation-date.patch
# PATCH-FIX-UPSTREAM boo#941629 -- pth@suse.com # PATCH-FIX-UPSTREAM boo#941629 -- pth@suse.com
Patch11: boo941629-unnessary-rpath-on-standard-path.patch Patch11: boo941629-unnessary-rpath-on-standard-path.patch
# PATCH-FIX-SUSE Bug boo#1106843
Patch12: msgfmt-reset-msg-length-after-remove.patch
%description %description
This package contains the intl library as well as tools that ease the This package contains the intl library as well as tools that ease the
@ -139,6 +141,7 @@ as well as project examples.
%patch9 %patch9
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%patch12 -p0
%build %build
# expect a couple "You should update your `aclocal.m4' by running aclocal." # expect a couple "You should update your `aclocal.m4' by running aclocal."

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Sep 19 08:24:19 UTC 2018 - Dr. Werner Fink <werner@suse.de>
- Add patch msgfmt-reset-msg-length-after-remove.patch
which does reset the length of message string after a line
has been removed (boo#1106843)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 24 10:45:49 CEST 2018 - kukuk@suse.de Thu May 24 10:45:49 CEST 2018 - kukuk@suse.de

View File

@ -75,6 +75,8 @@ Patch9: gettext-needlessly_init_vars.patch
Patch10: msgfmt-remove-pot-creation-date.patch Patch10: msgfmt-remove-pot-creation-date.patch
# PATCH-FIX-UPSTREAM boo#941629 -- pth@suse.com # PATCH-FIX-UPSTREAM boo#941629 -- pth@suse.com
Patch11: boo941629-unnessary-rpath-on-standard-path.patch Patch11: boo941629-unnessary-rpath-on-standard-path.patch
# PATCH-FIX-SUSE Bug boo#1106843
Patch12: msgfmt-reset-msg-length-after-remove.patch
%description %description
This package contains the intl library as well as tools that ease the This package contains the intl library as well as tools that ease the
@ -139,6 +141,7 @@ as well as project examples.
%patch9 %patch9
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%patch12 -p0
%build %build
# expect a couple "You should update your `aclocal.m4' by running aclocal." # expect a couple "You should update your `aclocal.m4' by running aclocal."

View File

@ -0,0 +1,20 @@
Bug 1106843 -- msgfmt crashes when writing java source code and the .po file has a POT-Creation-Date header
Due d13f165b83701dffc14f7151419e0c00c00c0d1b there will be the
line with the POT-Creation-Date: tag removed but the lenght of
the changed message string does also change with this.
---
gettext-tools/src/msgl-header.c | 1 +
1 file changed, 1 insertion(+)
--- gettext-tools/src/msgl-header.c
+++ gettext-tools/src/msgl-header.c 2018-09-19 08:05:54.340122157 +0000
@@ -217,6 +217,7 @@ message_list_delete_header_field (messag
*p = '\0';
mp->msgstr = new_header;
+ mp->msgstr_len = strlen (new_header) + 1;
}
}
}