Mercurial > mxe-octave

annotate src/bzip2-1-fixes.patch @ 5531:eae508c12529

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add build rule for build-octave (bug #49503). * src/build-octave.mk: Add new build rule for build-octave which can be used for cross-building binary packages that depend on Octave as a build tool. * dist-files.mk: Add new file to list. * index.html: Add new package to list. * src/of-communications.mk, src/of-image.mk, src/of-mapping.mk, src/of-optiminterp.mk, src/of-sparsersb.mk, src/of-statistics.mk, src/of-windows.mk: Add optional dependency on build-octave. * configure.ac: Add new configure switch "--disable-system-octave" that is needed to build the build-octave package. * Makefile.in: Add variable "USE_SYSTEM_OCTAVE". Exclude build-octave from the default build tools and build it only if a package explicitly depends on it. Display warning about missing native Octave version only if necessary.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 08 Sep 2020 23:04:38 +0200
parents 6a63ec73029d
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5260
6a63ec73029d bzip2: update to v1.0.8
John Donoghue
parents: 4179
diff changeset
1 diff -ur bzip2-1.0.8.orig/bzlib.h bzip2-1.0.8/bzlib.h
6a63ec73029d bzip2: update to v1.0.8
John Donoghue
parents: 4179
diff changeset
2 --- bzip2-1.0.8.orig/bzlib.h 2020-01-06 13:24:42.229947041 -0500
6a63ec73029d bzip2: update to v1.0.8
John Donoghue
parents: 4179
diff changeset
3 +++ bzip2-1.0.8/bzlib.h 2020-01-06 13:27:27.946095881 -0500
4179
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4 @@ -75,7 +75,7 @@
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5 #include <stdio.h>
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6 #endif
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 -#ifdef _WIN32
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
9 +#if 0
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 # include <windows.h>
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 # ifdef small
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 /* windows.h define small to char */
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13 @@ -116,7 +116,7 @@
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) (
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 bz_stream *strm,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16 int verbosity,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17 - int small
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18 + int small_
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
19 );
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21 BZ_EXTERN int BZ_API(BZ2_bzDecompress) (
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22 @@ -140,7 +140,7 @@
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23 int* bzerror,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
24 FILE* f,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
25 int verbosity,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
26 - int small,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
27 + int small_,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
28 void* unused,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
29 int nUnused
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
30 );
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
31 @@ -216,7 +216,7 @@
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
32 unsigned int* destLen,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
33 char* source,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
34 unsigned int sourceLen,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
35 - int small,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
36 + int small_,
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
37 int verbosity
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
38 );
6409a12147fd bzip2: use aff patch
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
39