Mercurial > mxe-octave
annotate src/of-image-1-cassert.patch @ 7225:48e5a8cd5086 default tip @
Qt6: Update to version 6.7.1
* qt6-qtbase.mk: Update version and checksum. Remove no longer recognized
configure switch.
* qt6-qtbase-1-fixes.patch: Adjust patch for reorganized CMake files. Remove
hunk that is no longer needed.
* qt6-qtbase-2-6.7.0-opengl-header.patch: Add new patch.
* dist-files.mk: Add new file to list.
* qt6-qt5compat.mk, qt6-qtimageformats.mk, qt6-qtsvg.mk, qt6-qttools.mk,
qt6-qttranslations.mk: Update checksum.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Fri, 31 May 2024 10:58:54 +0200 |
parents | 91a699a47331 |
children |
rev | line source |
---|---|
7132
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
1 # HG changeset patch |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
2 # User Markus Mützel <markus.muetzel@gmx.de> |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
3 # Date 1711637836 -3600 |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
4 # Thu Mar 28 15:57:16 2024 +0100 |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
5 # Node ID d00233197c4c4b90b31bc5adc5241deb101f8693 |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
6 # Parent 7994f988b7b8900368a6575ac1b9f437cf860566 |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
7 strel.cc: Include <cassert> in file that uses "assert" (bug #65525). |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
8 |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
9 * src/strel.cc: The header <cassert> happened to be included via some headers |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
10 from Octave before. That is no longer the case for Octave 10. Include the |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
11 header directly in a file that requires it. |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
12 |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
13 diff -r 7994f988b7b8 -r d00233197c4c src/strel.cc |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
14 --- a/src/strel.cc Sat Jan 20 14:15:28 2024 +0000 |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
15 +++ b/src/strel.cc Thu Mar 28 15:57:16 2024 +0100 |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
16 @@ -20,6 +20,7 @@ |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
17 |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
18 #include "strel.h" |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
19 |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
20 +#include <cassert> |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
21 #include <vector> |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
22 |
91a699a47331
of-image: Add patch for missing include of <cassert>.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
23 #include <octave/oct.h> |