annotate src/of-struct-1-verror.patch @ 6113:24e29dcb2e64

Qt5: Update to version 5.15.3. * src/qtbase.mk: Update version and checksum. * src/qtbase-2-gcc11.patch: Remove hunks from patch that have been applied upstream. * src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk, src/qttranslationse.mk: Update checksum.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 05 Mar 2022 10:59:53 +0100
parents 94e6691fc42f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5991
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 # HG changeset patch
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 # User Markus Mützel <markus.muetzel@gmx.de>
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 # Date 1638187375 -3600
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 # Mon Nov 29 13:02:55 2021 +0100
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 # Node ID 3d28b7df6df9c5c161f9e4518a03c34d6300f2b4
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 # Parent b38448d3d291256bedb125b2c52c40820acdc235
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 Fix compilation with Octave 8 (bug #61582).
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 * src/error-helpers.h: Use wrapper function.
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 diff -r b38448d3d291 -r 3d28b7df6df9 src/error-helpers.h
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 --- a/src/error-helpers.h Wed Feb 17 13:25:40 2021 +0100
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 +++ b/src/error-helpers.h Mon Nov 29 13:02:55 2021 +0100
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 @@ -64,7 +64,7 @@
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 } \
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 catch (OCTAVE__EXECUTION_EXCEPTION& e) \
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 { \
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 - verror (e, __VA_ARGS__); \
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 + c_verror (e, __VA_ARGS__); \
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 }
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 #endif
94e6691fc42f of-struct: Fix for Octave 8 (bug #61582).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22