Mercurial > mxe-octave
changeset 5295:bd34cd02a005
qt5: update to v5.14.1
* src/qtbase.mk, src/qtimageformats.mk,
src/qtsvg.mk, src/qttools.mk,
src/qttranslations.mk: update version, checksum
* src/qtimageformats-1.patch: deleted
* dist-files.mk: removed ref to src/qtimageformats-1.patch
| author | John Donoghue |
|---|---|
| date | Fri, 07 Feb 2020 08:32:04 -0500 |
| parents | 40f896de4578 |
| children | 8d35b561c06f |
| files | dist-files.mk src/qtbase.mk src/qtimageformats-1.patch src/qtimageformats.mk src/qtsvg.mk src/qttools.mk src/qttranslations.mk |
| diffstat | 7 files changed, 6 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Fri Feb 07 08:32:03 2020 -0500 +++ b/dist-files.mk Fri Feb 07 08:32:04 2020 -0500 @@ -604,7 +604,6 @@ qt5.mk \ qtbase-1-fixes.patch \ qtbase.mk \ - qtimageformats-1.patch \ qtimageformats.mk \ qtsvg.mk \ qttranslations.mk \
--- a/src/qtbase.mk Fri Feb 07 08:32:03 2020 -0500 +++ b/src/qtbase.mk Fri Feb 07 08:32:04 2020 -0500 @@ -3,8 +3,8 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.14.0 -$(PKG)_CHECKSUM := bd1b54cb5cc38bea4a84e18ac1e304b2a8f7fd55 +$(PKG)_VERSION := 5.14.1 +$(PKG)_CHECKSUM := f5cc2e80eb422130944672b668c3ad8cf764861c $(PKG)_SUBDIR := $(PKG)-everywhere-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://download.qt.io/official_releases/qt/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
--- a/src/qtimageformats-1.patch Fri Feb 07 08:32:03 2020 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Mon, 17 Jun 2019 13:54:23 +0200 -Subject: [PATCH 1/1] use pkgconfig - - -diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json -index 1111111..2222222 100644 ---- a/src/imageformats/configure.json -+++ b/src/imageformats/configure.json -@@ -55,6 +55,7 @@ - ] - }, - "sources": [ -+ { "type": "pkgConfig", "args": "libmng" }, - "-lmng" - ] - }, -@@ -82,6 +83,7 @@ - ] - }, - "sources": [ -+ { "type": "pkgConfig", "args": "libtiff-4" }, - "-ltiff" - ] - }, -@@ -112,6 +114,7 @@ - ] - }, - "sources": [ -+ { "type": "pkgConfig", "args": "libwebp libwebpdemux libwebpmux" }, - "-lwebp -lwebpdemux -lwebpmux" - ] - }
--- a/src/qtimageformats.mk Fri Feb 07 08:32:03 2020 -0500 +++ b/src/qtimageformats.mk Fri Feb 07 08:32:04 2020 -0500 @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := bfcc484e606a5a520c9f0d4f65e6e29925a303e2 +$(PKG)_CHECKSUM := adb1b91d2b440a8bf4409d7c4f1d48a0682dd13b $(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL))
--- a/src/qtsvg.mk Fri Feb 07 08:32:03 2020 -0500 +++ b/src/qtsvg.mk Fri Feb 07 08:32:04 2020 -0500 @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 8f8acf97605c66935aa3cf26cea008ed565badc4 +$(PKG)_CHECKSUM := 9d6f4e69b0badf10e376b0b7c2ab805aefe979ce $(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL))
--- a/src/qttools.mk Fri Feb 07 08:32:03 2020 -0500 +++ b/src/qttools.mk Fri Feb 07 08:32:04 2020 -0500 @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 99a5352fd3b6eb7ad68742010aef96f99721238b +$(PKG)_CHECKSUM := 9b4f1fe7ebcc180391b9f5cfd129eea81905b829 $(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL))
--- a/src/qttranslations.mk Fri Feb 07 08:32:03 2020 -0500 +++ b/src/qttranslations.mk Fri Feb 07 08:32:04 2020 -0500 @@ -3,7 +3,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 8df8add411294140eab6056c41be14c258bca98d +$(PKG)_CHECKSUM := d8968f29b7cd147aa703b4832b6588ebdc9b34fe $(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL))