Skip to content

Commit fa08bcc

Browse files
committed
qt5: update to 5.15.18 and refresh patches and support OpenSSL 4.x
1 parent 4dc3a1f commit fa08bcc

File tree

3 files changed

+365
-4
lines changed

3 files changed

+365
-4
lines changed

packages/addons/addon-depends/qt5/package.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
33

44
PKG_NAME="qt5"
5-
PKG_VERSION="5.15.16"
6-
PKG_SHA256="efa99827027782974356aceff8a52bd3d2a8a93a54dd0db4cca41b5e35f1041c"
5+
PKG_VERSION="5.15.18"
6+
PKG_SHA256="cea1fbabf02455f3f0e8eaa839f5d6f45cdb56b62c8a83af5c1d00ac05f912ea"
77
PKG_LICENSE="GPL"
88
PKG_SITE="https://qt-project.org"
99
PKG_URL="https://download.qt.io/archive/qt/${PKG_VERSION%.*}/${PKG_VERSION}/single/qt-everywhere-opensource-src-${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/qt5/patches/0001-use-sysroot-path-for-pkgconfig-and-libtool.patch renamed to packages/addons/addon-depends/qt5/patches/qt5-0001-use-sysroot-path-for-pkgconfig-and-libtool.patch

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
1+
From e4cd019345a7c0748acbbd55f9b3631a189b4342 Mon Sep 17 00:00:00 2001
2+
From: Jonas Karlman <jonas@kwiboo.se>
3+
Date: Wed, 15 Jan 2020 18:37:45 +0000
4+
Subject: [PATCH] use sysroot path for pkgconfig and libtool
5+
6+
---
7+
qtbase/mkspecs/features/qt_module.prf | 8 ++++----
8+
1 file changed, 4 insertions(+), 4 deletions(-)
9+
10+
diff --git a/qtbase/mkspecs/features/qt_module.prf b/qtbase/mkspecs/features/qt_module.prf
11+
index 79187cb9932..7f6e9d9e48d 100644
112
--- a/qtbase/mkspecs/features/qt_module.prf
213
+++ b/qtbase/mkspecs/features/qt_module.prf
3-
@@ -275,12 +275,12 @@ load(qt_targets)
14+
@@ -268,12 +268,12 @@ load(qt_targets)
415
host_build: \
516
QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS]
617
else: \
@@ -16,7 +27,7 @@
1627
QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME
1728
for(inc, MODULE_AUX_INCLUDES): \
1829
QMAKE_PKGCONFIG_CFLAGS += -I${includedir}/$$section(inc, /, 1, 1)
19-
@@ -308,7 +308,7 @@ load(qt_targets)
30+
@@ -301,7 +301,7 @@ load(qt_targets)
2031
host_build: \
2132
QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
2233
else: \
@@ -25,3 +36,6 @@
2536
!isEmpty(lib_replace0.match) {
2637
ltlib_replace0.match = $$lib_replace0.match
2738
ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/
39+
--
40+
2.53.0
41+

0 commit comments

Comments
 (0)