From 85984e031926eff54fc6ea8c393cf41c1a225bb0 Mon Sep 17 00:00:00 2001 From: Andreas Cord-Landwehr Date: Sat, 22 Jul 2023 10:40:48 +0200 Subject: [PATCH 1/6] sddm: update SDDM to 0.20.0 --- recipes-support/sddm/sddm_0.19.0.bb | 7 ------- recipes-support/sddm/sddm_0.20.0.bb | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 recipes-support/sddm/sddm_0.19.0.bb create mode 100644 recipes-support/sddm/sddm_0.20.0.bb diff --git a/recipes-support/sddm/sddm_0.19.0.bb b/recipes-support/sddm/sddm_0.19.0.bb deleted file mode 100644 index 0f9ae89..0000000 --- a/recipes-support/sddm/sddm_0.19.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-FileCopyrightText: none -# SPDX-License-Identifier: CC0-1.0 - -require ${PN}.inc -# use unreleased tag for fixing build with Qt 5.15.3 -SRCREV = "8f1e3df4768bd521034e02602c4410b06aaef7d5" -PV = "0.19.0+git${SRCPV}" diff --git a/recipes-support/sddm/sddm_0.20.0.bb b/recipes-support/sddm/sddm_0.20.0.bb new file mode 100644 index 0000000..19547af --- /dev/null +++ b/recipes-support/sddm/sddm_0.20.0.bb @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: none +# SPDX-License-Identifier: CC0-1.0 + +require ${PN}.inc +SRCREV = "a9a664df36c2109d999aa841df7c8856ff68f350" From 9b741592f1f48ff65739962ae3ff9dda090fa9d1 Mon Sep 17 00:00:00 2001 From: Andreas Cord-Landwehr Date: Sat, 22 Jul 2023 10:41:06 +0200 Subject: [PATCH 2/6] layer.conf: add mickledore to supported Yocto releases --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index aa6f3d9..d83878e 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -19,4 +19,4 @@ BBFILE_PATTERN_kde = "^${LAYERDIR}/" BBFILE_PRIORITY_kde = "8" LAYERDEPENDS_kde += "openembedded-layer kf5 qt5-layer" -LAYERSERIES_COMPAT_kde = "honister kirkstone langdale" +LAYERSERIES_COMPAT_kde = "honister kirkstone langdale mickledore" From f9251786509cf97bf45b12e9bd644945668c4fda Mon Sep 17 00:00:00 2001 From: Andreas Cord-Landwehr Date: Sat, 22 Jul 2023 10:42:00 +0200 Subject: [PATCH 3/6] layer.conf: remove EOL yocto releases --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index d83878e..a69aace 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -19,4 +19,4 @@ BBFILE_PATTERN_kde = "^${LAYERDIR}/" BBFILE_PRIORITY_kde = "8" LAYERDEPENDS_kde += "openembedded-layer kf5 qt5-layer" -LAYERSERIES_COMPAT_kde = "honister kirkstone langdale mickledore" +LAYERSERIES_COMPAT_kde = "kirkstone mickledore" From d4110731ac7f5067aab914ce7d45929bb5f0bbbd Mon Sep 17 00:00:00 2001 From: Andreas Cord-Landwehr Date: Sat, 22 Jul 2023 10:42:20 +0200 Subject: [PATCH 4/6] libphonenumber: Update and fix compilation with current abseil-cpp --- recipes-support/libphonenumber.inc | 2 +- .../{libphonenumber_8.13.9.bb => libphonenumber_8.13.17.bb} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename recipes-support/{libphonenumber_8.13.9.bb => libphonenumber_8.13.17.bb} (62%) diff --git a/recipes-support/libphonenumber.inc b/recipes-support/libphonenumber.inc index 59abf0d..670ad3e 100644 --- a/recipes-support/libphonenumber.inc +++ b/recipes-support/libphonenumber.inc @@ -24,5 +24,5 @@ SRC_URI = " \ S = "${WORKDIR}/git/cpp" inherit cmake -EXTRA_OECMAKE += "-DUSE_BOOST=OFF -DBUILD_GEOCODER=OFF" +EXTRA_OECMAKE += "-DUSE_BOOST=OFF -DBUILD_GEOCODER=OFF -DCMAKE_CXX_STANDARD=17" OECMAKE_GENERATOR = "Unix Makefiles" diff --git a/recipes-support/libphonenumber_8.13.9.bb b/recipes-support/libphonenumber_8.13.17.bb similarity index 62% rename from recipes-support/libphonenumber_8.13.9.bb rename to recipes-support/libphonenumber_8.13.17.bb index 98f886e..e0ae722 100644 --- a/recipes-support/libphonenumber_8.13.9.bb +++ b/recipes-support/libphonenumber_8.13.17.bb @@ -2,4 +2,4 @@ # SPDX-License-Identifier: CC0-1.0 require ${PN}.inc -SRCREV = "84f6152fba5a62fc9acc24bbdec970624a331f7c" +SRCREV = "a4a46ef2eae8d7e9abf3eddee949ffca49548678" From 672d4b58bc2e9e870123e9acfa11452a94e8ad58 Mon Sep 17 00:00:00 2001 From: Andreas Cord-Landwehr Date: Sat, 22 Jul 2023 10:42:54 +0200 Subject: [PATCH 5/6] plasma-mobile: remove obsolete qtfeedback dependency --- recipes-plasma/plasma-mobile.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes-plasma/plasma-mobile.inc b/recipes-plasma/plasma-mobile.inc index 7884d28..2611b1e 100644 --- a/recipes-plasma/plasma-mobile.inc +++ b/recipes-plasma/plasma-mobile.inc @@ -63,6 +63,5 @@ RDEPENDS:${PN} += " \ libqofono \ kded \ qtgraphicaleffects \ - qtfeedback \ plasma-nano \ " From 095d0e8fc6ea701bb4b50026fa09500efc30fc54 Mon Sep 17 00:00:00 2001 From: Andreas Cord-Landwehr Date: Sat, 22 Jul 2023 10:43:18 +0200 Subject: [PATCH 6/6] qtfeedback: remove obsolete support package --- recipes-support/qtfeedback_git.bb | 85 ------------------------------- 1 file changed, 85 deletions(-) delete mode 100644 recipes-support/qtfeedback_git.bb diff --git a/recipes-support/qtfeedback_git.bb b/recipes-support/qtfeedback_git.bb deleted file mode 100644 index 27359ef..0000000 --- a/recipes-support/qtfeedback_git.bb +++ /dev/null @@ -1,85 +0,0 @@ -inherit qmake5 -inherit pkgconfig - -DEPENDS += "qtbase qtdeclarative" - -LICENSE = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0-or-later | LGPL-3.0-only | The-Qt-Company-Commercial )" -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ -" - -# most recent change from Sep 3, 2018 -QT_MODULE_BRANCH = "master" -SRC_URI = " \ - git://code.qt.io/cgit/qt/qtfeedback.git;name=qtfeedback;branch=master;protocol=https \ -" - -CVE_PRODUCT = "qt" - -S = "${WORKDIR}/git" - -PV = "5.0.0+git${SRCPV}" - -SRCREV = "a14bd0bb1373cde86e09e3619fb9dc70f34c71f2" - -PACKAGES =. "${PN}-qmlplugins ${PN}-mkspecs " - -RRECOMMENDS:${PN} = " \ - ${PN}-qmlplugins \ - " - -# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*.qmlc,*.js,*.jsc} -FILES:${PN}-qmlplugins = " \ - ${OE_QMAKE_PATH_QML}/*.qmltypes \ - ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \ - ${OE_QMAKE_PATH_QML}/*/qmldir \ - ${OE_QMAKE_PATH_QML}/*/*.qmltypes \ - ${OE_QMAKE_PATH_QML}/*/*.qml \ - ${OE_QMAKE_PATH_QML}/*/*.qmlc \ - ${OE_QMAKE_PATH_QML}/*/*.js \ - ${OE_QMAKE_PATH_QML}/*/*.jsc \ - ${OE_QMAKE_PATH_QML}/*/*.png \ - ${OE_QMAKE_PATH_QML}/*/*/*${SOLIBSDEV} \ - ${OE_QMAKE_PATH_QML}/*/*/qmldir \ - ${OE_QMAKE_PATH_QML}/*/*/*.qmltypes \ - ${OE_QMAKE_PATH_QML}/*/*/*.qml \ - ${OE_QMAKE_PATH_QML}/*/*/*.qmlc \ - ${OE_QMAKE_PATH_QML}/*/*/*.js \ - ${OE_QMAKE_PATH_QML}/*/*/*.jsc \ - ${OE_QMAKE_PATH_QML}/*/*/*.png \ - ${OE_QMAKE_PATH_QML}/*/*/*/*${SOLIBSDEV} \ - ${OE_QMAKE_PATH_QML}/*/*/*/qmldir \ - ${OE_QMAKE_PATH_QML}/*/*/*/images \ - ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \ - ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \ - ${OE_QMAKE_PATH_QML}/*/*/*/*.qmlc \ - ${OE_QMAKE_PATH_QML}/*/*/*/*.js \ - ${OE_QMAKE_PATH_QML}/*/*/*/*.jsc \ - ${OE_QMAKE_PATH_QML}/*/*/*/*.png \ - ${OE_QMAKE_PATH_QML}/*/*/*/*.metainfo \ - ${OE_QMAKE_PATH_QML}/*/*/*/*/*${SOLIBSDEV} \ - ${OE_QMAKE_PATH_QML}/*/*/*/*/qmldir \ - ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmltypes \ - ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qml \ - ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmlc \ - ${OE_QMAKE_PATH_QML}/*/*/*/*/*.js \ - ${OE_QMAKE_PATH_QML}/*/*/*/*/*.jsc \ - ${OE_QMAKE_PATH_QML}/*/*/*/*/*/*.png \ -" - -FILES:${PN}-mkspecs = "\ - ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \ -" - -FILES:${PN}-dev += " \ - ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \ - ${OE_QMAKE_PATH_LIBS}/pkgconfig \ - ${OE_QMAKE_PATH_LIBS}/cmake/* \ - ${OE_QMAKE_PATH_LIBS}/*.prl \ - ${OE_QMAKE_PATH_LIBS}/*.la \ - ${OE_QMAKE_PATH_HEADERS}/* \ -"