commit:     0043d3d1dd0b2d59b16972d8fb8f5ce0ead2bab3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 21:01:00 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 23:48:47 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=0043d3d1

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

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

 .../files/konq-plugins-4.14.3-tidyhtml5.patch      | 46 ++++++++++++++++++++++
 .../konq-plugins/konq-plugins-4.14.3-r1.ebuild     | 32 +++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/kde-apps/konq-plugins/files/konq-plugins-4.14.3-tidyhtml5.patch 
b/kde-apps/konq-plugins/files/konq-plugins-4.14.3-tidyhtml5.patch
new file mode 100644
index 00000000..d344e36e
--- /dev/null
+++ b/kde-apps/konq-plugins/files/konq-plugins-4.14.3-tidyhtml5.patch
@@ -0,0 +1,46 @@
+From 29955abce07526d01f3298da9d2f15bd9eb5e6f4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlech...@gmail.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
+---
+ konq-plugins/validators/CMakeLists.txt     | 2 +-
+ konq-plugins/validators/tidy_validator.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/konq-plugins/validators/CMakeLists.txt 
b/konq-plugins/validators/CMakeLists.txt
+index cf3b70694..7f6060e9c 100644
+--- a/konq-plugins/validators/CMakeLists.txt
++++ b/konq-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/konq-plugins/validators/tidy_validator.cpp 
b/konq-plugins/validators/tidy_validator.cpp
+index 3247199f9..ac22429d0 100644
+--- a/konq-plugins/validators/tidy_validator.cpp
++++ b/konq-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/konq-plugins/konq-plugins-4.14.3-r1.ebuild 
b/kde-apps/konq-plugins/konq-plugins-4.14.3-r1.ebuild
new file mode 100644
index 00000000..13128c39
--- /dev/null
+++ b/kde-apps/konq-plugins/konq-plugins-4.14.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kde-baseapps"
+inherit kde4-meta
+
+DESCRIPTION="Various plugins for konqueror"
+
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="debug tidy"
+
+DEPEND="
+       $(add_kdeapps_dep libkonq)
+       tidy? ( app-text/tidy-html5 )
+"
+RDEPEND="${DEPEND}
+       !kde-misc/konq-plugins
+       $(add_kdeapps_dep kcmshell)
+       $(add_kdeapps_dep konqueror)
+"
+
+PATCHES=( "${FILESDIR}/${P}-tidyhtml5.patch" ) # bug 671450
+
+src_configure() {
+       local mycmakeargs=(
+               -DWITH_LibTidy=$(usex tidy)
+       )
+
+       kde4-meta_src_configure
+}

Reply via email to