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

diffutils: bump to 3.5, BUILD_PREREQ+=cmd:perl for man/help2man. (#778)

Browse Source
This commit is contained in:
fbrosson
2016-08-23 15:35:05 +00:00
committed by waddlesplash
parent 152456b726
commit 2b5cd3606a
2 changed files with 64 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
sys-apps/diffutils/patches/diffutils-3.5.patchset Normal file
View File

@@ -0,0 +1,133 @@
From 31c247d91833c10f184f7fb56b5c1cc9beaba20d Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Tue, 9 Aug 2016 18:34:58 +0300
Subject: gcc2 fixes
diff --git a/src/dir.c b/src/dir.c
index c8aa6a5..dc0897e 100644
--- a/src/dir.c
+++ b/src/dir.c
@@ -265,6 +265,7 @@ diff_dirs (struct comparison const *cmp,
/* Loop while files remain in one or both dirs. */
while (*names[0] || *names[1])
{
+ int v1;
/* Compare next name in dir 0 with next name in dir 1.
At the end of a dir,
pretend the "next name" in that dir is very large. */
@@ -305,7 +306,7 @@ diff_dirs (struct comparison const *cmp,
}
}
- int v1 = (*handle_file) (cmp,
+ v1 = (*handle_file) (cmp,
0 < nameorder ? 0 : *names[0]++,
nameorder < 0 ? 0 : *names[1]++);
if (val < v1)
@@ -363,7 +364,8 @@ find_dir_file_pathname (char const *dir, char const *file)
match = file; /* longjmp may mess up MATCH. */
else
{
- for (char const **p = dirdata.names; *p; p++)
+ char const **p;
+ for (p = dirdata.names; *p; p++)
if (compare_names (*p, file) == 0)
{
if (file_name_cmp (*p, file) == 0)
diff --git a/src/io.c b/src/io.c
index 410bfef..f0a0622 100644
--- a/src/io.c
+++ b/src/io.c
@@ -281,6 +281,8 @@ find_and_hash_each_line (struct file_data *current)
size_t column = 0;
while ((c = *p++) != '\n')
{
+ size_t repetitions = 1;
+
if (ig_white_space & IGNORE_TRAILING_SPACE
&& isspace (c))
{
@@ -295,8 +297,6 @@ find_and_hash_each_line (struct file_data *current)
while (isspace (c1));
}
- size_t repetitions = 1;
-
if (ig_white_space & IGNORE_TAB_EXPANSION)
switch (c)
{
diff --git a/src/util.c b/src/util.c
index 76872cb..5bfc59b 100644
--- a/src/util.c
+++ b/src/util.c
@@ -581,7 +581,7 @@ parse_diff_color (void)
int ind_no; /* Indicator number */
char label[3]; /* Indicator label */
struct color_ext_type *ext; /* Extension we are working on */
-
+ enum parse_state state = PS_START;
if ((p = color_palette) == NULL || *p == '\0')
return;
@@ -594,7 +594,6 @@ parse_diff_color (void)
advance. */
buf = color_buf = xstrdup (p);
- enum parse_state state = PS_START;
while (true)
{
switch (state)
--
2.7.0
From 5de6ef5ec779393a878059f32495fffa8b004306 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Sun, 21 Aug 2016 05:35:54 +0000
Subject: additional gcc2 patch for diffutils-3.5.
diff --git a/src/diff3.c b/src/diff3.c
index b80aeb3..a5f37df 100644
--- a/src/diff3.c
+++ b/src/diff3.c
@@ -263,6 +263,7 @@ main (int argc, char **argv)
char *commonname;
char **file;
struct stat statb;
+ char *b0, *b1;
exit_failure = EXIT_TROUBLE;
initialize_main (&argc, &argv);
@@ -412,7 +413,6 @@ main (int argc, char **argv)
/* Invoke diff twice on two pairs of input files, combine the two
diffs, and output them. */
- char *b0, *b1;
commonname = file[rev_mapping[FILEC]];
thread1 = process_diff (file[rev_mapping[FILE1]], commonname, &last_block, &b1);
thread0 = process_diff (file[rev_mapping[FILE0]], commonname, &last_block, &b0);
--
2.9.3
From 8f779cc21a68ee37d4269dab5afe2bbf51707af8 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Sun, 21 Aug 2016 05:35:54 +0000
Subject: replace /usr/bin/perl by /bin/perl in man/help2man.
diff --git a/man/help2man b/man/help2man
index e6207e5..a34496c 100755
--- a/man/help2man
+++ b/man/help2man
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/bin/perl -w
# Generate a short man page from --help and --version output.
# Copyright (C) 1997-2005, 2009-2011, 2013, 2015-2016 Free Software Foundation,
--
2.9.3