From 8515ea12d283632e7d0103286e679542d896058b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 10 Nov 2020 17:49:14 +0100 Subject: gnu: audiofile: Shorten patch file names. At least 'audiofile-division-by-zero-BlockCodec-runPull.patch' could end up not being included in a tarball. * gnu/packages/patches/audiofile-Check-the-number-of-coefficients.patch: Rename to... * gnu/packages/patches/audiofile-check-number-of-coefficients.patch: ... this. * gnu/packages/patches/audiofile-division-by-zero-BlockCodec-runPull.patch: Rename to... * gnu/packages/patches/audiofile-division-by-zero.patch: ....this. * gnu/packages/patches/audiofile-signature-of-multiplyCheckOverflow.patch: Rename to... * gnu/packages/patches/audiofile-function-signature.patch: ... this. * gnu/packages/patches/audiofile-Fix-multiply-overflow-sfconvert.patch: Rename to.... * gnu/packages/patches/audiofile-multiply-overflow.patch: ... this. * gnu/packages/patches/audiofile-Fix-overflow-in-MSADPCM-decodeSam.patch: Rename to... * gnu/packages/patches/audiofile-overflow-in-MSADPCM.patch: ... this. * gnu/packages/audio.scm (audiofile)[source]: Adjust accordingly. * gnu/local.mk (dist_patch_DATA): Likewise. --- .../patches/audiofile-function-signature.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 gnu/packages/patches/audiofile-function-signature.patch (limited to 'gnu/packages/patches/audiofile-function-signature.patch') diff --git a/gnu/packages/patches/audiofile-function-signature.patch b/gnu/packages/patches/audiofile-function-signature.patch new file mode 100644 index 0000000000..35627d3869 --- /dev/null +++ b/gnu/packages/patches/audiofile-function-signature.patch @@ -0,0 +1,35 @@ +From: Antonio Larrosa +Date: Fri, 10 Mar 2017 15:40:02 +0100 +Subject: Fix signature of multiplyCheckOverflow. It returns a bool, not an int + +--- + libaudiofile/modules/MSADPCM.cpp | 2 +- + sfcommands/sfconvert.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libaudiofile/modules/MSADPCM.cpp b/libaudiofile/modules/MSADPCM.cpp +index ef9c38c..d8c9553 100644 +--- a/libaudiofile/modules/MSADPCM.cpp ++++ b/libaudiofile/modules/MSADPCM.cpp +@@ -116,7 +116,7 @@ int firstBitSet(int x) + #define __has_builtin(x) 0 + #endif + +-int multiplyCheckOverflow(int a, int b, int *result) ++bool multiplyCheckOverflow(int a, int b, int *result) + { + #if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow)) + return __builtin_mul_overflow(a, b, result); +diff --git a/sfcommands/sfconvert.c b/sfcommands/sfconvert.c +index 970a3e4..367f7a5 100644 +--- a/sfcommands/sfconvert.c ++++ b/sfcommands/sfconvert.c +@@ -60,7 +60,7 @@ int firstBitSet(int x) + #define __has_builtin(x) 0 + #endif + +-int multiplyCheckOverflow(int a, int b, int *result) ++bool multiplyCheckOverflow(int a, int b, int *result) + { + #if (defined __GNUC__ && __GNUC__ >= 5) || ( __clang__ && __has_builtin(__builtin_mul_overflow)) + return __builtin_mul_overflow(a, b, result); -- cgit v1.2.3 bundled sources for arrow. [arguments]: Disable parallel build; use system arrow. [inputs]: Drop input labels; add apache-thrift, apache-arrow-for-ceph, and utf8proc. * gnu/packages/patches/ceph-boost-compat.patch: Delete file. * gnu/packages/patches/ceph-rocksdb-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove them. Ricardo Wurmus 2022-11-06gnu: fmt: Update to 9.1.0....* gnu/packages/pretty-print.scm (fmt): Update to 9.1.0. (fmt-8): New variable. * gnu/packages/hyperledger.scm (hyperledger-iroha) [snippet]: Delete trailing #t. [native-inputs]: Re-indent. Replace fmt with fmt-8. * gnu/packages/networking.scm (opendht) [inputs]: Replace fmt with fmt-8. * gnu/packages/storage.scm (ceph): Likewise. * gnu/packages/video.scm (mkvtoolnix): Likewise. * gnu/packages/aidc.scm (zxing-cpp): Likewise. * gnu/packages/wm.scm (waybar): Likewise. * gnu/packages/geo.scm (osm2pgsql): Likewise. * gnu/packages/graphics.scm (openimageio): Likewise. * gnu/packages/build-tools.scm (bear): Likewise. * gnu/packages/networking.scm (restinio): Likewise. Maxim Cournoyer 2022-05-29gnu: ceph: Update to 16.2.9....* gnu/packages/storage.scm (ceph): Update to 16.2.9. Tobias Geerinckx-Rice 2021-12-20gnu: ceph: Simplify source snippet....* gnu/packages/storage.scm (ceph)[source]: Simplify snippet. Ricardo Wurmus 2021-12-20gnu: ceph: Update to 16.2.7....* gnu/packages/storage.scm (ceph): Update to 16.2.7. Ricardo Wurmus 2021-12-13gnu: Simplify package inputs....This commit was obtained by running: ./pre-inst-env guix style without any additional argument. Ludovic Courtès 2021-11-06gnu: ceph: Update to 16.2.6....* gnu/packages/storage.scm (ceph): Update to 16.2.6. [source](patches): Add two new patches. Remove one obsolete. [source](snippet): Unbundle fmt. [arguments]: Remove -DWITH_PYTHON3 from #:configure-flags. Add -DWITH_SYSTEMD. Adjust RUNPATH substitution, and the wrap-python-scripts phase, for upstream changes. Remove trailing #t's. [inputs]: Remove PYTHON-SIX and PYTHON-WRAPPER. Add FMT, ICU4C, PYTHON-PYYAML, PYTHON, and SQLITE. * gnu/packages/patches/ceph-fix-snappy-breaking-change.patch: Delete file. * gnu/packages/patches/ceph-boost-compat.patch, gnu/packages/patches/ceph-rocksdb-compat.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Marius Bakke 2021-10-12Merge remote-tracking branch 'origin/master' into core-updates-frozen.Mathieu Othacehe 2021-10-08gnu: ceph: Fix breaking change in snappy....* gnu/packages/storage.scm (ceph)[source]: Add patch. * gnu/packages/patches/ceph-fix-snappy-breaking-change.patch: New file. * gnu/local.mk: Add it. Signed-off-by: Marius Bakke <marius@gnu.org> Greg Hogan