[gentoo-commits] proj/kde:master commit in: kde-apps/konqueror/, kde-apps/konqueror/files/

[Andreas Sturmlechner]

commit:     41a779b2691dc3410d384630767fe9670b7bc312
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 16:46:18 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 18:00:00 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=41a779b2

kde-apps/konqueror: Switch USE tidy to app-text/tidy-html5

Bug: https://bugs.gentoo.org/671450
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/konqueror-18.08.3-tidyhtml5.patch        | 46 ++++++++++++++++++++++
 kde-apps/konqueror/konqueror-18.11.80.ebuild       |  4 +-
 kde-apps/konqueror/konqueror-18.12.49.9999.ebuild  |  4 +-
 kde-apps/konqueror/konqueror-9999.ebuild           |  6 ++-
 4 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch b/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch
new file mode 100644
index 0000000000..dae1486d58
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch
@@ -0,0 +1,46 @@
+From 29955abce07526d01f3298da9d2f15bd9eb5e6f4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
+Date: Sun, 18 Nov 2018 18:07:32 +0100
+Subject: [PATCH] Switch to tidy-html5 and use tidybuffio.h instead of buffio.h
+
+Summary: Header was renamed a few years ago.
+
+Test Plan: Builds and validates fine.
+
+Reviewers: #konqueror
+
+Differential Revision: https://phabricator.kde.org/D16982
+---
+ plugins/validators/CMakeLists.txt     | 2 +-
+ plugins/validators/tidy_validator.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/validators/CMakeLists.txt b/plugins/validators/CMakeLists.txt
+index cf3b70694..7f6060e9c 100644
+--- a/plugins/validators/CMakeLists.txt
++++ b/plugins/validators/CMakeLists.txt
+@@ -4,7 +4,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
+ find_package(LibTidy)
+ find_package(KF5 REQUIRED KHtml WidgetsAddons IconThemes)
+ set_package_properties(LibTidy PROPERTIES DESCRIPTION "HTML Tidy"
+-                       URL "http://tidy.sourceforge.net"
++                       URL "http://www.html-tidy.org/"
+                        TYPE OPTIONAL
+                        PURPOSE "Gives the Konqueror validators plugin the ability to validate HTML"
+                       )
+diff --git a/plugins/validators/tidy_validator.cpp b/plugins/validators/tidy_validator.cpp
+index 3247199f9..ac22429d0 100644
+--- a/plugins/validators/tidy_validator.cpp
++++ b/plugins/validators/tidy_validator.cpp
+@@ -25,7 +25,7 @@
+ 
+ #include <kdebug.h>
+ 
+-#include <buffio.h>
++#include <tidybuffio.h>
+ #include <tidy.h>
+ 
+ #include <config-konq-validator.h>
+-- 
+2.19.1
+

diff --git a/kde-apps/konqueror/konqueror-18.11.80.ebuild b/kde-apps/konqueror/konqueror-18.11.80.ebuild
index 9d8010e340..503376e9dc 100644
--- a/kde-apps/konqueror/konqueror-18.11.80.ebuild
+++ b/kde-apps/konqueror/konqueror-18.11.80.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	sys-libs/zlib
 	speech? ( $(add_qt_dep qtspeech) )
-	tidy? ( app-text/htmltidy )
+	tidy? ( app-text/tidy-html5 )
 	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
 	X? ( $(add_qt_dep qtx11extras) )
 "
@@ -66,6 +66,8 @@ RDEPEND="${COMMON_DEPEND}
 	!webengine? ( kde-misc/kwebkitpart:5 )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-18.08.3-tidyhtml5.patch" )
+
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 

diff --git a/kde-apps/konqueror/konqueror-18.12.49.9999.ebuild b/kde-apps/konqueror/konqueror-18.12.49.9999.ebuild
index 7b98ce350e..bfb7b0b088 100644
--- a/kde-apps/konqueror/konqueror-18.12.49.9999.ebuild
+++ b/kde-apps/konqueror/konqueror-18.12.49.9999.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	sys-libs/zlib
 	speech? ( $(add_qt_dep qtspeech) )
-	tidy? ( app-text/htmltidy )
+	tidy? ( app-text/tidy-html5 )
 	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
 	X? ( $(add_qt_dep qtx11extras) )
 "
@@ -66,6 +66,8 @@ RDEPEND="${COMMON_DEPEND}
 	!webengine? ( kde-misc/kwebkitpart:5 )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-18.08.3-tidyhtml5.patch" )
+
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 

diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild
index d25778697b..bfb7b0b088 100644
--- a/kde-apps/konqueror/konqueror-9999.ebuild
+++ b/kde-apps/konqueror/konqueror-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,7 +50,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	sys-libs/zlib
 	speech? ( $(add_qt_dep qtspeech) )
-	tidy? ( app-text/htmltidy )
+	tidy? ( app-text/tidy-html5 )
 	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
 	X? ( $(add_qt_dep qtx11extras) )
 "
@@ -66,6 +66,8 @@ RDEPEND="${COMMON_DEPEND}
 	!webengine? ( kde-misc/kwebkitpart:5 )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-18.08.3-tidyhtml5.patch" )
+
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc