diff --git a/classes/cmake_kf5.bbclass b/classes/cmake_kf5.bbclass index 73aa010..d2ac51c 100644 --- a/classes/cmake_kf5.bbclass +++ b/classes/cmake_kf5.bbclass @@ -1,28 +1,28 @@ inherit cmake_qt5 EXTRA_OECMAKE += " \ -DOE_KF5_PATH_HOST_ROOT=${STAGING_DIR_HOST} \ -DBUILD_TESTING=OFF \ " DEPENDS += "extra-cmake-modules qttools-native" # don't bother with translations for host tools -do_configure_class-native_prepend() { +do_configure_prepend_class-native() { rm -rf ${S}/po } # This function is rather offensive right now, but it seems to work do_install_prepend() { if [ "0" -ne $(find . -name \*.cmake | grep _usr | wc -l) ]; then sed -i 's/\"\/usr\//\"\$\{OE_KF5_PATH_HOST_ROOT\}\/usr\//g' $(find . -name "*.cmake" | grep _usr) sed -i 's/\;\/usr\//\;\$\{OE_KF5_PATH_HOST_ROOT\}\/usr\//g' $(find . -name "*.cmake" | grep _usr) fi } BBCLASSEXTEND = "native nativesdk" FILES_${PN}-dev += " \ ${libdir}/cmake/KF5*/*.cmake \ ${prefix}/mkspecs/modules/qt_*.pri \ " diff --git a/recipes-kf5/tier1/attica_5.37.0.bb b/recipes-kf5/tier1/attica_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/attica_5.37.0.bb rename to recipes-kf5/tier1/attica_5.38.0.bb diff --git a/recipes-kf5/tier1/bluez-qt_5.37.0.bb b/recipes-kf5/tier1/bluez-qt_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/bluez-qt_5.37.0.bb rename to recipes-kf5/tier1/bluez-qt_5.38.0.bb diff --git a/recipes-kf5/tier1/breeze-icons_5.37.0.bb b/recipes-kf5/tier1/breeze-icons_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/breeze-icons_5.37.0.bb rename to recipes-kf5/tier1/breeze-icons_5.38.0.bb diff --git a/recipes-kf5/tier1/extra-cmake-modules.inc b/recipes-kf5/tier1/extra-cmake-modules.inc index 7680653..9e3acfc 100644 --- a/recipes-kf5/tier1/extra-cmake-modules.inc +++ b/recipes-kf5/tier1/extra-cmake-modules.inc @@ -1,23 +1,23 @@ DESCRIPTION = "Extra CMake Modules" HOMEPAGE = "https://api.kde.org/frameworks/extra-cmake-modules/html/index.html" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1" PR = "r0" DEPENDS = "cmake-native qttools" -SRC_URI = "git://anongit.kde.org/extra-cmake-modules;protocol=git" +SRC_URI = "git://anongit.kde.org/extra-cmake-modules;nobranch=1" S = "${WORKDIR}/git" do_compile() { cmake -DCMAKE_INSTALL_PREFIX:PATH=${D}/${prefix}/ . make } do_install() { make install } FILES_${PN}-dev += " ${datadir}/ECM" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-kf5/tier1/extra-cmake-modules_5.37.0.bb b/recipes-kf5/tier1/extra-cmake-modules_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/extra-cmake-modules_5.37.0.bb rename to recipes-kf5/tier1/extra-cmake-modules_5.38.0.bb diff --git a/recipes-kf5/tier1/karchive_5.37.0.bb b/recipes-kf5/tier1/karchive_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/karchive_5.37.0.bb rename to recipes-kf5/tier1/karchive_5.38.0.bb diff --git a/recipes-kf5/tier1/kcodecs_5.37.0.bb b/recipes-kf5/tier1/kcodecs_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/kcodecs_5.37.0.bb rename to recipes-kf5/tier1/kcodecs_5.38.0.bb diff --git a/recipes-kf5/tier1/kconfig_5.37.0.bb b/recipes-kf5/tier1/kconfig_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/kconfig_5.37.0.bb rename to recipes-kf5/tier1/kconfig_5.38.0.bb diff --git a/recipes-kf5/tier1/kcoreaddons_5.37.0.bb b/recipes-kf5/tier1/kcoreaddons_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/kcoreaddons_5.37.0.bb rename to recipes-kf5/tier1/kcoreaddons_5.38.0.bb diff --git a/recipes-kf5/tier1/kdbusaddons_5.37.0.bb b/recipes-kf5/tier1/kdbusaddons_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/kdbusaddons_5.37.0.bb rename to recipes-kf5/tier1/kdbusaddons_5.38.0.bb diff --git a/recipes-kf5/tier1/kdnssd_5.37.0.bb b/recipes-kf5/tier1/kdnssd_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/kdnssd_5.37.0.bb rename to recipes-kf5/tier1/kdnssd_5.38.0.bb diff --git a/recipes-kf5/tier1/kguiaddons_5.37.0.bb b/recipes-kf5/tier1/kguiaddons_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/kguiaddons_5.37.0.bb rename to recipes-kf5/tier1/kguiaddons_5.38.0.bb diff --git a/recipes-kf5/tier1/ki18n_5.37.0.bb b/recipes-kf5/tier1/ki18n_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/ki18n_5.37.0.bb rename to recipes-kf5/tier1/ki18n_5.38.0.bb diff --git a/recipes-kf5/tier1/kidletime_5.37.0.bb b/recipes-kf5/tier1/kidletime_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/kidletime_5.37.0.bb rename to recipes-kf5/tier1/kidletime_5.38.0.bb diff --git a/recipes-kf5/tier1/kimageformats_5.37.0.bb b/recipes-kf5/tier1/kimageformats_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/kimageformats_5.37.0.bb rename to recipes-kf5/tier1/kimageformats_5.38.0.bb diff --git a/recipes-kf5/tier1/kirigami_5.37.0.bb b/recipes-kf5/tier1/kirigami_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/kirigami_5.37.0.bb rename to recipes-kf5/tier1/kirigami_5.38.0.bb diff --git a/recipes-kf5/tier1/kitemmodels_5.37.0.bb b/recipes-kf5/tier1/kitemmodels_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/kitemmodels_5.37.0.bb rename to recipes-kf5/tier1/kitemmodels_5.38.0.bb diff --git a/recipes-kf5/tier1/kitemviews_5.37.0.bb b/recipes-kf5/tier1/kitemviews_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/kitemviews_5.37.0.bb rename to recipes-kf5/tier1/kitemviews_5.38.0.bb diff --git a/recipes-kf5/tier1/kplotting_5.37.0.bb b/recipes-kf5/tier1/kplotting_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/kplotting_5.37.0.bb rename to recipes-kf5/tier1/kplotting_5.38.0.bb diff --git a/recipes-kf5/tier1/ksyntaxhighlighting.inc b/recipes-kf5/tier1/ksyntaxhighlighting.inc index e7c586c..d6f2ff4 100644 --- a/recipes-kf5/tier1/ksyntaxhighlighting.inc +++ b/recipes-kf5/tier1/ksyntaxhighlighting.inc @@ -1,23 +1,23 @@ DESCRIPTION = "KSyntaxHighlighting" HOMEPAGE = "https://api.kde.org/frameworks/syntax-highlighting/html/index.html" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" PR = "r0" DEPENDS = "qtbase ksyntaxhighlighting-native" SRC_URI = " \ git://anongit.kde.org/syntax-highlighting;nobranch=1 \ " S = "${WORKDIR}/git" inherit cmake_kf5 inherit perlnative EXTRA_OECMAKE_class-native += " -DKSYNTAXHIGHLIGHTING_USE_GUI=OFF" EXTRA_OECMAKE_class-target += " -DKATEHIGHLIGHTINGINDEXER=${STAGING_DIR_NATIVE}/${bindir}/katehighlightingindexer" sysroot_stage_all_append_class-native () { mkdir -p ${SYSROOT_DESTDIR}/${bindir} - cp ${B}/src/indexer/katehighlightingindexer ${SYSROOT_DESTDIR}/${bindir} + cp ${B}/bin/katehighlightingindexer ${SYSROOT_DESTDIR}/${bindir} } diff --git a/recipes-kf5/tier1/ksyntaxhighlighting_5.37.0.bb b/recipes-kf5/tier1/ksyntaxhighlighting_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/ksyntaxhighlighting_5.37.0.bb rename to recipes-kf5/tier1/ksyntaxhighlighting_5.38.0.bb diff --git a/recipes-kf5/tier1/kwayland_5.37.0.bb b/recipes-kf5/tier1/kwayland_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/kwayland_5.37.0.bb rename to recipes-kf5/tier1/kwayland_5.38.0.bb diff --git a/recipes-kf5/tier1/kwidgetsaddons_5.37.0.bb b/recipes-kf5/tier1/kwidgetsaddons_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/kwidgetsaddons_5.37.0.bb rename to recipes-kf5/tier1/kwidgetsaddons_5.38.0.bb diff --git a/recipes-kf5/tier1/kwindowsystem_5.37.0.bb b/recipes-kf5/tier1/kwindowsystem_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/kwindowsystem_5.37.0.bb rename to recipes-kf5/tier1/kwindowsystem_5.38.0.bb diff --git a/recipes-kf5/tier1/modemmanager-qt_5.37.0.bb b/recipes-kf5/tier1/modemmanager-qt_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/modemmanager-qt_5.37.0.bb rename to recipes-kf5/tier1/modemmanager-qt_5.38.0.bb diff --git a/recipes-kf5/tier1/networkmanager-qt_5.37.0.bb b/recipes-kf5/tier1/networkmanager-qt_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/networkmanager-qt_5.37.0.bb rename to recipes-kf5/tier1/networkmanager-qt_5.38.0.bb diff --git a/recipes-kf5/tier1/oxygen-icons_5.37.0.bb b/recipes-kf5/tier1/oxygen-icons_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/oxygen-icons_5.37.0.bb rename to recipes-kf5/tier1/oxygen-icons_5.38.0.bb diff --git a/recipes-kf5/tier1/prison_5.37.0.bb b/recipes-kf5/tier1/prison_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/prison_5.37.0.bb rename to recipes-kf5/tier1/prison_5.38.0.bb diff --git a/recipes-kf5/tier1/solid_5.37.0.bb b/recipes-kf5/tier1/solid_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/solid_5.37.0.bb rename to recipes-kf5/tier1/solid_5.38.0.bb diff --git a/recipes-kf5/tier1/sonnet_5.37.0.bb b/recipes-kf5/tier1/sonnet_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/sonnet_5.37.0.bb rename to recipes-kf5/tier1/sonnet_5.38.0.bb diff --git a/recipes-kf5/tier1/threadweaver_5.37.0.bb b/recipes-kf5/tier1/threadweaver_5.38.0.bb similarity index 100% rename from recipes-kf5/tier1/threadweaver_5.37.0.bb rename to recipes-kf5/tier1/threadweaver_5.38.0.bb diff --git a/recipes-kf5/tier2/kactivities_5.37.0.bb b/recipes-kf5/tier2/kactivities_5.38.0.bb similarity index 100% rename from recipes-kf5/tier2/kactivities_5.37.0.bb rename to recipes-kf5/tier2/kactivities_5.38.0.bb diff --git a/recipes-kf5/tier2/kauth_5.37.0.bb b/recipes-kf5/tier2/kauth_5.38.0.bb similarity index 100% rename from recipes-kf5/tier2/kauth_5.37.0.bb rename to recipes-kf5/tier2/kauth_5.38.0.bb diff --git a/recipes-kf5/tier2/kcompletion_5.37.0.bb b/recipes-kf5/tier2/kcompletion_5.38.0.bb similarity index 100% rename from recipes-kf5/tier2/kcompletion_5.37.0.bb rename to recipes-kf5/tier2/kcompletion_5.38.0.bb diff --git a/recipes-kf5/tier2/kcrash_5.37.0.bb b/recipes-kf5/tier2/kcrash_5.38.0.bb similarity index 100% rename from recipes-kf5/tier2/kcrash_5.37.0.bb rename to recipes-kf5/tier2/kcrash_5.38.0.bb diff --git a/recipes-kf5/tier2/kfilemetadata_5.37.0.bb b/recipes-kf5/tier2/kfilemetadata_5.38.0.bb similarity index 100% rename from recipes-kf5/tier2/kfilemetadata_5.37.0.bb rename to recipes-kf5/tier2/kfilemetadata_5.38.0.bb diff --git a/recipes-kf5/tier2/kjobwidgets_5.37.0.bb b/recipes-kf5/tier2/kjobwidgets_5.38.0.bb similarity index 100% rename from recipes-kf5/tier2/kjobwidgets_5.37.0.bb rename to recipes-kf5/tier2/kjobwidgets_5.38.0.bb diff --git a/recipes-kf5/tier2/knotifications_5.37.0.bb b/recipes-kf5/tier2/knotifications_5.38.0.bb similarity index 100% rename from recipes-kf5/tier2/knotifications_5.37.0.bb rename to recipes-kf5/tier2/knotifications_5.38.0.bb diff --git a/recipes-kf5/tier2/kpackage_5.37.0.bb b/recipes-kf5/tier2/kpackage_5.38.0.bb similarity index 100% rename from recipes-kf5/tier2/kpackage_5.37.0.bb rename to recipes-kf5/tier2/kpackage_5.38.0.bb diff --git a/recipes-kf5/tier2/kpty_5.37.0.bb b/recipes-kf5/tier2/kpty_5.38.0.bb similarity index 100% rename from recipes-kf5/tier2/kpty_5.37.0.bb rename to recipes-kf5/tier2/kpty_5.38.0.bb diff --git a/recipes-kf5/tier2/kunitconversion_5.37.0.bb b/recipes-kf5/tier2/kunitconversion_5.38.0.bb similarity index 100% rename from recipes-kf5/tier2/kunitconversion_5.37.0.bb rename to recipes-kf5/tier2/kunitconversion_5.38.0.bb diff --git a/recipes-kf5/tier3/baloo_5.37.0.bb b/recipes-kf5/tier3/baloo_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/baloo_5.37.0.bb rename to recipes-kf5/tier3/baloo_5.38.0.bb diff --git a/recipes-kf5/tier3/kactivitiesstats_5.37.0.bb b/recipes-kf5/tier3/kactivitiesstats_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kactivitiesstats_5.37.0.bb rename to recipes-kf5/tier3/kactivitiesstats_5.38.0.bb diff --git a/recipes-kf5/tier3/kbookmarks_5.37.0.bb b/recipes-kf5/tier3/kbookmarks_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kbookmarks_5.37.0.bb rename to recipes-kf5/tier3/kbookmarks_5.38.0.bb diff --git a/recipes-kf5/tier3/kcmutils_5.37.0.bb b/recipes-kf5/tier3/kcmutils_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kcmutils_5.37.0.bb rename to recipes-kf5/tier3/kcmutils_5.38.0.bb diff --git a/recipes-kf5/tier3/kconfigwidgets_5.37.0.bb b/recipes-kf5/tier3/kconfigwidgets_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kconfigwidgets_5.37.0.bb rename to recipes-kf5/tier3/kconfigwidgets_5.38.0.bb diff --git a/recipes-kf5/tier3/kdeclarative_5.37.0.bb b/recipes-kf5/tier3/kdeclarative_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kdeclarative_5.37.0.bb rename to recipes-kf5/tier3/kdeclarative_5.38.0.bb diff --git a/recipes-kf5/tier3/kded_5.37.0.bb b/recipes-kf5/tier3/kded_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kded_5.37.0.bb rename to recipes-kf5/tier3/kded_5.38.0.bb diff --git a/recipes-kf5/tier3/kdesu_5.37.0.bb b/recipes-kf5/tier3/kdesu_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kdesu_5.37.0.bb rename to recipes-kf5/tier3/kdesu_5.38.0.bb diff --git a/recipes-kf5/tier3/kemoticons_5.37.0.bb b/recipes-kf5/tier3/kemoticons_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kemoticons_5.37.0.bb rename to recipes-kf5/tier3/kemoticons_5.38.0.bb diff --git a/recipes-kf5/tier3/kglobalaccel_5.37.0.bb b/recipes-kf5/tier3/kglobalaccel_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kglobalaccel_5.37.0.bb rename to recipes-kf5/tier3/kglobalaccel_5.38.0.bb diff --git a/recipes-kf5/tier3/kiconthemes_5.37.0.bb b/recipes-kf5/tier3/kiconthemes_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kiconthemes_5.37.0.bb rename to recipes-kf5/tier3/kiconthemes_5.38.0.bb diff --git a/recipes-kf5/tier3/kinit_5.37.0.bb b/recipes-kf5/tier3/kinit_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kinit_5.37.0.bb rename to recipes-kf5/tier3/kinit_5.38.0.bb diff --git a/recipes-kf5/tier3/kio_5.37.0.bb b/recipes-kf5/tier3/kio_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kio_5.37.0.bb rename to recipes-kf5/tier3/kio_5.38.0.bb diff --git a/recipes-kf5/tier3/knewstuff_5.37.0.bb b/recipes-kf5/tier3/knewstuff_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/knewstuff_5.37.0.bb rename to recipes-kf5/tier3/knewstuff_5.38.0.bb diff --git a/recipes-kf5/tier3/knotifyconfig_5.37.0.bb b/recipes-kf5/tier3/knotifyconfig_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/knotifyconfig_5.37.0.bb rename to recipes-kf5/tier3/knotifyconfig_5.38.0.bb diff --git a/recipes-kf5/tier3/kparts_5.37.0.bb b/recipes-kf5/tier3/kparts_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kparts_5.37.0.bb rename to recipes-kf5/tier3/kparts_5.38.0.bb diff --git a/recipes-kf5/tier3/kpeople_5.37.0.bb b/recipes-kf5/tier3/kpeople_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kpeople_5.37.0.bb rename to recipes-kf5/tier3/kpeople_5.38.0.bb diff --git a/recipes-kf5/tier3/krunner.inc b/recipes-kf5/tier3/krunner.inc index 747d24b..452f367 100644 --- a/recipes-kf5/tier3/krunner.inc +++ b/recipes-kf5/tier3/krunner.inc @@ -1,34 +1,35 @@ DESCRIPTION = "KRunner" HOMEPAGE = "https://api.kde.org/frameworks/krunner/html/index.html" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" PR = "r0" DEPENDS = " \ qtbase \ qtdeclarative \ kconfig \ kcoreaddons \ ki18n \ kio \ kservice \ plasma-framework \ solid \ threadweaver \ " SRC_URI = "git://anongit.kde.org/krunner;nobranch=1" S = "${WORKDIR}/git" inherit cmake_kf5 inherit gettext inherit python3native FILES_${PN} += " \ ${libdir}/qml/org/kde/runnermodel/* \ ${datadir}/kservicetypes5/*.desktop \ " FILES_${PN}-dev += " \ ${datadir}/kdevappwizard/templates/* \ + ${datadir}/dbus-1/interfaces/*.xml \ " diff --git a/recipes-kf5/tier3/krunner_5.37.0.bb b/recipes-kf5/tier3/krunner_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/krunner_5.37.0.bb rename to recipes-kf5/tier3/krunner_5.38.0.bb diff --git a/recipes-kf5/tier3/kservice_5.37.0.bb b/recipes-kf5/tier3/kservice_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kservice_5.37.0.bb rename to recipes-kf5/tier3/kservice_5.38.0.bb diff --git a/recipes-kf5/tier3/ktexteditor.inc b/recipes-kf5/tier3/ktexteditor.inc index cb97c39..486f882 100644 --- a/recipes-kf5/tier3/ktexteditor.inc +++ b/recipes-kf5/tier3/ktexteditor.inc @@ -1,46 +1,45 @@ DESCRIPTION = "KTextEditor" HOMEPAGE = "https://api.kde.org/frameworks/ktexteditor/html/index.html" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" PR = "r0" DEPENDS = " \ qtbase \ karchive \ kconfig \ kguiaddons \ ki18n \ kio \ kparts \ sonnet \ kiconthemes \ ksyntaxhighlighting \ " SRC_URI = " \ git://anongit.kde.org/ktexteditor;nobranch=1 \ - file://0001-no-accessibility.patch \ " S = "${WORKDIR}/git" inherit cmake_kf5 inherit gettext inherit python3native do_compile_prepend() { # desktoptojson needs to find installed service type files export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS } FILES_${PN} += " \ ${libdir}/plugins/kf5/parts/katepart.so \ ${datadir}/kservices5/*.desktop \ ${datadir}/kservicetypes5/*.desktop \ ${datadir}/dbus-1/system-services/*.service \ ${datadir}/polkit-1/actions/*.policy \ ${datadir}/katepart5/script/README.md \ " FILES_${PN}-dev += " \ ${datadir}/kdevappwizard/templates/*.bz2 \ " diff --git a/recipes-kf5/tier3/ktexteditor/0001-no-accessibility.patch b/recipes-kf5/tier3/ktexteditor/0001-no-accessibility.patch deleted file mode 100644 index 62972e5..0000000 --- a/recipes-kf5/tier3/ktexteditor/0001-no-accessibility.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/src/view/kateviewinternal.cpp b/src/view/kateviewinternal.cpp -index 55f994ec..b664d5f1 100644 ---- a/src/view/kateviewinternal.cpp -+++ b/src/view/kateviewinternal.cpp -@@ -3756,18 +3756,22 @@ void KateViewInternal::flashChar(const KTextEditor::Cursor &pos, KTextEditor::At - - void KateViewInternal::documentTextInserted(KTextEditor::Document *document, const KTextEditor::Range &range) - { -+#ifndef QT_NO_ACCESSIBILITY - if (QAccessible::isActive()) { - QAccessibleTextInsertEvent ev(this, - KateViewAccessible::positionFromCursor(this, range.start()), document->text(range)); - QAccessible::updateAccessibility(&ev); - } -+#endif - } - - void KateViewInternal::documentTextRemoved(KTextEditor::Document * /*document*/, const KTextEditor::Range &range, const QString &oldText) - { -+#ifndef QT_NO_ACCESSIBILITY - if (QAccessible::isActive()) { - QAccessibleTextRemoveEvent ev(this, - KateViewAccessible::positionFromCursor(this, range.start()), oldText); - QAccessible::updateAccessibility(&ev); - } -+#endif - } diff --git a/recipes-kf5/tier3/ktexteditor_5.37.0.bb b/recipes-kf5/tier3/ktexteditor_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/ktexteditor_5.37.0.bb rename to recipes-kf5/tier3/ktexteditor_5.38.0.bb diff --git a/recipes-kf5/tier3/ktextwidgets_5.37.0.bb b/recipes-kf5/tier3/ktextwidgets_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/ktextwidgets_5.37.0.bb rename to recipes-kf5/tier3/ktextwidgets_5.38.0.bb diff --git a/recipes-kf5/tier3/kwallet.inc b/recipes-kf5/tier3/kwallet.inc index c48acd3..7f17642 100644 --- a/recipes-kf5/tier3/kwallet.inc +++ b/recipes-kf5/tier3/kwallet.inc @@ -1,40 +1,39 @@ DESCRIPTION = "KWallet" HOMEPAGE = "https://api.kde.org/frameworks/kwallet/html/index.html" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" PR = "r0" DEPENDS = " \ qtbase \ kconfig \ kconfigwidgets \ kcoreaddons \ kdbusaddons \ kiconthemes \ knotifications \ ki18n \ kservice \ kwidgetsaddons \ kwindowsystem \ libgcrypt \ " SRC_URI = " \ git://anongit.kde.org/kwallet;nobranch=1 \ - file://0001-no-find-file.patch \ " S = "${WORKDIR}/git" inherit cmake_kf5 inherit gettext inherit python3native FILES_${PN} += " \ ${datadir}/knotifications5/*.notifyrc \ ${datadir}/kservices5/*.desktop \ ${datadir}/dbus-1/services/*.service \ " FILES_${PN}-dev += " \ ${datadir}/dbus-1/interfaces/*.xml \ " diff --git a/recipes-kf5/tier3/kwallet/0001-no-find-file.patch b/recipes-kf5/tier3/kwallet/0001-no-find-file.patch deleted file mode 100644 index 7cd41f1..0000000 --- a/recipes-kf5/tier3/kwallet/0001-no-find-file.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit 0922360ec29816a0843f5eb93be24891ef2cfe8f -Author: Volker Krause -Date: Fri Aug 4 20:15:45 2017 +0200 - - Don't use find_file for finding files in our own source dir - - Summary: - It's not necessary, and it breaks when cross-compiling, as find_file - changes its behavior then. - - Reviewers: #frameworks - - Tags: #frameworks - - Differential Revision: https://phabricator.kde.org/D7136 - -diff --git a/src/runtime/kwalletd/CMakeLists.txt b/src/runtime/kwalletd/CMakeLists.txt -index f530d7a..7c916c4 100644 ---- a/src/runtime/kwalletd/CMakeLists.txt -+++ b/src/runtime/kwalletd/CMakeLists.txt -@@ -78,7 +78,7 @@ if (Gpgmepp_FOUND) - ) - endif(Gpgmepp_FOUND) - --find_file(kwallet_xml org.kde.KWallet.xml HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../../api/KWallet) -+set(kwallet_xml ${CMAKE_CURRENT_SOURCE_DIR}/../../api/KWallet/org.kde.KWallet.xml) - - qt5_add_dbus_adaptor( kwalletd_SRCS ${kwallet_xml} kwalletd.h KWalletD ) - diff --git a/recipes-kf5/tier3/kwallet_5.37.0.bb b/recipes-kf5/tier3/kwallet_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kwallet_5.37.0.bb rename to recipes-kf5/tier3/kwallet_5.38.0.bb diff --git a/recipes-kf5/tier3/kxmlgui_5.37.0.bb b/recipes-kf5/tier3/kxmlgui_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kxmlgui_5.37.0.bb rename to recipes-kf5/tier3/kxmlgui_5.38.0.bb diff --git a/recipes-kf5/tier3/kxmlrpcclient_5.37.0.bb b/recipes-kf5/tier3/kxmlrpcclient_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/kxmlrpcclient_5.37.0.bb rename to recipes-kf5/tier3/kxmlrpcclient_5.38.0.bb diff --git a/recipes-kf5/tier3/plasma-framework_5.37.0.bb b/recipes-kf5/tier3/plasma-framework_5.38.0.bb similarity index 100% rename from recipes-kf5/tier3/plasma-framework_5.37.0.bb rename to recipes-kf5/tier3/plasma-framework_5.38.0.bb