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 898F51396D0 for ; Wed, 23 Aug 2017 19:31:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5EEE1FC009; Wed, 23 Aug 2017 19:31:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B381F1FC009 for ; Wed, 23 Aug 2017 19:31:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 64D8D341B25 for ; Wed, 23 Aug 2017 19:31:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 403578029 for ; Wed, 23 Aug 2017 19:31:14 +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: <1503516657.8e7ac3383dbcc492e23b26d9c70db7724eb011ff.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/syntax-highlighting/files/, kde-frameworks/syntax-highlighting/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-powershell.patch kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-regexp.patch kde-frameworks/syntax-highlighting/syntax-highlighting-5.37.0-r1.ebuild X-VCS-Directories: kde-frameworks/syntax-highlighting/files/ kde-frameworks/syntax-highlighting/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8e7ac3383dbcc492e23b26d9c70db7724eb011ff X-VCS-Branch: master Date: Wed, 23 Aug 2017 19:31:14 +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-Archives-Salt: 9c84dad0-59b1-4d20-8c30-9e6c75b05bc0 X-Archives-Hash: 856c9e80897f27f22a71f1d43e8a01bd commit: 8e7ac3383dbcc492e23b26d9c70db7724eb011ff Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 23 18:53:58 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 23 19:30:57 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7ac338 kde-frameworks/syntax-highlighting: Fix build and plaintext highlighting KDE-bug: 383848, 383632 Package-Manager: Portage-2.3.8, Repoman-2.3.3 .../syntax-highlighting-5.37.0-powershell.patch | 40 ++++++++++ .../files/syntax-highlighting-5.37.0-regexp.patch | 86 ++++++++++++++++++++++ .../syntax-highlighting-5.37.0-r1.ebuild | 32 ++++++++ 3 files changed, 158 insertions(+) diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-powershell.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-powershell.patch new file mode 100644 index 00000000000..5da7999dffb --- /dev/null +++ b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-powershell.patch @@ -0,0 +1,40 @@ +From 26daf7ee5b4a4534d918ed7d9e66d64cb30b0c26 Mon Sep 17 00:00:00 2001 +From: Till Schfer +Date: Tue, 22 Aug 2017 18:47:04 +0200 +Subject: fix: plaintext is highlighted as powershell + +Summary: see [[ https://bugs.kde.org/show_bug.cgi?id=383848 | Bug 383848 ]] + +Reviewers: #framework_syntax_hightlighting, vkrause + +Reviewed By: #framework_syntax_hightlighting, vkrause + +Subscribers: dhaumann, #framework_syntax_hightlighting + +Tags: #frameworks + +Differential Revision: https://phabricator.kde.org/D7464 +--- + data/syntax/powershell.xml | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/data/syntax/powershell.xml b/data/syntax/powershell.xml +index 3a38846..2b73cfe 100644 +--- a/data/syntax/powershell.xml ++++ b/data/syntax/powershell.xml +@@ -1,11 +1,10 @@ + + +-- +cgit v0.11.2 + diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-regexp.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-regexp.patch new file mode 100644 index 00000000000..f0a87e6d76d --- /dev/null +++ b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-regexp.patch @@ -0,0 +1,86 @@ +From ad077e4045e650e1708b6c81d33a14f4a9c99a5d Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Wed, 23 Aug 2017 12:28:52 +0200 +Subject: Escape hyphen in rest.xml regular expressions + +Summary: +The unescaped hyphen caused a build failure with pcre2-10.30 due to a broken +regex: 'syntax-highlighting/data/syntax/rest.xml" line 27 broken regex: +"^\\s*\\.\\. [w-_\\.]+::(\\s|$)" problem: "range out of order in character +class" at offset 12'. + +The pcre2pattern documentation says this: + +"Perl treats a hyphen as a literal if it appears before or after a POSIX class +(see below) or before or after a character type escape such as as \d or \H. +However, unless the hyphen is the last character in the class, Perl outputs a +warning in its warning mode, as this is most likely a user error. As PCRE2 has +no facility for warning, an error is given in these cases." + +Test Plan: +cmake && make && make test works fine pcre2-10.30, quick look at +http://docutils.sourceforge.net/FAQ.txt in kate seems fine. + +Reviewers: #framework_syntax_hightlighting, kfunk + +Subscribers: #frameworks + +Tags: #frameworks + +BUG: 383632 + +Differential Revision: https://phabricator.kde.org/D7478 +--- + data/syntax/rest.xml | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/data/syntax/rest.xml b/data/syntax/rest.xml +index 1363965..ccfd08a 100644 +--- a/data/syntax/rest.xml ++++ b/data/syntax/rest.xml +@@ -11,7 +11,7 @@ + Copyright 2010 Matt Williams (matt@milliams.com) + Copyright 2014 Matthew Woehlke (mw_triad@users.sourceforge.net) + --> +- ++ + + + +@@ -24,11 +24,11 @@ + + + +- ++ + + + +- ++ + + + +@@ -38,8 +38,8 @@ + + + +- +- ++ ++ + + + +@@ -56,7 +56,7 @@ + + + +- ++ + + + +-- +cgit v0.11.2 + diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.37.0-r1.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.37.0-r1.ebuild new file mode 100644 index 00000000000..f97fb595e7c --- /dev/null +++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.37.0-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_TEST="forceoptional" +inherit kde5 + +DESCRIPTION="Framework for syntax highlighting" +LICENSE="LGPL-2+ LGPL-2.1+" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="nls" + +RDEPEND=" + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtxmlpatterns) +" +DEPEND="${RDEPEND} + dev-lang/perl + nls? ( $(add_qt_dep linguist-tools) ) +" + +PATCHES=( + "${FILESDIR}/${P}-powershell.patch" + "${FILESDIR}/${P}-regexp.patch" +) + +src_install() { + kde5_src_install + dobin "${BUILD_DIR}"/src/indexer/katehighlightingindexer +}