From 50778dacdfb06dc06f0441c6559cc1d213f8c50f Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sun, 14 Mar 2021 03:24:31 +0000 Subject: Sun Mar 14 03:24:31 UTC 2021 a/efivar-20201015_cff88dd-x86_64-1.txz: Upgraded. Updated to fix issues with eMMC based systems. Thanks to Andypoo. a/gptfdisk-1.0.7-x86_64-1.txz: Upgraded. a/xfsprogs-5.11.0-x86_64-1.txz: Upgraded. ap/qpdf-10.3.1-x86_64-1.txz: Upgraded. ap/sqlite-3.35.0-x86_64-1.txz: Upgraded. ap/sudo-1.9.5p2-x86_64-3.txz: Rebuilt. Fix build time detection of PAM. Thanks to pghvlaans. kde/attica-5.80.0-x86_64-1.txz: Upgraded. kde/baloo-5.80.0-x86_64-1.txz: Upgraded. kde/bluez-qt-5.80.0-x86_64-1.txz: Upgraded. kde/breeze-icons-5.80.0-noarch-1.txz: Upgraded. kde/extra-cmake-modules-5.80.0-x86_64-1.txz: Upgraded. kde/frameworkintegration-5.80.0-x86_64-1.txz: Upgraded. kde/kactivities-5.80.0-x86_64-1.txz: Upgraded. kde/kactivities-stats-5.80.0-x86_64-1.txz: Upgraded. kde/kapidox-5.80.0-x86_64-1.txz: Upgraded. kde/karchive-5.80.0-x86_64-1.txz: Upgraded. kde/kauth-5.80.0-x86_64-1.txz: Upgraded. kde/kbookmarks-5.80.0-x86_64-1.txz: Upgraded. kde/kcalendarcore-5.80.0-x86_64-1.txz: Upgraded. kde/kcmutils-5.80.0-x86_64-1.txz: Upgraded. kde/kcodecs-5.80.0-x86_64-1.txz: Upgraded. kde/kcompletion-5.80.0-x86_64-1.txz: Upgraded. kde/kconfig-5.80.0-x86_64-1.txz: Upgraded. kde/kconfigwidgets-5.80.0-x86_64-1.txz: Upgraded. kde/kcontacts-5.80.0-x86_64-1.txz: Upgraded. kde/kcoreaddons-5.80.0-x86_64-1.txz: Upgraded. kde/kcrash-5.80.0-x86_64-1.txz: Upgraded. kde/kdav-5.80.0-x86_64-1.txz: Upgraded. kde/kdbusaddons-5.80.0-x86_64-1.txz: Upgraded. kde/kdeclarative-5.80.0-x86_64-1.txz: Upgraded. kde/kded-5.80.0-x86_64-1.txz: Upgraded. kde/kdelibs4support-5.80.0-x86_64-1.txz: Upgraded. kde/kdesignerplugin-5.80.0-x86_64-1.txz: Upgraded. kde/kdesu-5.80.0-x86_64-1.txz: Upgraded. kde/kdewebkit-5.80.0-x86_64-1.txz: Upgraded. kde/kdnssd-5.80.0-x86_64-1.txz: Upgraded. kde/kdoctools-5.80.0-x86_64-1.txz: Upgraded. kde/kemoticons-5.80.0-x86_64-1.txz: Upgraded. kde/kfilemetadata-5.80.0-x86_64-1.txz: Upgraded. kde/kglobalaccel-5.80.0-x86_64-1.txz: Upgraded. kde/kguiaddons-5.80.0-x86_64-1.txz: Upgraded. kde/kholidays-5.80.0-x86_64-1.txz: Upgraded. kde/khtml-5.80.0-x86_64-1.txz: Upgraded. kde/ki18n-5.80.0-x86_64-1.txz: Upgraded. kde/kiconthemes-5.80.0-x86_64-1.txz: Upgraded. kde/kidletime-5.80.0-x86_64-1.txz: Upgraded. kde/kimageformats-5.80.0-x86_64-1.txz: Upgraded. kde/kinit-5.80.0-x86_64-1.txz: Upgraded. kde/kio-5.80.0-x86_64-1.txz: Upgraded. kde/kirigami2-5.80.0-x86_64-1.txz: Upgraded. kde/kitemmodels-5.80.0-x86_64-1.txz: Upgraded. kde/kitemviews-5.80.0-x86_64-1.txz: Upgraded. kde/kjobwidgets-5.80.0-x86_64-1.txz: Upgraded. kde/kjs-5.80.0-x86_64-1.txz: Upgraded. kde/kjsembed-5.80.0-x86_64-1.txz: Upgraded. kde/kmediaplayer-5.80.0-x86_64-1.txz: Upgraded. kde/knewstuff-5.80.0-x86_64-1.txz: Upgraded. kde/knotifications-5.80.0-x86_64-1.txz: Upgraded. kde/knotifyconfig-5.80.0-x86_64-1.txz: Upgraded. kde/kpackage-5.80.0-x86_64-1.txz: Upgraded. kde/kparts-5.80.0-x86_64-1.txz: Upgraded. kde/kpeople-5.80.0-x86_64-1.txz: Upgraded. kde/kplotting-5.80.0-x86_64-1.txz: Upgraded. kde/kpty-5.80.0-x86_64-1.txz: Upgraded. kde/kquickcharts-5.80.0-x86_64-1.txz: Upgraded. kde/kross-5.80.0-x86_64-1.txz: Upgraded. kde/krunner-5.80.0-x86_64-1.txz: Upgraded. kde/kservice-5.80.0-x86_64-1.txz: Upgraded. kde/ktexteditor-5.80.0-x86_64-1.txz: Upgraded. kde/ktextwidgets-5.80.0-x86_64-1.txz: Upgraded. kde/kunitconversion-5.80.0-x86_64-1.txz: Upgraded. kde/kwallet-5.80.0-x86_64-1.txz: Upgraded. kde/kwayland-5.80.0-x86_64-1.txz: Upgraded. kde/kwidgetsaddons-5.80.0-x86_64-1.txz: Upgraded. kde/kwindowsystem-5.80.0-x86_64-1.txz: Upgraded. kde/kxmlgui-5.80.0-x86_64-1.txz: Upgraded. kde/kxmlrpcclient-5.80.0-x86_64-1.txz: Upgraded. kde/modemmanager-qt-5.80.0-x86_64-1.txz: Upgraded. kde/networkmanager-qt-5.80.0-x86_64-1.txz: Upgraded. kde/oxygen-icons5-5.80.0-noarch-1.txz: Upgraded. kde/plasma-framework-5.80.0-x86_64-1.txz: Upgraded. kde/prison-5.80.0-x86_64-1.txz: Upgraded. kde/purpose-5.80.0-x86_64-1.txz: Upgraded. kde/qqc2-desktop-style-5.80.0-x86_64-1.txz: Upgraded. kde/solid-5.80.0-x86_64-1.txz: Upgraded. kde/sonnet-5.80.0-x86_64-1.txz: Upgraded. kde/syndication-5.80.0-x86_64-1.txz: Upgraded. kde/syntax-highlighting-5.80.0-x86_64-1.txz: Upgraded. kde/threadweaver-5.80.0-x86_64-1.txz: Upgraded. l/gnu-efi-3.0.13-x86_64-1.txz: Upgraded. l/imagemagick-7.0.11_3-x86_64-1.txz: Upgraded. l/netpbm-10.93.02-x86_64-1.txz: Upgraded. l/pango-1.48.3-x86_64-1.txz: Upgraded. xap/mozilla-firefox-78.8.0esr-x86_64-4.txz: Rebuilt. Strip binaries and symlink duplicate binaries. Thanks to franzen. Add export MACH_USE_SYSTEM_PYTHON="1", upgrade build-deps/nodejs/, and compile with clang/clang++, fixing the use of this script to build more recent Firefox versions. Thanks to ponce. xap/mozilla-thunderbird-78.8.1-x86_64-3.txz: Rebuilt. Strip binaries and symlink duplicate binaries. Thanks to franzen. Add export MACH_USE_SYSTEM_PYTHON="1", upgrade build-deps/nodejs/, and compile with clang/clang++, fixing the use of this script to build more recent Thunderbird versions. Thanks to ponce. --- source/kde/kde/build/kcoreaddons | 2 +- source/kde/kde/build/kfilemetadata | 2 +- source/kde/kde/build/ktexteditor | 2 +- source/kde/kde/patch/ktexteditor.patch | 2 - .../686da7797105a93035cfbc7edbf2a8e8f8adf0ec.patch | 101 --------------------- 5 files changed, 3 insertions(+), 106 deletions(-) delete mode 100644 source/kde/kde/patch/ktexteditor.patch delete mode 100644 source/kde/kde/patch/ktexteditor/686da7797105a93035cfbc7edbf2a8e8f8adf0ec.patch (limited to 'source/kde') diff --git a/source/kde/kde/build/kcoreaddons b/source/kde/kde/build/kcoreaddons index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kcoreaddons +++ b/source/kde/kde/build/kcoreaddons @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kfilemetadata +++ b/source/kde/kde/build/kfilemetadata @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/ktexteditor b/source/kde/kde/build/ktexteditor index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/ktexteditor +++ b/source/kde/kde/build/ktexteditor @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/patch/ktexteditor.patch b/source/kde/kde/patch/ktexteditor.patch deleted file mode 100644 index 39331d706..000000000 --- a/source/kde/kde/patch/ktexteditor.patch +++ /dev/null @@ -1,2 +0,0 @@ -# Fix syntax highlighting in kdevelop: -cat $CWD/patch/ktexteditor/686da7797105a93035cfbc7edbf2a8e8f8adf0ec.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/ktexteditor/686da7797105a93035cfbc7edbf2a8e8f8adf0ec.patch b/source/kde/kde/patch/ktexteditor/686da7797105a93035cfbc7edbf2a8e8f8adf0ec.patch deleted file mode 100644 index 7fca1a9e5..000000000 --- a/source/kde/kde/patch/ktexteditor/686da7797105a93035cfbc7edbf2a8e8f8adf0ec.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 686da7797105a93035cfbc7edbf2a8e8f8adf0ec Mon Sep 17 00:00:00 2001 -From: Christoph Cullmann -Date: Wed, 17 Feb 2021 20:51:12 +0100 -Subject: [PATCH] ensure rangesForLine caching is correcly updated - -during fixing a segfault, as invalid range pointer were kept -in the rangesForLine cache, too many ranges were purged - -properly update the cache before potential invalidation - -add unit test to avoid regressions in the future ---- - autotests/src/movingrange_test.cpp | 33 ++++++++++++++++++++++++++++++ - autotests/src/movingrange_test.h | 1 + - src/buffer/katetextblock.cpp | 10 +++++++++ - 3 files changed, 44 insertions(+) - -diff --git a/autotests/src/movingrange_test.cpp b/autotests/src/movingrange_test.cpp -index 66393ae7..81a85b1a 100644 ---- a/autotests/src/movingrange_test.cpp -+++ b/autotests/src/movingrange_test.cpp -@@ -459,3 +459,36 @@ void MovingRangeTest::testLineRemoved() - auto r = doc.buffer().rangesForLine(1, view, true); - QVERIFY(r.isEmpty()); - } -+ -+void MovingRangeTest::testLineWrapOrUnwrapUpdateRangeForLineCache() -+{ -+ KTextEditor::DocumentPrivate doc; -+ doc.setText( -+ QStringLiteral("abcd\n" -+ "efgh\n" -+ "hijk\n")); -+ -+ // add range to line 2, it shall be in rangeForLine for the right lines after each update! -+ // must be single line range to be in the cache! -+ auto range = static_cast(doc.newMovingRange({2, 1, 2, 3}, -+ KTextEditor::MovingRange::ExpandLeft | KTextEditor::MovingRange::ExpandRight, -+ KTextEditor::MovingRange::InvalidateIfEmpty)); -+ -+ // range shall be in the lookup cache for line 2 -+ QVERIFY(doc.buffer().rangesForLine(0, nullptr, false).isEmpty()); -+ QVERIFY(doc.buffer().rangesForLine(1, nullptr, false).isEmpty()); -+ QVERIFY(doc.buffer().rangesForLine(2, nullptr, false).contains(range)); -+ -+ // wrap line 1 => range should move to line 3 -+ doc.editWrapLine(1, 1); -+ QVERIFY(doc.buffer().rangesForLine(0, nullptr, false).isEmpty()); -+ QVERIFY(doc.buffer().rangesForLine(1, nullptr, false).isEmpty()); -+ QVERIFY(doc.buffer().rangesForLine(2, nullptr, false).isEmpty()); -+ QVERIFY(doc.buffer().rangesForLine(3, nullptr, false).contains(range)); -+ -+ // unwrap line 1 => range should back move to line 2 -+ doc.editUnWrapLine(1); -+ QVERIFY(doc.buffer().rangesForLine(0, nullptr, false).isEmpty()); -+ QVERIFY(doc.buffer().rangesForLine(1, nullptr, false).isEmpty()); -+ QVERIFY(doc.buffer().rangesForLine(2, nullptr, false).contains(range)); -+} -diff --git a/autotests/src/movingrange_test.h b/autotests/src/movingrange_test.h -index 6f8c057d..016655f7 100644 ---- a/autotests/src/movingrange_test.h -+++ b/autotests/src/movingrange_test.h -@@ -24,6 +24,7 @@ private Q_SLOTS: - void testFeedbackCaret(); - void testFeedbackMouse(); - void testLineRemoved(); -+ void testLineWrapOrUnwrapUpdateRangeForLineCache(); - }; - - #endif // KATE_MOVINGRANGE_TEST_H -diff --git a/src/buffer/katetextblock.cpp b/src/buffer/katetextblock.cpp -index 43d137e4..246897b4 100644 ---- a/src/buffer/katetextblock.cpp -+++ b/src/buffer/katetextblock.cpp -@@ -167,6 +167,11 @@ void TextBlock::wrapLine(const KTextEditor::Cursor &position, int fixStartLinesS - // we might need to invalidate ranges or notify about their changes - // checkValidity might trigger delete of the range! - for (TextRange *range : qAsConst(changedRanges)) { -+ // we need to do updateRange to ALWAYS ensure the line => range and back cache is updated -+ // see MovingRangeTest::testLineWrapOrUnwrapUpdateRangeForLineCache -+ updateRange(range); -+ -+ // in addition: ensure that we really invalidate bad ranges! - range->checkValidity(range->toLineRange()); - } - } -@@ -333,6 +338,11 @@ void TextBlock::unwrapLine(int line, TextBlock *previousBlock, int fixStartLines - // we might need to invalidate ranges or notify about their changes - // checkValidity might trigger delete of the range! - for (TextRange *range : qAsConst(changedRanges)) { -+ // we need to do updateRange to ALWAYS ensure the line => range and back cache is updated -+ // see MovingRangeTest::testLineWrapOrUnwrapUpdateRangeForLineCache -+ updateRange(range); -+ -+ // in addition: ensure that we really invalidate bad ranges! - range->checkValidity(range->toLineRange()); - } - } --- -GitLab - -- cgit v1.2.3