* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdoctools/, kde-frameworks/kdoctools/files/
@ 2017-12-05 23:35 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-12-05 23:35 UTC (permalink / raw
To: gentoo-commits
commit: 6740ca78fd0949625008b958fc5a3d58b67bc9b3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 5 21:56:46 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 5 23:35:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6740ca78
kde-frameworks/kdoctools: Update Brasilian Portuguese translation
kaffeine maintainer made release 2.0.14 depending on KF-5.41,
before *that* was released. This would block a new stable kaffeine
for some time, since 5.40 is currently pending stabilisation.
Bug: https://bugs.gentoo.org/639822
Package-Manager: Portage-2.3.16, Repoman-2.3.6
kde-frameworks/kdoctools/Manifest | 2 +-
.../files/kdoctools-5.40.0-pt_BR-fix.patch | 28 ++++++++++++++++++++++
.../kdoctools/kdoctools-5.40.0-r1.ebuild | 28 ++++++++++++++++++++++
3 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 26bdcc793a4..bd335593743 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,2 +1,2 @@
DIST kdoctools-5.37.0.tar.xz 416840 SHA256 f4031fccb1e7c6017456840daee1589d2e6b7d36ee263a371446981a312e6c3d SHA512 2f3deb54e186eb1efe94b89886d9bd48b035a41754625309ba886b41c467ece6fdf5f3aaf7549df3bc36dae3f3aa1e1982c69342c019410ffa8a5aead0b277a0 WHIRLPOOL 9032e9642e7b16dbca7dff18700a6c2e5a93580a4c1edb06cd8feca7b43f71b0c2632299f31dc6294c2aaaee9e5b2a536f7893810ee63b0839b9d89287225a45
-DIST kdoctools-5.40.0.tar.xz 421668 SHA256 3556ffad511980ad84276c8856e7023372e87a65ef8c35db617837ed27b6efff SHA512 7279a2bbb01c9b6e31e4c7c1b9b5b1a14d9ba8ec78e63d4bf635838fbf01bc90e88ea9eb0788886548cd6c031b6c7d270c667c13f2c14d4fda6a786bc94d641b WHIRLPOOL 7425f75be2a1e5df6cb9c677341e621a49cb184b8b580d6991c542f2ca8ea0aa41cd2429e2299d737d0ac97e2228bae743846e10a38963cbc00bc603e8d156bf
+DIST kdoctools-5.40.0.tar.xz 421668 BLAKE2B d3dc3dd85b8883042064ca68f9de9d575210adc0055113bb9cd71a5086edb732897039b29ef47df0861b9bb73ed5493e2ee146420e53db9237ae7f6592e40f9e SHA512 7279a2bbb01c9b6e31e4c7c1b9b5b1a14d9ba8ec78e63d4bf635838fbf01bc90e88ea9eb0788886548cd6c031b6c7d270c667c13f2c14d4fda6a786bc94d641b
diff --git a/kde-frameworks/kdoctools/files/kdoctools-5.40.0-pt_BR-fix.patch b/kde-frameworks/kdoctools/files/kdoctools-5.40.0-pt_BR-fix.patch
new file mode 100644
index 00000000000..529f5294009
--- /dev/null
+++ b/kde-frameworks/kdoctools/files/kdoctools-5.40.0-pt_BR-fix.patch
@@ -0,0 +1,28 @@
+From 850029f5c664b8a496fead6fe5489c2b4aebae7a Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+Date: Wed, 29 Nov 2017 22:28:53 -0200
+Subject: Update Brasilian Portuguese translation
+
+---
+ src/customization/pt-BR/user.entities | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/customization/pt-BR/user.entities b/src/customization/pt-BR/user.entities
+index 11abcd5..c63a743 100644
+--- a/src/customization/pt-BR/user.entities
++++ b/src/customization/pt-BR/user.entities
+@@ -33,6 +33,11 @@
+ <!ENTITY plasma-desktop "<productname>&kde; Plasma Desktop</productname>">
+ <!ENTITY plasma-workspaces "<productname>&kde; Plasma Workspaces</productname>">
+ <!ENTITY plasmapa "<productname>&kde; Plasma Pulseaudio</productname>">
++<!ENTITY PgUp "<keysym>PgUp</keysym>">
++<!ENTITY PgDn "<keysym>PgDn</keysym>">
++<!ENTITY Left "<keysym>←</keysym>"> <!-- Cursor key-->
++<!ENTITY Right "<keysym>→</keysym>"> <!-- Cursor key-->
++<!ENTITY Space "<keysym>Espaço</keysym>">
+ <!ENTITY BDM "botão <mousebutton>direito</mousebutton> do mouse"> <!-- English: &RMB; -->
+ <!ENTITY RMB "botão <mousebutton>direito</mousebutton> do mouse">
+ <!ENTITY Shift "<keycap>Shift</keycap>">
+--
+cgit v0.11.2
+
diff --git a/kde-frameworks/kdoctools/kdoctools-5.40.0-r1.ebuild b/kde-frameworks/kdoctools/kdoctools-5.40.0-r1.ebuild
new file mode 100644
index 00000000000..0ac12558866
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-5.40.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+inherit kde5
+
+DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ app-text/sgml-common
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-perl/URI
+"
+
+# already required by media-video/kaffeine-2.0.14
+PATCHES=( "${FILESDIR}/${P}-pt_BR-fix.patch" )
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdoctools/, kde-frameworks/kdoctools/files/
@ 2019-02-07 13:01 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-02-07 13:01 UTC (permalink / raw
To: gentoo-commits
commit: 0d0adf4376949b7dedb433bc4752473f4ddad14d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 6 23:53:55 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 7 12:59:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d0adf43
kde-frameworks/kdoctools: Add /usr/share/help dir to list of doc dirs
This is fed to kio_help from kde-frameworks/kio to populate
kde-apps/khelpcenter runtime content.
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kdoctools-5.54.0-gentoo-docbundledir.patch | 26 ++++++++++++
.../kdoctools/kdoctools-5.54.0-r1.ebuild | 46 ++++++++++++++++++++++
2 files changed, 72 insertions(+)
diff --git a/kde-frameworks/kdoctools/files/kdoctools-5.54.0-gentoo-docbundledir.patch b/kde-frameworks/kdoctools/files/kdoctools-5.54.0-gentoo-docbundledir.patch
new file mode 100644
index 00000000000..cb6c35f19ff
--- /dev/null
+++ b/kde-frameworks/kdoctools/files/kdoctools-5.54.0-gentoo-docbundledir.patch
@@ -0,0 +1,26 @@
+From 79f31819b95fcb0bd3d30630f769706923d41609 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 28 Jan 2019 22:50:56 +0100
+Subject: [PATCH] xslt.cpp: Add /usr/share/help dir to list of paths containing
+ documentation
+
+---
+ src/xslt.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/xslt.cpp b/src/xslt.cpp
+index 1000e33..a0fbe4c 100644
+--- a/src/xslt.cpp
++++ b/src/xslt.cpp
+@@ -494,5 +494,7 @@ QStringList getKDocToolsCatalogs()
+ QStringList KDocTools::documentationDirs()
+ {
+ /* List of paths containing documentation */
+- return QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/HTML"), QStandardPaths::LocateDirectory);
++ QStringList docDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("help"), QStandardPaths::LocateDirectory);
++ docDirs.append(QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/HTML"), QStandardPaths::LocateDirectory));
++ return docDirs;
+ }
+--
+2.20.1
+
diff --git a/kde-frameworks/kdoctools/kdoctools-5.54.0-r1.ebuild b/kde-frameworks/kdoctools/kdoctools-5.54.0-r1.ebuild
new file mode 100644
index 00000000000..f4265374061
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-5.54.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_QTHELP="false"
+inherit kde5
+
+DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+ dev-lang/perl
+ dev-perl/URI
+ nls? ( $(add_frameworks_dep ki18n) )
+"
+DEPEND="
+ $(add_frameworks_dep karchive)
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ app-text/sgml-common
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-gentoo-docbundledir.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package nls KF5I18n)
+ )
+
+ kde5_src_configure
+}
+
+src_test() {
+ # bug 665622
+ local myctestargs=(
+ -E "(kdoctools_install)"
+ )
+
+ kde5_src_test
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdoctools/, kde-frameworks/kdoctools/files/
@ 2019-08-17 23:02 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-08-17 23:02 UTC (permalink / raw
To: gentoo-commits
commit: 2fb6ab9768812b92412e49f6a2c2c3362ad7fb74
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 17 21:54:10 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 23:01:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fb6ab97
kde-frameworks/kdoctools: Drop use of deprecated KDEInstallDirs vars
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...tools-5.61.0-nondeprecated-kdeinstalldirs.patch | 89 ++++++++++++++++++++++
.../kdoctools/kdoctools-5.61.0-r1.ebuild | 49 ++++++++++++
2 files changed, 138 insertions(+)
diff --git a/kde-frameworks/kdoctools/files/kdoctools-5.61.0-nondeprecated-kdeinstalldirs.patch b/kde-frameworks/kdoctools/files/kdoctools-5.61.0-nondeprecated-kdeinstalldirs.patch
new file mode 100644
index 00000000000..ea250cb305c
--- /dev/null
+++ b/kde-frameworks/kdoctools/files/kdoctools-5.61.0-nondeprecated-kdeinstalldirs.patch
@@ -0,0 +1,89 @@
+From 2a23bf672f25da3a0b6619969f308133fbd92a7c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 17 Aug 2019 22:42:39 +0200
+Subject: [PATCH] KF5DocToolsMacros.cmake: Use non-deprecated KDEInstallDirs
+ variables
+
+Summary:
+HTML_INSTALL_DIR -> KDE_INSTALL_DOCBUNDLEDIR
+MAN_INSTALL_DIR -> KDE_INSTALL_MANDIR
+
+BUG: 410998
+
+Test Plan: Install paths are correct by example of marble.
+
+Subscribers: kde-frameworks-devel, kde-doc-english
+
+Tags: #frameworks, #documentation
+
+Differential Revision: https://phabricator.kde.org/D23229
+---
+ KF5DocToolsMacros.cmake | 30 +++++++++++++++++++-----------
+ 1 file changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/KF5DocToolsMacros.cmake b/KF5DocToolsMacros.cmake
+index 88a2b3e..91d8736 100644
+--- a/KF5DocToolsMacros.cmake
++++ b/KF5DocToolsMacros.cmake
+@@ -63,13 +63,13 @@
+ #
+ # KDOCTOOLS_INSTALL(po) does the following:
+ # - Create man pages from footool.1.docbook and footool.conf.5.docbook,
+-# install them in ${MAN_INSTALL_DIR}/fr
++# install them in ${KDE_INSTALL_MANDIR}/fr
+ # - Create handbooks from index.docbook files, install the one from the
+-# fooslave/ directory in ${HTML_INSTALL_DIR}/fr/kioslave5/fooslave
+-# and the one from the docs/ directory in $[HTML_INSTALL_DIR}/fr
++# fooslave/ directory in ${KDE_INSTALL_DOCBUNDLEDIR}/fr/kioslave5/fooslave
++# and the one from the docs/ directory in ${KDE_INSTALL_DOCBUNDLEDIR}/fr
+ #
+-# If ${HTML_INSTALL_DIR} is not set, share/doc/HTML is used instead.
+-# If ${MAN_INSTALL_DIR} is not set, share/man/<lang> is used instead.
++# If ${KDE_INSTALL_DOCBUNDLEDIR} is not set, share/doc/HTML is used instead.
++# If ${KDE_INSTALL_MANDIR} is not set, share/man/<lang> is used instead.
+ #
+ # KDOCTOOLS_MEINPROC_EXECUTABLE - the meinproc5 executable
+ #
+@@ -232,11 +232,19 @@ endfunction()
+
+ function(kdoctools_install podir)
+ file(GLOB lang_dirs "${podir}/*")
+- if (NOT MAN_INSTALL_DIR)
+- set(MAN_INSTALL_DIR share/man)
++ if (NOT KDE_INSTALL_MANDIR)
++ if (MAN_INSTALL_DIR) # TODO KF6: deprecated, remove
++ set(KDE_INSTALL_MANDIR ${MAN_INSTALL_DIR})
++ else()
++ set(KDE_INSTALL_MANDIR share/man)
++ endif()
+ endif()
+- if (NOT HTML_INSTALL_DIR)
+- set(HTML_INSTALL_DIR share/doc/HTML)
++ if (NOT KDE_INSTALL_DOCBUNDLEDIR)
++ if (HTML_INSTALL_DIR) # TODO KF6: deprecated, remove
++ set(KDE_INSTALL_DOCBUNDLEDIR ${HTML_INSTALL_DIR})
++ else()
++ set(KDE_INSTALL_DOCBUNDLEDIR share/doc/HTML)
++ endif()
+ endif()
+ foreach(lang_dir ${lang_dirs})
+ get_filename_component(lang ${lang_dir} NAME)
+@@ -246,13 +254,13 @@ function(kdoctools_install podir)
+ string(REGEX MATCH "\\.([0-9])\\.docbook" match ${docbook})
+ if (match)
+ kdoctools_create_manpage(${docbook} ${CMAKE_MATCH_1}
+- INSTALL_DESTINATION ${MAN_INSTALL_DIR}/${lang}
++ INSTALL_DESTINATION ${KDE_INSTALL_MANDIR}/${lang}
+ )
+ else()
+ string(REGEX MATCH "${lang_dir}/docs/(.*)/index.docbook" match ${docbook})
+ if (match)
+ kdoctools_create_handbook(${docbook}
+- INSTALL_DESTINATION ${HTML_INSTALL_DIR}/${lang}
++ INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/${lang}
+ SUBDIR ${CMAKE_MATCH_1}
+ )
+ endif()
+--
+2.22.1
+
diff --git a/kde-frameworks/kdoctools/kdoctools-5.61.0-r1.ebuild b/kde-frameworks/kdoctools/kdoctools-5.61.0-r1.ebuild
new file mode 100644
index 00000000000..1027f3f8456
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-5.61.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_QTHELP="false"
+inherit kde5
+
+DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+ dev-lang/perl
+ dev-perl/URI
+ nls? ( $(add_frameworks_dep ki18n) )
+"
+DEPEND="
+ $(add_frameworks_dep karchive)
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ app-text/sgml-common
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch"
+ "${FILESDIR}/${P}-nondeprecated-kdeinstalldirs.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package nls KF5I18n)
+ )
+
+ kde5_src_configure
+}
+
+src_test() {
+ # bug 665622
+ local myctestargs=(
+ -E "(kdoctools_install)"
+ )
+
+ kde5_src_test
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdoctools/, kde-frameworks/kdoctools/files/
@ 2020-01-19 19:19 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-01-19 19:19 UTC (permalink / raw
To: gentoo-commits
commit: 39dd2e09d01bc268942230c12fbb30a0fb65a79f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 19 19:18:36 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 19 19:18:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39dd2e09
kde-frameworks/kdoctools: Switch back to simple Gentoo docbundledir patch
Bug: https://bugs.gentoo.org/705340
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kdoctools-5.66.0-docbundledir.patch | 160 ---------------------
kde-frameworks/kdoctools/kdoctools-5.66.0.ebuild | 2 +-
2 files changed, 1 insertion(+), 161 deletions(-)
diff --git a/kde-frameworks/kdoctools/files/kdoctools-5.66.0-docbundledir.patch b/kde-frameworks/kdoctools/files/kdoctools-5.66.0-docbundledir.patch
deleted file mode 100644
index 640e4d83426..00000000000
--- a/kde-frameworks/kdoctools/files/kdoctools-5.66.0-docbundledir.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
---- a/autotests/CMakeLists.txt
-+++ b/autotests/CMakeLists.txt
-@@ -1,3 +1,40 @@
-+include(ECMMarkAsTest)
-+
-+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Test)
-+
-+find_package(LibXslt REQUIRED)
-+find_package(LibXml2 REQUIRED)
-+
-+include_directories( ${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR} )
-+
-+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../src)
-+include_directories(${CMAKE_CURRENT_BINARY_DIR}/..)
-+
-+add_definitions(-DSIMPLE_XSLT)
-+
-+function(kdoctools_define_document_test basetest)
-+ set(documentdirstest_SRCS
-+ ${basetest}.cpp
-+ ../src/xslt.cpp
-+ ${CMAKE_CURRENT_BINARY_DIR}/../src/loggingcategory.cpp
-+ )
-+
-+ add_executable(${basetest} ${documentdirstest_SRCS})
-+ target_link_libraries(${basetest}
-+ Qt5::Core Qt5::Test
-+ ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBXSLT_EXSLT_LIBRARIES}
-+ )
-+
-+ add_test(NAME ${basetest} COMMAND ${basetest})
-+ ecm_mark_as_test(${basetest})
-+endfunction()
-+
-+kdoctools_define_document_test(documentdirstest)
-+
-+kdoctools_define_document_test(documentcustomdirtest)
-+# custom path, used by the test
-+target_compile_definitions(documentcustomdirtest PRIVATE KDOCTOOLS_CUSTOM_DOC_PATH="/usr/share/doc/kde/HTML")
-+
- add_test(
- NAME meinproc_template
- COMMAND meinproc5 --srcdir ${CMAKE_CURRENT_BINARY_DIR}/../src ${CMAKE_CURRENT_SOURCE_DIR}/../src/template.docbook
-diff --git a/autotests/documentcustomdirtest.cpp b/autotests/documentcustomdirtest.cpp
-new file mode 100644
---- /dev/null
-+++ b/autotests/documentcustomdirtest.cpp
-@@ -0,0 +1,37 @@
-+#include <QDebug>
-+#include <QRegularExpression>
-+#include <QTest>
-+
-+#include "../src/docbookxslt.h"
-+#include "config-kdoctools.h"
-+#include "loggingcategory.h"
-+
-+using namespace KDocTools;
-+
-+class documentCustomDirTest: public QObject
-+{
-+ Q_OBJECT
-+private Q_SLOTS:
-+ void testDirsContent();
-+};
-+
-+void documentCustomDirTest::testDirsContent()
-+{
-+ const QStringList docDirs = documentationDirs();
-+ QVERIFY(docDirs.size() >= 1);
-+ /* DOCBUNDLEDIR (one of its matches) must be the first element */
-+ QVERIFY(docDirs[0].indexOf(QRegularExpression(QStringLiteral(KDOCTOOLS_DOCBUNDLEDIR))) >= 0);
-+ /* Check all the other items that should be there;
-+ check the last occurrence, as each locateAll can return more items
-+ and also some of them may match KDOCTOOLS_DOCBUNDLEDIR */
-+ int position_dir_doc_HTML = docDirs.lastIndexOf(QRegularExpression(QStringLiteral(".*/doc/HTML$")));
-+ QVERIFY(position_dir_doc_HTML >= 0);
-+ int position_dir_help = docDirs.lastIndexOf(QRegularExpression(QStringLiteral(".*/help$")));
-+ QVERIFY(position_dir_help >= 0);
-+ /* The custom directory */
-+ int position_dir_custom = docDirs.lastIndexOf(QStringLiteral(KDOCTOOLS_CUSTOM_DOC_PATH));
-+ QVERIFY(position_dir_custom >= 0);
-+}
-+
-+QTEST_MAIN(documentCustomDirTest)
-+#include "documentcustomdirtest.moc"
-diff --git a/autotests/documentdirstest.cpp b/autotests/documentdirstest.cpp
-new file mode 100644
---- /dev/null
-+++ b/autotests/documentdirstest.cpp
-@@ -0,0 +1,34 @@
-+#include <QDebug>
-+#include <QRegularExpression>
-+#include <QTest>
-+
-+#include "../src/docbookxslt.h"
-+#include "config-kdoctools.h"
-+#include "loggingcategory.h"
-+
-+using namespace KDocTools;
-+
-+class documentDirsTest: public QObject
-+{
-+ Q_OBJECT
-+private Q_SLOTS:
-+ void testDirsContent();
-+};
-+
-+void documentDirsTest::testDirsContent()
-+{
-+ const QStringList docDirs = documentationDirs();
-+ QVERIFY(docDirs.size() >= 1);
-+ /* DOCBUNDLEDIR (one of its matches) must be the first element */
-+ QVERIFY(docDirs[0].indexOf(QRegularExpression(QStringLiteral(KDOCTOOLS_DOCBUNDLEDIR))) >= 0);
-+ /* Check all the other items that should be there;
-+ check the last occurrence, as each locateAll can return more items
-+ and also some of them may match KDOCTOOLS_DOCBUNDLEDIR */
-+ int position_dir_doc_HTML = docDirs.lastIndexOf(QRegularExpression(QStringLiteral(".*/doc/HTML$")));
-+ QVERIFY(position_dir_doc_HTML >= 0);
-+ int position_dir_help = docDirs.lastIndexOf(QRegularExpression(QStringLiteral(".*/help$")));
-+ QVERIFY(position_dir_help >= 0);
-+}
-+
-+QTEST_MAIN(documentDirsTest)
-+#include "documentdirstest.moc"
-diff --git a/config-kdoctools.h.cmake b/config-kdoctools.h.cmake
---- a/config-kdoctools.h.cmake
-+++ b/config-kdoctools.h.cmake
-@@ -3,3 +3,13 @@
- #define DOCBOOK_XML_CURRDTD "@DocBookXML4_DTD_DIR@"
-
- #define KDOCTOOLS_INSTALL_DATADIR_KF5 "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DATADIR_KF5}"
-+
-+#define KDOCTOOLS_DOCBUNDLEDIR "${KDE_INSTALL_DOCBUNDLEDIR}"
-+
-+/* Get the value set in the library at compile time, or allow the application
-+ to set it if the library has not defined it (useful for example for testing
-+ purposes)
-+*/
-+#ifndef KDOCTOOLS_CUSTOM_DOC_PATH
-+#define KDOCTOOLS_CUSTOM_DOC_PATH "${KDOCTOOLS_CUSTOM_DOC_PATH}"
-+#endif
-diff --git a/src/xslt.cpp b/src/xslt.cpp
---- a/src/xslt.cpp
-+++ b/src/xslt.cpp
-@@ -489,5 +489,13 @@
- QStringList KDocTools::documentationDirs()
- {
- /* List of paths containing documentation */
-- return QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/HTML"), QStandardPaths::LocateDirectory);
-+ QStringList allDocDirs;
-+ allDocDirs << QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral(KDOCTOOLS_DOCBUNDLEDIR), QStandardPaths::LocateDirectory)
-+ << QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/HTML"), QStandardPaths::LocateDirectory)
-+ << QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("help"), QStandardPaths::LocateDirectory);
-+ if (!QStringLiteral(KDOCTOOLS_CUSTOM_DOC_PATH).isEmpty()) {
-+ allDocDirs << QStringLiteral(KDOCTOOLS_CUSTOM_DOC_PATH);
-+ }
-+ allDocDirs.removeDuplicates();
-+ return allDocDirs;
- }
diff --git a/kde-frameworks/kdoctools/kdoctools-5.66.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.66.0.ebuild
index 0d80c0455b6..7fb5ee8c626 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.66.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.66.0.ebuild
@@ -28,7 +28,7 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-5.66.0-docbundledir.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdoctools/, kde-frameworks/kdoctools/files/
@ 2023-11-18 13:20 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-11-18 13:20 UTC (permalink / raw
To: gentoo-commits
commit: 6746ba0521ba0d7d8a00fc0b087e9fb08ffae648
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 13:18:15 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 13:20:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6746ba05
kde-frameworks/kdoctools: Fix build with dev-libs/libxml2-2.12.0
Closes: https://bugs.gentoo.org/917527
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kdoctools-5.112.0-libxml2-2.12.patch | 25 ++++++++++++++++++++++
kde-frameworks/kdoctools/kdoctools-5.112.0.ebuild | 15 +++++++------
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/kde-frameworks/kdoctools/files/kdoctools-5.112.0-libxml2-2.12.patch b/kde-frameworks/kdoctools/files/kdoctools-5.112.0-libxml2-2.12.patch
new file mode 100644
index 000000000000..80f8bdb26f42
--- /dev/null
+++ b/kde-frameworks/kdoctools/files/kdoctools-5.112.0-libxml2-2.12.patch
@@ -0,0 +1,25 @@
+From b77fe5677f9727778ceea5d3c04c0a97c9a23566 Mon Sep 17 00:00:00 2001
+From: Haochen Tong <i@hexchain.org>
+Date: Fri, 17 Nov 2023 14:54:23 +0800
+Subject: [PATCH] Fix build with libxml2 v2.12
+
+(cherry picked from commit 0a90be000709f9dd85936ffc6a5415684f650c3a)
+---
+ src/xslt.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/xslt.cpp b/src/xslt.cpp
+index 28c724f..dbc5435 100644
+--- a/src/xslt.cpp
++++ b/src/xslt.cpp
+@@ -14,6 +14,7 @@
+ #include <libxml/parser.h>
+ #include <libxml/parserInternals.h>
+ #include <libxml/xmlIO.h>
++#include <libxml/xmlsave.h>
+ #include <libxslt/transform.h>
+ #include <libxslt/xsltInternals.h>
+ #include <libxslt/xsltconfig.h>
+--
+2.42.1
+
diff --git a/kde-frameworks/kdoctools/kdoctools-5.112.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.112.0.ebuild
index 27262d73b28f..3997ed135649 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.112.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.112.0.ebuild
@@ -13,11 +13,6 @@ LICENSE="MIT"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="nls"
-BDEPEND="
- dev-lang/perl
- dev-perl/URI
- nls? ( >=kde-frameworks/ki18n-${PVCUT}:5 )
-"
DEPEND="
app-text/docbook-xml-dtd:4.5
app-text/docbook-xsl-stylesheets
@@ -27,8 +22,16 @@ DEPEND="
=kde-frameworks/karchive-${PVCUT}*:5
"
RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-lang/perl
+ dev-perl/URI
+ nls? ( >=kde-frameworks/ki18n-${PVCUT}:5 )
+"
-PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch"
+ "${FILESDIR}/${P}-libxml2-2.12.patch" # in 5.113; bug 917527
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-11-18 13:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-05 23:35 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdoctools/, kde-frameworks/kdoctools/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-02-07 13:01 Andreas Sturmlechner
2019-08-17 23:02 Andreas Sturmlechner
2020-01-19 19:19 Andreas Sturmlechner
2023-11-18 13:20 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox