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

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 e770e9162424
children 78901dc12b99
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4975
e770e9162424 qscintilla: update to v2.1..1
John Donoghue
parents: 4410
diff changeset
1 diff -ur QScintilla_gpl-2.11.1.orig/Qt4Qt5/qscintilla.pro QScintilla_gpl-2.11.1/Qt4Qt5/qscintilla.pro
e770e9162424 qscintilla: update to v2.1..1
John Donoghue
parents: 4410
diff changeset
2 --- QScintilla_gpl-2.11.1.orig/Qt4Qt5/qscintilla.pro 2019-02-26 13:51:51.426342211 -0500
e770e9162424 qscintilla: update to v2.1..1
John Donoghue
parents: 4410
diff changeset
3 +++ QScintilla_gpl-2.11.1/Qt4Qt5/qscintilla.pro 2019-02-26 13:52:39.639554334 -0500
4410
9b1f851080b6 qscitilla: update to 2.10.1
John D
parents: 4210
diff changeset
4 @@ -23,7 +23,7 @@
4975
e770e9162424 qscintilla: update to v2.1..1
John Donoghue
parents: 4410
diff changeset
5 !win32:VERSION = 15.0.0
4210
601ff07b0776 qscintilla: dont use hide_symbols option
John D
parents:
diff changeset
6
601ff07b0776 qscintilla: dont use hide_symbols option
John D
parents:
diff changeset
7 TEMPLATE = lib
4410
9b1f851080b6 qscitilla: update to 2.10.1
John D
parents: 4210
diff changeset
8 -CONFIG += qt warn_off thread exceptions hide_symbols
4210
601ff07b0776 qscintilla: dont use hide_symbols option
John D
parents:
diff changeset
9 +CONFIG += qt warn_off release thread exceptions
601ff07b0776 qscintilla: dont use hide_symbols option
John D
parents:
diff changeset
10
4410
9b1f851080b6 qscitilla: update to 2.10.1
John D
parents: 4210
diff changeset
11 CONFIG(debug, debug|release) {
9b1f851080b6 qscitilla: update to 2.10.1
John D
parents: 4210
diff changeset
12 mac: {
4975
e770e9162424 qscintilla: update to v2.1..1
John Donoghue
parents: 4410
diff changeset
13 Only in QScintilla_gpl-2.11.1/Qt4Qt5: qscintilla.pro.orig