haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 20:20:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix gettext on 64-bit.

Browse Source
This commit is contained in:
Kacper Kasper
2017-11-24 22:27:02 +01:00
parent c63bc7f8b0
commit ae4a2a91e4
2 changed files with 77 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys-devel/gettext/gettext-0.19.8.1.recipe
View File

@@ -16,7 +16,7 @@ preparing these sets, or bringing them up to date.
HOMEPAGE="https://www.gnu.org/software/gettext/"
COPYRIGHT="1998-2016 Free Software Foundation, Inc."
LICENSE="GNU GPL v3"
REVISION="4"
REVISION="5"
SOURCE_URI="http://ftpmirror.gnu.org/gettext/gettext-$portVersion.tar.gz"
CHECKSUM_SHA256="ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43"
PATCHES="gettext-$portVersion.patchset"

80
sys-devel/gettext/patches/gettext-0.19.8.1.patchset
View File

@@ -1,4 +1,4 @@
From aaf124ee5318e263da373001618e15b4b08f10f3 Mon Sep 17 00:00:00 2001
From 0cb62e1010d9361fd57384fb5ff4254f517d4f66 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
@@ -55,10 +55,10 @@ index 78ac24f..4e3335f 100644
tp->type = token_type_rbracket;
return;
--
2.2.2
2.14.2
From d900138b59e0c33cfa56adb747252f9bc3c67d4b Mon Sep 17 00:00:00 2001
From aaac3efe7744efe434fc9314d54167f4bfae0c69 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.
@@ -119,5 +119,77 @@ index 6bb4b35..8b07c5d 100644
ASSERT (memcmp (buf, q, sizeof buf) == 0);
free (q);
--
2.2.2
2.14.2
From d4a16c8eb3c7dde8323460d316a5b378b78f1158 Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Fri, 24 Nov 2017 21:43:10 +0100
Subject: Fix texi2html errors with newer perl versions.
diff --git a/gettext-runtime/libasprintf/texi2html b/gettext-runtime/libasprintf/texi2html
index 7c94d5b..69c9e84 100755
--- a/gettext-runtime/libasprintf/texi2html
+++ b/gettext-runtime/libasprintf/texi2html
@@ -879,7 +879,7 @@ while ($_ = &next_line) {
s/\@refill\s+//g;
# other substitutions
&simple_substitutions;
- s/\@value{($VARRE)}/$value{$1}/eg;
+ s/\@value\{($VARRE)}/$value{$1}/eg;
s/\@footnote\{/\@footnote$docu_doc\{/g; # mark footnotes, cf. pass 4
#
# analyze the tag again
@@ -1204,7 +1204,7 @@ while (@lines) {
#
# xref
#
- while (/\@(x|px|info|)ref{($XREFRE)(}?)/o) {
+ while (/\@(x|px|info|)ref\{($XREFRE)(}?)/o) {
# note: Texinfo may accept other characters
($type, $nodes, $full) = ($1, $2, $3);
($before, $after) = ($`, $');
@@ -1810,7 +1810,7 @@ sub substitute_style {
while ($changed) {
$changed = 0;
$done = '';
- while (/\@(\w+|"|\~|,|\^){([^\{\}]+)}/) {
+ while (/\@(\w+|"|\~|,|\^)\{([^\{\}]+)}/) {
$text = &apply_style($1, $2);
if ($text) {
$_ = "$`$text$'";
diff --git a/gettext-tools/doc/texi2html b/gettext-tools/doc/texi2html
index 7c94d5b..69c9e84 100755
--- a/gettext-tools/doc/texi2html
+++ b/gettext-tools/doc/texi2html
@@ -879,7 +879,7 @@ while ($_ = &next_line) {
s/\@refill\s+//g;
# other substitutions
&simple_substitutions;
- s/\@value{($VARRE)}/$value{$1}/eg;
+ s/\@value\{($VARRE)}/$value{$1}/eg;
s/\@footnote\{/\@footnote$docu_doc\{/g; # mark footnotes, cf. pass 4
#
# analyze the tag again
@@ -1204,7 +1204,7 @@ while (@lines) {
#
# xref
#
- while (/\@(x|px|info|)ref{($XREFRE)(}?)/o) {
+ while (/\@(x|px|info|)ref\{($XREFRE)(}?)/o) {
# note: Texinfo may accept other characters
($type, $nodes, $full) = ($1, $2, $3);
($before, $after) = ($`, $');
@@ -1810,7 +1810,7 @@ sub substitute_style {
while ($changed) {
$changed = 0;
$done = '';
- while (/\@(\w+|"|\~|,|\^){([^\{\}]+)}/) {
+ while (/\@(\w+|"|\~|,|\^)\{([^\{\}]+)}/) {
$text = &apply_style($1, $2);
if ($text) {
$_ = "$`$text$'";
--
2.14.2