summaryrefslogtreecommitdiff
path: root/kde-frameworks/ktexteditor
diff options
context:
space:
mode:
Diffstat (limited to 'kde-frameworks/ktexteditor')
-rw-r--r--kde-frameworks/ktexteditor/Manifest7
-rw-r--r--kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch78
-rw-r--r--kde-frameworks/ktexteditor/ktexteditor-5.57.0-r1.ebuild2
-rw-r--r--kde-frameworks/ktexteditor/ktexteditor-5.58.0.ebuild (renamed from kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild)15
4 files changed, 11 insertions, 91 deletions
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 04ad9f8250a8..4f43efe3279c 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,7 +1,6 @@
-AUX ktexteditor-5.54.0-allow-change-marker-size.patch 2381 BLAKE2B 527cce76a6386196c5ac5558be893418886e1ac051a25e7fd091f90aa13031ac7687edf49b1cbbc31ba415773f82053af68ef15cfcdf2a7565aa3c5248372d7c SHA512 a1b6a72ad99ec246fbf2d74e57e8537f44b5e4adc197bde5060a6c8b29da295d198483f93a326720efbf3e0940a627da5c1d5e164469cc905fc081f642a5db90
AUX ktexteditor-5.57.0-shortcuts.patch 2231 BLAKE2B 2f63c8f09954fc36bc5bc333cdce2a6b672dada6f1287f2d137bfe2b71ca1c385e9b230c860dc3e42c2827ace3ab636088060a934ebc6a98ac9c06ef539b9a8a SHA512 f1dafd427d9c7c832943904587c6fb37612fd46808500137d814b6d6b960470271f9c61d6a2eb75fcd7909ae7691d7d6d3c49de8b55508e027a2575c07f4255f
-DIST ktexteditor-5.54.0.tar.xz 2264380 BLAKE2B 576176595c80b79f4bbe58e17304c7a9168be2723f01e7f1c51f67970bea9a9169084b074e754957c2e77c134df837226e85ff3b3a0a149005240520595de116 SHA512 8402fb036887ef853e455b4c80b3f4ff7fa6a65fc37e94d4fb2e94c09a59f2e49d7403dbf94aa3f2b2eb7ac6f43c5aede9aaa45ab5e9597a62b8a5d9b7ad0500
DIST ktexteditor-5.57.0.tar.xz 2294748 BLAKE2B f4c8ef5ab46e6505d3760ba4d40721579820244915c609b3b5148f7718d8649884c87ef7d6809e309dd75470eca70b98c1b93742d1ed2798a4b3150b33f8b555 SHA512 e5b1462eed712273e1b5bf6107f42da7bea79d06d160106bc1fb68825f062b898a15a231f864819b74103eeb8772c09adf591945cef8bd663389290daf785a82
-EBUILD ktexteditor-5.54.0-r1.ebuild 1456 BLAKE2B 8c4ab6b60152b7624492bd72f9aa2389b317ad7a57fad4ff4ee02d43c814d93e157b33fccade7ad80b5c9f89a8fe4d17415977a2c242a92bbacda1e71b9401a3 SHA512 485a9d4f9561afd9d6744a7e456c78adb2ac16fbe4f8fc326fcd1f049f46dad201fe6fbde12ab0b99b044b46c6b0fb04ff14b68d0b7f89155d8678bf0d984c59
-EBUILD ktexteditor-5.57.0-r1.ebuild 1453 BLAKE2B 472f1a092fe9a9eb6de3bdcdc116ca2f8a3e1a7534d0d41792f4aac36049ac673704922045350ae4d9f45a57f34ca3bace9f2d1ed0e56eff9431ad1809f4616b SHA512 d4484787bb95a2acfe261afbad4d89ca312dbb8dd493a62f7e295f0f1ff17ff7e545b555ff1c1d77c4d94c8b9bd1b18439410209a010f5796879f3e70dc339bc
+DIST ktexteditor-5.58.0.tar.xz 2297212 BLAKE2B ef074dc706344df7f35ae8b247f2345a85a50fe04fc0f6683cb1a2eb38decfcc115aac93fe745b5360f0041c3f6ef9d283e413e5ef421a0eb3bf76985f55a0d5 SHA512 fb6b11e257089b7d13d39e05dcddec5797e462d537a263adae680534b22f9f86bf17e844e6d769c3c4f801916e7a38c59cc996785a07c0c3996093eff2aa14d7
+EBUILD ktexteditor-5.57.0-r1.ebuild 1451 BLAKE2B e11245163e18b12be6a6feb5a7dfa3a4a737a6a3c2b9baf6f88f5c166321fe013aee94cc84e260f5ea513d627e92f452e194a279749619387249d6ae0e997d67 SHA512 c67356b7f920f10d88cb23fd22d35b62d7c36809a00acb70dd7aa9262e6947693f1ca9c2ed2bd4c8f1530beac65778357a5427f1f1827774c438e218e16cad44
+EBUILD ktexteditor-5.58.0.ebuild 1405 BLAKE2B 64dc1e7b0b371b6d43d8fa1c7b457ed3423f00a89906cc6c2c50e64df058ab6dbada60bb2378e767b76fb4e3ad7e8422ac8244885cb0dfa1dae2fe27e32364d6 SHA512 fb63fc8877d3d40ce989daa3e3e84d4b4f38be2b794dccc5d128e3a427b2b2e174c723f8889f2746acbd644e0880377fafe38a6600d7803345b2d0450673af06
MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch
deleted file mode 100644
index 032fbc99367e..000000000000
--- a/kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 5a6449c3b3d9bbc2b1bc15a5d5b40d7228f3a406 Mon Sep 17 00:00:00 2001
-From: Dominik Haumann <dhaumann@kde.org>
-Date: Wed, 30 Jan 2019 17:16:32 +0100
-Subject: Fix bug 403422: Allow changing the marker size again
-
-This bug was introduced with https://phabricator.kde.org/D17661
-with commit c287d3858fd780f5e139d05e8bb7d4558ccc71b8
-
-FIXED-IN: 5.55
-BUG: 403422
----
- src/dialogs/textareaappearanceconfigwidget.ui | 27 +++++++++++++++++++++------
- 1 file changed, 21 insertions(+), 6 deletions(-)
-
-diff --git a/src/dialogs/textareaappearanceconfigwidget.ui b/src/dialogs/textareaappearanceconfigwidget.ui
-index 02a0d54..cc44a39 100644
---- a/src/dialogs/textareaappearanceconfigwidget.ui
-+++ b/src/dialogs/textareaappearanceconfigwidget.ui
-@@ -185,10 +185,10 @@
- <string>Size of the visible highlight marker.</string>
- </property>
- <property name="minimum">
-- <number>-1</number>
-+ <number>1</number>
- </property>
- <property name="maximum">
-- <number>-1</number>
-+ <number>5</number>
- </property>
- <property name="singleStep">
- <number>1</number>
-@@ -301,6 +301,21 @@ beginning of a file.</string>
- <header>kcombobox.h</header>
- </customwidget>
- </customwidgets>
-+ <tabstops>
-+ <tabstop>gbWordWrap</tabstop>
-+ <tabstop>chkDynWrapAtStaticMarker</tabstop>
-+ <tabstop>cmbDynamicWordWrapIndicator</tabstop>
-+ <tabstop>sbDynamicWordWrapDepth</tabstop>
-+ <tabstop>chkShowTabs</tabstop>
-+ <tabstop>chkShowSpaces</tabstop>
-+ <tabstop>sliSetMarkerSize</tabstop>
-+ <tabstop>chkShowIndentationLines</tabstop>
-+ <tabstop>chkShowWholeBracketExpression</tabstop>
-+ <tabstop>chkAnimateBracketMatching</tabstop>
-+ <tabstop>chkFoldFirstLine</tabstop>
-+ <tabstop>chkShowWordCount</tabstop>
-+ <tabstop>chkShowLineCount</tabstop>
-+ </tabstops>
- <resources/>
- <connections>
- <connection>
-@@ -314,8 +329,8 @@ beginning of a file.</string>
- <y>7</y>
- </hint>
- <hint type="destinationlabel">
-- <x>340</x>
-- <y>44</y>
-+ <x>559</x>
-+ <y>117</y>
- </hint>
- </hints>
- </connection>
-@@ -330,8 +345,8 @@ beginning of a file.</string>
- <y>6</y>
- </hint>
- <hint type="destinationlabel">
-- <x>385</x>
-- <y>72</y>
-+ <x>559</x>
-+ <y>162</y>
- </hint>
- </hints>
- </connection>
---
-cgit v1.1
-
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.57.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.57.0-r1.ebuild
index 550a3354398f..620b607f41da 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.57.0-r1.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.57.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Framework providing a full text editor component"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="editorconfig git"
BDEPEND="
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.58.0.ebuild
index 54ffad77a220..4413fff50646 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.58.0.ebuild
@@ -1,17 +1,20 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="Framework providing a full text editor component"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="editorconfig git"
-RDEPEND="
+BDEPEND="
+ test? ( $(add_frameworks_dep kservice) )
+"
+DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kauth)
$(add_frameworks_dep kcodecs)
@@ -39,14 +42,10 @@ RDEPEND="
editorconfig? ( app-text/editorconfig-core-c )
git? ( dev-libs/libgit2:= )
"
-DEPEND="${RDEPEND}
- test? ( $(add_frameworks_dep kservice) )
-"
+RDEPEND="${DEPEND}"
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${P}-allow-change-marker-size.patch" )
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package editorconfig EditorConfig)