From 49d735a14c9ae8b7dcee019784410a854e53ee8f Mon Sep 17 00:00:00 2001 From: guibuilder_pel7x64builder0 Date: Wed, 15 Dec 2021 23:36:14 +0100 Subject: [PATCH] update qt5 libs and nextcloud Signed-off-by: guibuilder_pel7x64builder0 --- SPECS/nextcloud-client.spec | 19 ++++- SPECS/qt5-qtbase.spec | 6 +- SPECS/qt5-qtwebengine.spec | 162 ++++++++++++++++++------------------ SPECS/qt5-qtwebkit.spec | 3 +- 4 files changed, 103 insertions(+), 87 deletions(-) diff --git a/SPECS/nextcloud-client.spec b/SPECS/nextcloud-client.spec index 43d5972..c82a866 100644 --- a/SPECS/nextcloud-client.spec +++ b/SPECS/nextcloud-client.spec @@ -153,19 +153,32 @@ The nextcloud desktop client dolphin extension. %setup -q -n desktop-%{version} %patch2 -p1 +sed -i 's/OpenSSL 1.1/OpenSSL 1.0/g' CMakeLists.txt # change compiler flag sed -i 's/-fPIE/-fPIC/g' src/gui/CMakeLists.txt sed -i 's/-fPIE/-fPIC/g' src/cmd/CMakeLists.txt +# +sed -i 's/find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)//g' -i src/CMakeLists.txt +sed -i 's/get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)//g' -i src/CMakeLists.txt + %build -%cmake_kf5 \ +%cmake3 \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \ + -DBUILD_CLIENT=ON \ + -DBUILD_GUI=OFF \ + -DBUILD_SHELL_INTEGRATION=OFF \ + -DBUILD_SHELL_INTEGRATION_ICONS=OFF \ + -DBUILD_SHELL_INTEGRATION_DOLPHIN=OFF \ + -DBUILD_SHELL_INTEGRATION_NAUTILUS=OFF \ + -DBUILD_SHARED_LIBS=ON \ -DNO_SHIBBOLETH=1 -%cmake_build + +%make_build %install -%cmake_install +%make_install %find_lang client --with-qt mkdir -p %{buildroot}%{_datadir}/appdata/ diff --git a/SPECS/qt5-qtbase.spec b/SPECS/qt5-qtbase.spec index 4db6d9a..fdbdbdf 100644 --- a/SPECS/qt5-qtbase.spec +++ b/SPECS/qt5-qtbase.spec @@ -57,7 +57,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.12.5 -Release: 2%{?dist} +Release: 3%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -938,8 +938,8 @@ fi %endif %files mysql -#%{_qt5_plugindir}/sqldrivers/libqsqlmysql.so -#%{_qt5_libdir}/cmake/Qt5Sql/Qt5Sql_QMYSQLDriverPlugin.cmake +%{_qt5_plugindir}/sqldrivers/libqsqlmysql.so +%{_qt5_libdir}/cmake/Qt5Sql/Qt5Sql_QMYSQLDriverPlugin.cmake %files odbc %{_qt5_plugindir}/sqldrivers/libqsqlodbc.so diff --git a/SPECS/qt5-qtwebengine.spec b/SPECS/qt5-qtwebengine.spec index 06b46c5..795a27d 100644 --- a/SPECS/qt5-qtwebengine.spec +++ b/SPECS/qt5-qtwebengine.spec @@ -413,6 +413,8 @@ popd # copy the Chromium license so it is installed with the appropriate name cp -p src/3rdparty/chromium/LICENSE LICENSE.Chromium +sed 's/greaterThan(QT_GCC_MAJOR_VERSION, 4):return(true)/greaterThan(QT_GCC_MAJOR_VERSION, 3):return(true)/g' -i mkspecs/features/platform.prf +sed 's/return(false)//g' -i mkspecs/features/platform.prf %build export STRIP=strip @@ -493,93 +495,93 @@ while read filename ; do done %files -%license LICENSE.* src/webengine/doc/src/qtwebengine-3rdparty.qdoc -%{_qt5_libdir}/libQt5*.so.* -%{_bindir}/qwebengine_convert_dict -%{_qt5_bindir}/qwebengine_convert_dict -%{_qt5_libdir}/qt5/qml/* -%{_qt5_libdir}/qt5/libexec/QtWebEngineProcess -ifarch %{ix86} -%if 0%{?sse2} -# shared V8 library and its SSE2 version -%{_qt5_libdir}/qtwebengine/ -%endif -%{_qt5_plugindir}/designer/libqwebengineview.so -%dir %{_qt5_datadir}/resources/ -%{_qt5_datadir}/resources/qtwebengine_resources_100p.pak -%{_qt5_datadir}/resources/qtwebengine_resources_200p.pak -%{_qt5_datadir}/resources/qtwebengine_resources.pak -%dir %{_qtwebengine_dictionaries_dir} -%dir %{_qt5_translationdir}/qtwebengine_locales -%lang(am) %{_qt5_translationdir}/qtwebengine_locales/am.pak -%lang(ar) %{_qt5_translationdir}/qtwebengine_locales/ar.pak -%lang(bg) %{_qt5_translationdir}/qtwebengine_locales/bg.pak -%lang(bn) %{_qt5_translationdir}/qtwebengine_locales/bn.pak -%lang(ca) %{_qt5_translationdir}/qtwebengine_locales/ca.pak -%lang(cs) %{_qt5_translationdir}/qtwebengine_locales/cs.pak -%lang(da) %{_qt5_translationdir}/qtwebengine_locales/da.pak -%lang(de) %{_qt5_translationdir}/qtwebengine_locales/de.pak -%lang(el) %{_qt5_translationdir}/qtwebengine_locales/el.pak -%lang(en) %{_qt5_translationdir}/qtwebengine_locales/en-GB.pak -%lang(en) %{_qt5_translationdir}/qtwebengine_locales/en-US.pak -%lang(es) %{_qt5_translationdir}/qtwebengine_locales/es-419.pak -%lang(es) %{_qt5_translationdir}/qtwebengine_locales/es.pak -%lang(et) %{_qt5_translationdir}/qtwebengine_locales/et.pak -%lang(fa) %{_qt5_translationdir}/qtwebengine_locales/fa.pak -%lang(fi) %{_qt5_translationdir}/qtwebengine_locales/fi.pak -%lang(fil) %{_qt5_translationdir}/qtwebengine_locales/fil.pak -%lang(fr) %{_qt5_translationdir}/qtwebengine_locales/fr.pak -%lang(gu) %{_qt5_translationdir}/qtwebengine_locales/gu.pak -%lang(he) %{_qt5_translationdir}/qtwebengine_locales/he.pak -%lang(hi) %{_qt5_translationdir}/qtwebengine_locales/hi.pak -%lang(hr) %{_qt5_translationdir}/qtwebengine_locales/hr.pak -%lang(hu) %{_qt5_translationdir}/qtwebengine_locales/hu.pak -%lang(id) %{_qt5_translationdir}/qtwebengine_locales/id.pak -%lang(it) %{_qt5_translationdir}/qtwebengine_locales/it.pak -%lang(ja) %{_qt5_translationdir}/qtwebengine_locales/ja.pak -%lang(kn) %{_qt5_translationdir}/qtwebengine_locales/kn.pak -%lang(ko) %{_qt5_translationdir}/qtwebengine_locales/ko.pak -%lang(lt) %{_qt5_translationdir}/qtwebengine_locales/lt.pak -%lang(lv) %{_qt5_translationdir}/qtwebengine_locales/lv.pak -%lang(ml) %{_qt5_translationdir}/qtwebengine_locales/ml.pak -%lang(mr) %{_qt5_translationdir}/qtwebengine_locales/mr.pak -%lang(ms) %{_qt5_translationdir}/qtwebengine_locales/ms.pak -%lang(nb) %{_qt5_translationdir}/qtwebengine_locales/nb.pak -%lang(nl) %{_qt5_translationdir}/qtwebengine_locales/nl.pak -%lang(pl) %{_qt5_translationdir}/qtwebengine_locales/pl.pak -%lang(pt_BR) %{_qt5_translationdir}/qtwebengine_locales/pt-BR.pak -%lang(pt_PT) %{_qt5_translationdir}/qtwebengine_locales/pt-PT.pak -%lang(ro) %{_qt5_translationdir}/qtwebengine_locales/ro.pak -%lang(ru) %{_qt5_translationdir}/qtwebengine_locales/ru.pak -%lang(sk) %{_qt5_translationdir}/qtwebengine_locales/sk.pak -%lang(sl) %{_qt5_translationdir}/qtwebengine_locales/sl.pak -%lang(sr) %{_qt5_translationdir}/qtwebengine_locales/sr.pak -%lang(sv) %{_qt5_translationdir}/qtwebengine_locales/sv.pak -%lang(sw) %{_qt5_translationdir}/qtwebengine_locales/sw.pak -%lang(ta) %{_qt5_translationdir}/qtwebengine_locales/ta.pak -%lang(te) %{_qt5_translationdir}/qtwebengine_locales/te.pak -%lang(th) %{_qt5_translationdir}/qtwebengine_locales/th.pak -%lang(tr) %{_qt5_translationdir}/qtwebengine_locales/tr.pak -%lang(uk) %{_qt5_translationdir}/qtwebengine_locales/uk.pak -%lang(vi) %{_qt5_translationdir}/qtwebengine_locales/vi.pak -%lang(zh_CN) %{_qt5_translationdir}/qtwebengine_locales/zh-CN.pak -%lang(zh_TW) %{_qt5_translationdir}/qtwebengine_locales/zh-TW.pak +#%license LICENSE.* src/webengine/doc/src/qtwebengine-3rdparty.qdoc +#%{_qt5_libdir}/libQt5*.so.* +#%{_bindir}/qwebengine_convert_dict +#%{_qt5_bindir}/qwebengine_convert_dict +#%{_qt5_libdir}/qt5/qml/* +#%{_qt5_libdir}/qt5/libexec/QtWebEngineProcess +#ifarch %{ix86} +#%if 0%{?sse2} +## shared V8 library and its SSE2 version +#%{_qt5_libdir}/qtwebengine/ +#%endif +#%{_qt5_plugindir}/designer/libqwebengineview.so +#%dir %{_qt5_datadir}/resources/ +#%{_qt5_datadir}/resources/qtwebengine_resources_100p.pak +#%{_qt5_datadir}/resources/qtwebengine_resources_200p.pak +#%{_qt5_datadir}/resources/qtwebengine_resources.pak +#%dir %{_qtwebengine_dictionaries_dir} +#%dir %{_qt5_translationdir}/qtwebengine_locales +#%lang(am) %{_qt5_translationdir}/qtwebengine_locales/am.pak +#%lang(ar) %{_qt5_translationdir}/qtwebengine_locales/ar.pak +#%lang(bg) %{_qt5_translationdir}/qtwebengine_locales/bg.pak +#%lang(bn) %{_qt5_translationdir}/qtwebengine_locales/bn.pak +#%lang(ca) %{_qt5_translationdir}/qtwebengine_locales/ca.pak +#%lang(cs) %{_qt5_translationdir}/qtwebengine_locales/cs.pak +#%lang(da) %{_qt5_translationdir}/qtwebengine_locales/da.pak +#%lang(de) %{_qt5_translationdir}/qtwebengine_locales/de.pak +#%lang(el) %{_qt5_translationdir}/qtwebengine_locales/el.pak +#%lang(en) %{_qt5_translationdir}/qtwebengine_locales/en-GB.pak +#%lang(en) %{_qt5_translationdir}/qtwebengine_locales/en-US.pak +#%lang(es) %{_qt5_translationdir}/qtwebengine_locales/es-419.pak +#%lang(es) %{_qt5_translationdir}/qtwebengine_locales/es.pak +#%lang(et) %{_qt5_translationdir}/qtwebengine_locales/et.pak +#%lang(fa) %{_qt5_translationdir}/qtwebengine_locales/fa.pak +#%lang(fi) %{_qt5_translationdir}/qtwebengine_locales/fi.pak +#%lang(fil) %{_qt5_translationdir}/qtwebengine_locales/fil.pak +#%lang(fr) %{_qt5_translationdir}/qtwebengine_locales/fr.pak +#%lang(gu) %{_qt5_translationdir}/qtwebengine_locales/gu.pak +#%lang(he) %{_qt5_translationdir}/qtwebengine_locales/he.pak +#%lang(hi) %{_qt5_translationdir}/qtwebengine_locales/hi.pak +#%lang(hr) %{_qt5_translationdir}/qtwebengine_locales/hr.pak +#%lang(hu) %{_qt5_translationdir}/qtwebengine_locales/hu.pak +#%lang(id) %{_qt5_translationdir}/qtwebengine_locales/id.pak +#%lang(it) %{_qt5_translationdir}/qtwebengine_locales/it.pak +#%lang(ja) %{_qt5_translationdir}/qtwebengine_locales/ja.pak +#%lang(kn) %{_qt5_translationdir}/qtwebengine_locales/kn.pak +#%lang(ko) %{_qt5_translationdir}/qtwebengine_locales/ko.pak +#%lang(lt) %{_qt5_translationdir}/qtwebengine_locales/lt.pak +#%lang(lv) %{_qt5_translationdir}/qtwebengine_locales/lv.pak +#%lang(ml) %{_qt5_translationdir}/qtwebengine_locales/ml.pak +#%lang(mr) %{_qt5_translationdir}/qtwebengine_locales/mr.pak +#%lang(ms) %{_qt5_translationdir}/qtwebengine_locales/ms.pak +#%lang(nb) %{_qt5_translationdir}/qtwebengine_locales/nb.pak +#%lang(nl) %{_qt5_translationdir}/qtwebengine_locales/nl.pak +#%lang(pl) %{_qt5_translationdir}/qtwebengine_locales/pl.pak +#%lang(pt_BR) %{_qt5_translationdir}/qtwebengine_locales/pt-BR.pak +#%lang(pt_PT) %{_qt5_translationdir}/qtwebengine_locales/pt-PT.pak +#%lang(ro) %{_qt5_translationdir}/qtwebengine_locales/ro.pak +#%lang(ru) %{_qt5_translationdir}/qtwebengine_locales/ru.pak +#%lang(sk) %{_qt5_translationdir}/qtwebengine_locales/sk.pak +#%lang(sl) %{_qt5_translationdir}/qtwebengine_locales/sl.pak +#%lang(sr) %{_qt5_translationdir}/qtwebengine_locales/sr.pak +#%lang(sv) %{_qt5_translationdir}/qtwebengine_locales/sv.pak +#%lang(sw) %{_qt5_translationdir}/qtwebengine_locales/sw.pak +#%lang(ta) %{_qt5_translationdir}/qtwebengine_locales/ta.pak +#%lang(te) %{_qt5_translationdir}/qtwebengine_locales/te.pak +#%lang(th) %{_qt5_translationdir}/qtwebengine_locales/th.pak +#%lang(tr) %{_qt5_translationdir}/qtwebengine_locales/tr.pak +#%lang(uk) %{_qt5_translationdir}/qtwebengine_locales/uk.pak +#%lang(vi) %{_qt5_translationdir}/qtwebengine_locales/vi.pak +#%lang(zh_CN) %{_qt5_translationdir}/qtwebengine_locales/zh-CN.pak +#%lang(zh_TW) %{_qt5_translationdir}/qtwebengine_locales/zh-TW.pak %files devel %{rpm_macros_dir}/macros.qt5-qtwebengine -%{_qt5_headerdir}/Qt*/ -%{_qt5_libdir}/libQt5*.so -%{_qt5_libdir}/libQt5*.prl -%{_qt5_libdir}/Qt5WebEngineCore.la -%{_qt5_libdir}/cmake/Qt5*/ -%{_qt5_libdir}/pkgconfig/Qt5*.pc -%{_qt5_archdatadir}/mkspecs/modules/*.pri +#%{_qt5_headerdir}/Qt*/ +#%{_qt5_libdir}/libQt5*.so +#%{_qt5_libdir}/libQt5*.prl +#%{_qt5_libdir}/Qt5WebEngineCore.la +#%{_qt5_libdir}/cmake/Qt5*/ +#%{_qt5_libdir}/pkgconfig/Qt5*.pc +#%{_qt5_archdatadir}/mkspecs/modules/*.pri %files devtools -%{_qt5_datadir}/resources/qtwebengine_devtools_resources.pak +#%{_qt5_datadir}/resources/qtwebengine_devtools_resources.pak %files examples -%{_qt5_examplesdir}/ +#%{_qt5_examplesdir}/ %if 0%{?docs} %files doc diff --git a/SPECS/qt5-qtwebkit.spec b/SPECS/qt5-qtwebkit.spec index c18f8df..a14565e 100644 --- a/SPECS/qt5-qtwebkit.spec +++ b/SPECS/qt5-qtwebkit.spec @@ -18,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.30.%{?prerel}%{?dist} +Release: 0.31.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -174,6 +174,7 @@ cmake3 -DPORT=Qt \ -DENABLE_ICONDATABASE=OFF \ -DENABLE_DATABASE_PROCESS=OFF \ -DENABLE_API_TESTS=OFF \ + -DENABLE_ICU=OFF \ -DUSE_SYSTEM_MALLOC=ON \ %if 0%{?docs} -DGENERATE_DOCUMENTATION=ON \