mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-14 15:50:07 +02:00
5784744bb5
Some recipes, e.g. mc (Midnight Commander), need libintl.la, but we were previously dropping all develop/lib/lib*.la files in gettext. We now ship them and also fix them to make sure they don't become unusable in case devel:libiconv or devel:libncurses get updated. On x86 and x86_64 we also fix $developLibDir/libasprintf.la to use a path to libstdc++.la that does not depend on the revision of the gcc package.
124 lines
3.9 KiB
Plaintext
124 lines
3.9 KiB
Plaintext
From aaf124ee5318e263da373001618e15b4b08f10f3 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Tue, 9 Sep 2014 20:00:54 +0000
|
|
Subject: haiku patch
|
|
|
|
|
|
diff --git a/gettext-tools/src/x-lua.c b/gettext-tools/src/x-lua.c
|
|
index 78ac24f..4e3335f 100644
|
|
--- a/gettext-tools/src/x-lua.c
|
|
+++ b/gettext-tools/src/x-lua.c
|
|
@@ -281,9 +281,9 @@ phase2_getc ()
|
|
|
|
if (c == '[')
|
|
{
|
|
- c = phase1_getc ();
|
|
|
|
int esigns = 0;
|
|
+ c = phase1_getc ();
|
|
while (c == '=')
|
|
{
|
|
esigns++;
|
|
@@ -709,11 +709,11 @@ phase3_get (token_ty *tp)
|
|
}
|
|
break;
|
|
|
|
- case '[':
|
|
+ case '[': {
|
|
+ int esigns = 0;
|
|
c = phase1_getc ();
|
|
|
|
/* Count the number of equal signs. */
|
|
- int esigns = 0;
|
|
while (c == '=')
|
|
{
|
|
esigns++;
|
|
@@ -745,10 +745,10 @@ phase3_get (token_ty *tp)
|
|
|
|
if (c == ']')
|
|
{
|
|
+ int esigns2 = 0;
|
|
c = phase1_getc ();
|
|
|
|
/* Count the number of equal signs. */
|
|
- int esigns2 = 0;
|
|
while (c == '=')
|
|
{
|
|
esigns2++;
|
|
@@ -798,7 +798,7 @@ phase3_get (token_ty *tp)
|
|
}
|
|
}
|
|
break;
|
|
-
|
|
+ }
|
|
case ']':
|
|
tp->type = token_type_rbracket;
|
|
return;
|
|
--
|
|
2.2.2
|
|
|
|
|
|
From d900138b59e0c33cfa56adb747252f9bc3c67d4b Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@gmail.com>
|
|
Date: Thu, 16 Oct 2014 08:51:57 +0200
|
|
Subject: Fix C99ism in tests.
|
|
|
|
|
|
diff --git a/gettext-tools/gnulib-lib/uniname/uniname.c b/gettext-tools/gnulib-lib/uniname/uniname.c
|
|
index 5da6ced..19ad886 100644
|
|
--- a/gettext-tools/gnulib-lib/uniname/uniname.c
|
|
+++ b/gettext-tools/gnulib-lib/uniname/uniname.c
|
|
@@ -375,6 +375,8 @@ unicode_name_character (const char *name)
|
|
if (false)
|
|
filled_buf:
|
|
{
|
|
+ uint16_t words[UNICODE_CHARNAME_MAX_WORDS];
|
|
+ uint16_t *wordptr = words;
|
|
{
|
|
/* Special case for variation selector aliases. Keeps the
|
|
tables small. */
|
|
@@ -407,8 +409,6 @@ unicode_name_character (const char *name)
|
|
}
|
|
}
|
|
/* Convert the constituents to uint16_t words. */
|
|
- uint16_t words[UNICODE_CHARNAME_MAX_WORDS];
|
|
- uint16_t *wordptr = words;
|
|
{
|
|
const char *p1 = buf;
|
|
for (;;)
|
|
diff --git a/gettext-tools/gnulib-tests/test-quotearg-simple.c b/gettext-tools/gnulib-tests/test-quotearg-simple.c
|
|
index 6bb4b35..8b07c5d 100644
|
|
--- a/gettext-tools/gnulib-tests/test-quotearg-simple.c
|
|
+++ b/gettext-tools/gnulib-tests/test-quotearg-simple.c
|
|
@@ -331,14 +331,16 @@ main (int argc _GL_UNUSED, char *argv[])
|
|
size_t q_len = 1024;
|
|
char *q = malloc (q_len + 1);
|
|
char buf[10];
|
|
- memset (q, 'Q', q_len);
|
|
- q[q_len] = 0;
|
|
|
|
/* Z points to the boundary between a readable/writable page
|
|
and one that is neither readable nor writable. Position
|
|
our string so its NUL is at the end of the writable one. */
|
|
char const *str = "____";
|
|
size_t s_len = strlen (str);
|
|
+ size_t n;
|
|
+
|
|
+ memset (q, 'Q', q_len);
|
|
+ q[q_len] = 0;
|
|
z -= s_len + 1;
|
|
memcpy (z, str, s_len + 1);
|
|
|
|
@@ -346,7 +348,7 @@ main (int argc _GL_UNUSED, char *argv[])
|
|
/* Whether this actually triggers a SEGV depends on the
|
|
implementation of memcmp: whether it compares only byte-at-
|
|
a-time, and from left to right (no SEGV) or some other way. */
|
|
- size_t n = quotearg_buffer (buf, sizeof buf, z, SIZE_MAX, NULL);
|
|
+ n = quotearg_buffer (buf, sizeof buf, z, SIZE_MAX, NULL);
|
|
ASSERT (n == s_len + 2 * q_len);
|
|
ASSERT (memcmp (buf, q, sizeof buf) == 0);
|
|
free (q);
|
|
--
|
|
2.2.2
|
|
|