Update to KF 5.38.0

This commit is contained in:
Volker Krause
2017-09-16 11:58:51 +02:00
parent 56a2b83e9d
commit 408dd9bc36
72 changed files with 4 additions and 61 deletions

View File

@@ -8,7 +8,7 @@ EXTRA_OECMAKE += " \
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
}

View File

@@ -6,7 +6,7 @@ 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() {

View File

@@ -19,5 +19,5 @@ EXTRA_OECMAKE_class-target += " -DKATEHIGHLIGHTINGINDEXER=${STAGING_DIR_NATIVE}/
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}
}

View File

@@ -31,4 +31,5 @@ FILES_${PN} += " \
FILES_${PN}-dev += " \
${datadir}/kdevappwizard/templates/* \
${datadir}/dbus-1/interfaces/*.xml \
"

View File

@@ -19,7 +19,6 @@ DEPENDS = " \
SRC_URI = " \
git://anongit.kde.org/ktexteditor;nobranch=1 \
file://0001-no-accessibility.patch \
"
S = "${WORKDIR}/git"

View File

@@ -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
}

View File

@@ -21,7 +21,6 @@ DEPENDS = " \
SRC_URI = " \
git://anongit.kde.org/kwallet;nobranch=1 \
file://0001-no-find-file.patch \
"
S = "${WORKDIR}/git"

View File

@@ -1,29 +0,0 @@
commit 0922360ec29816a0843f5eb93be24891ef2cfe8f
Author: Volker Krause <vkrause@kde.org>
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 )