Mercurial > mxe-octave

annotate src/qtimageformats-1.patch @ 5250:db6f82a0f476

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qt5: Update to 5.14.0 * src/qtbase-1-fixes.patch, src/qtimageformats-1.patch: update patch * src/qtbase.mk: update version/checksum * src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk, src/qttranslations.mk: update checksum
author John Donoghue <john.donoghue@ieee.org>
date Wed, 01 Jan 2020 09:06:13 -0500
parents f0fb4aebfcd0
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4310
2c34ec679fb3 qt5: update to 5.7.1
John D
parents: 4222
diff changeset
1 This file is part of MXE. See LICENSE.md for licensing information.
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
2
5161
f0fb4aebfcd0 qt5: update to v5.13.1
John Donoghue
parents: 5099
diff changeset
3 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
4900
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
4 From: Mark Brand <mabrand@mabrand.nl>
5099
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
5 Date: Mon, 17 Jun 2019 13:54:23 +0200
5161
f0fb4aebfcd0 qt5: update to v5.13.1
John Donoghue
parents: 5099
diff changeset
6 Subject: [PATCH 1/1] use pkgconfig
4900
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
7
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
8
5099
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
9 diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json
5161
f0fb4aebfcd0 qt5: update to v5.13.1
John Donoghue
parents: 5099
diff changeset
10 index 1111111..2222222 100644
5099
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
11 --- a/src/imageformats/configure.json
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
12 +++ b/src/imageformats/configure.json
5250
db6f82a0f476 Qt5: Update to 5.14.0
John Donoghue <john.donoghue@ieee.org>
parents: 5161
diff changeset
13 @@ -55,6 +55,7 @@
db6f82a0f476 Qt5: Update to 5.14.0
John Donoghue <john.donoghue@ieee.org>
parents: 5161
diff changeset
14 ]
5099
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
15 },
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
16 "sources": [
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
17 + { "type": "pkgConfig", "args": "libmng" },
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
18 "-lmng"
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
19 ]
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
20 },
5250
db6f82a0f476 Qt5: Update to 5.14.0
John Donoghue <john.donoghue@ieee.org>
parents: 5161
diff changeset
21 @@ -82,6 +83,7 @@
db6f82a0f476 Qt5: Update to 5.14.0
John Donoghue <john.donoghue@ieee.org>
parents: 5161
diff changeset
22 ]
5099
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
23 },
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
24 "sources": [
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
25 + { "type": "pkgConfig", "args": "libtiff-4" },
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
26 "-ltiff"
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
27 ]
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
28 },
5250
db6f82a0f476 Qt5: Update to 5.14.0
John Donoghue <john.donoghue@ieee.org>
parents: 5161
diff changeset
29 @@ -112,6 +114,7 @@
db6f82a0f476 Qt5: Update to 5.14.0
John Donoghue <john.donoghue@ieee.org>
parents: 5161
diff changeset
30 ]
5099
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
31 },
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
32 "sources": [
5250
db6f82a0f476 Qt5: Update to 5.14.0
John Donoghue <john.donoghue@ieee.org>
parents: 5161
diff changeset
33 + { "type": "pkgConfig", "args": "libwebp libwebpdemux libwebpmux" },
db6f82a0f476 Qt5: Update to 5.14.0
John Donoghue <john.donoghue@ieee.org>
parents: 5161
diff changeset
34 "-lwebp -lwebpdemux -lwebpmux"
5099
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
35 ]
9d35f8eb1e76 qt5: update to 5.13.0
John Donoghue
parents: 4900
diff changeset
36 }