From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CEE60138334 for ; Wed, 30 Jan 2019 17:28:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7921E0943; Wed, 30 Jan 2019 17:28:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9326CE0943 for ; Wed, 30 Jan 2019 17:28:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F0FE5335D81 for ; Wed, 30 Jan 2019 17:28:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EDA2E2A7 for ; Wed, 30 Jan 2019 17:28:13 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1548865449.16d166ea8aae5d5f4246c1ef3bdf1fd88b7e3b8d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/, kde-frameworks/ktexteditor/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild X-VCS-Directories: kde-frameworks/ktexteditor/ kde-frameworks/ktexteditor/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 16d166ea8aae5d5f4246c1ef3bdf1fd88b7e3b8d X-VCS-Branch: master Date: Wed, 30 Jan 2019 17:28:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9a49bacb-cbe9-4528-a425-f54fac31bc3f X-Archives-Hash: 5b793743df40d71a7a410c56d0465d1c commit: 16d166ea8aae5d5f4246c1ef3bdf1fd88b7e3b8d Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 30 16:24:09 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 30 16:24:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16d166ea kde-frameworks/ktexteditor: Allow changing the marker size again Fixes a regression from 5.54.0. KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=403422 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> ...exteditor-5.54.0-allow-change-marker-size.patch | 78 ++++++++++++++++++++++ .../ktexteditor/ktexteditor-5.54.0-r1.ebuild | 57 ++++++++++++++++ 2 files changed, 135 insertions(+) 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 new file mode 100644 index 00000000000..032fbc99367 --- /dev/null +++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch @@ -0,0 +1,78 @@ +From 5a6449c3b3d9bbc2b1bc15a5d5b40d7228f3a406 Mon Sep 17 00:00:00 2001 +From: Dominik Haumann +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 @@ + Size of the visible highlight marker. + + +- -1 ++ 1 + + +- -1 ++ 5 + + + 1 +@@ -301,6 +301,21 @@ beginning of a file. +
kcombobox.h
+ + ++ ++ gbWordWrap ++ chkDynWrapAtStaticMarker ++ cmbDynamicWordWrapIndicator ++ sbDynamicWordWrapDepth ++ chkShowTabs ++ chkShowSpaces ++ sliSetMarkerSize ++ chkShowIndentationLines ++ chkShowWholeBracketExpression ++ chkAnimateBracketMatching ++ chkFoldFirstLine ++ chkShowWordCount ++ chkShowLineCount ++ + + + +@@ -314,8 +329,8 @@ beginning of a file. + 7 + + +- 340 +- 44 ++ 559 ++ 117 + + + +@@ -330,8 +345,8 @@ beginning of a file. + 6 + + +- 385 +- 72 ++ 559 ++ 162 + + + +-- +cgit v1.1 + diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild new file mode 100644 index 00000000000..72fcd5e1261 --- /dev/null +++ b/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework providing a full text editor component" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="editorconfig git" + +RDEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kauth) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep kparts) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep sonnet) + $(add_frameworks_dep syntax-highlighting) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + editorconfig? ( app-text/editorconfig-core-c ) + git? ( dev-libs/libgit2:= ) +" +DEPEND="${RDEPEND} + test? ( $(add_frameworks_dep kservice) ) +" + +RESTRICT+=" test" + +PATCHES=( "${FILESDIR}/${P}-allow-change-marker-size.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package editorconfig EditorConfig) + $(cmake-utils_use_find_package git LibGit2) + ) + + kde5_src_configure +}