From ad3705ed7fc0cf2023d77280c7525ef9b9521c21 Mon Sep 17 00:00:00 2001 From: lyn1001 Date: Tue, 18 Jan 2022 19:19:31 +0800 Subject: [PATCH] fix build error (cherry picked from commit 1214714aaf13caeb26c0e41ae5c80368a5c80e11) --- qt5-qtenginio.spec | 8 ++++++-- qt5-qtenginio.yaml | 2 +- qt5-qtenginio_linkedlist.patch | 23 +++++++++++++++++++++++ 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 qt5-qtenginio_linkedlist.patch diff --git a/qt5-qtenginio.spec b/qt5-qtenginio.spec index 62feca5..fc3bd7e 100644 --- a/qt5-qtenginio.spec +++ b/qt5-qtenginio.spec @@ -1,15 +1,16 @@ Name: qt5-qtenginio Epoch: 1 Version: 1.6.2 -Release: 19 +Release: 20 Summary: Enginio component License: LGPLv2 with exceptions or GPLv3 with exceptions URL: http://www.qt.io Source0: qtenginio-opensource-src-%{version}.tar.xz +Patch0: qt5-qtenginio_linkedlist.patch %global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$ -BuildRequires: qt5-qtbase-devel >= 5.6 qt5-qtbase-private-devel qt5-qtdeclarative-devel +BuildRequires: qt5-qtbase-devel >= 5.6 qt5-qtbase-private-devel qt5-qtdeclarative-devel make %{?_qt5:Requires: %{_qt5} = %{_qt5_version}} %description @@ -87,5 +88,8 @@ cd - %{_qt5_docdir}/qtenginioqml %changelog +* Tue Jan 18 2022 liyanan - 1:1.6.2-20 +- fix build error + * Mon Dec 2 2019 openEuler Buildteam - 1:1.6.2-19 - Package init diff --git a/qt5-qtenginio.yaml b/qt5-qtenginio.yaml index 802fff1..ec7b03d 100644 --- a/qt5-qtenginio.yaml +++ b/qt5-qtenginio.yaml @@ -1,4 +1,4 @@ version_control: NA src_repo: NA tag_pattern: NA -seperator: NA +separator: NA diff --git a/qt5-qtenginio_linkedlist.patch b/qt5-qtenginio_linkedlist.patch new file mode 100644 index 0000000..b7133c3 --- /dev/null +++ b/qt5-qtenginio_linkedlist.patch @@ -0,0 +1,23 @@ +diff -rupN qtenginio-opensource-src-1.6.2/src/enginio_client/enginio_client.pro qtenginio-opensource-src-1.6.2-new/src/enginio_client/enginio_client.pro +--- qtenginio-opensource-src-1.6.2/src/enginio_client/enginio_client.pro 2016-06-19 04:47:31.000000000 +0200 ++++ qtenginio-opensource-src-1.6.2-new/src/enginio_client/enginio_client.pro 2020-04-13 13:33:53.742370093 +0200 +@@ -3,6 +3,7 @@ MODULE = enginio + + QT = core-private network + DEFINES += ENGINIOCLIENT_LIBRARY ++DEFINES -= QT_NO_LINKED_LIST + + QMAKE_DOCS = $$PWD/doc/qtenginio.qdocconf + OTHER_FILES += \ +diff -rupN qtenginio-opensource-src-1.6.2/src/enginio_plugin/enginio_plugin.pro qtenginio-opensource-src-1.6.2-new/src/enginio_plugin/enginio_plugin.pro +--- qtenginio-opensource-src-1.6.2/src/enginio_plugin/enginio_plugin.pro 2016-06-19 04:47:31.000000000 +0200 ++++ qtenginio-opensource-src-1.6.2-new/src/enginio_plugin/enginio_plugin.pro 2020-04-13 13:36:22.067500649 +0200 +@@ -6,6 +6,8 @@ IMPORT_VERSION = 1.0 + + QT = qml enginio enginio-private core-private + ++DEFINES -= QT_NO_LINKED_LIST ++ + QMAKE_DOCS = $$PWD/doc/qtenginioqml.qdocconf + OTHER_FILES += \ + doc/qtenginioqml.qdocconf \ -- Gitee