diff options
| author | Michael Forney <mforney@mforney.org> | 2016-12-11 16:04:20 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-12-13 23:10:30 -0800 |
| commit | 293f5a93b77d92fd65db7f3d0df654f102e46cfb (patch) | |
| tree | 6ecd1170e3dd793862dd852814dc1b4cd5e44260 /pkg/bzip2/patch/0001-Remove-unused-nread-variable.patch | |
| parent | 9a506a6834df01a26795cea222b410f206efa9fa (diff) | |
Move to flat package hierarchy
Note to self: never try to move submodules again
To migrate your existing submodules (more or less):
set -x
set -e
mkdir .git/modules/pkg
for old in */*/src ; do
new="pkg/${old#*/}"
if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
continue
fi
git -C ".git/modules/$old" config core.worktree "../../../../../$new"
rmdir "$new"
mv "$old" "$new"
sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
mv "$new/.git.tmp" "$new/.git"
mkdir ".git/modules/${new%/src}"
mv ".git/modules/$old" ".git/modules/$new"
rm "${old%/src}"/*.ninja
mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
rmdir "${old%/src}" || true
done
sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
mv .git/config.tmp .git/config
Diffstat (limited to 'pkg/bzip2/patch/0001-Remove-unused-nread-variable.patch')
| -rw-r--r-- | pkg/bzip2/patch/0001-Remove-unused-nread-variable.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/pkg/bzip2/patch/0001-Remove-unused-nread-variable.patch b/pkg/bzip2/patch/0001-Remove-unused-nread-variable.patch new file mode 100644 index 00000000..7b322a21 --- /dev/null +++ b/pkg/bzip2/patch/0001-Remove-unused-nread-variable.patch @@ -0,0 +1,34 @@ +From 00cc7127e58adeeba4485fab901215b6df6184f6 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Sat, 10 Dec 2016 23:37:57 -0800 +Subject: [PATCH] Remove unused nread variable + +--- + bzip2.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bzip2.c b/bzip2.c +index 6de9d1d..1dd5424 100644 +--- a/bzip2.c ++++ b/bzip2.c +@@ -554,7 +554,7 @@ static + Bool testStream ( FILE *zStream ) + { + BZFILE* bzf = NULL; +- Int32 bzerr, bzerr_dummy, ret, nread, streamNo, i; ++ Int32 bzerr, bzerr_dummy, ret, streamNo, i; + UChar obuf[5000]; + UChar unused[BZ_MAX_UNUSED]; + Int32 nUnused; +@@ -577,7 +577,7 @@ Bool testStream ( FILE *zStream ) + streamNo++; + + while (bzerr == BZ_OK) { +- nread = BZ2_bzRead ( &bzerr, bzf, obuf, 5000 ); ++ BZ2_bzRead ( &bzerr, bzf, obuf, 5000 ); + if (bzerr == BZ_DATA_ERROR_MAGIC) goto errhandler; + } + if (bzerr != BZ_STREAM_END) goto errhandler; +-- +2.11.0 + |