From 032a3dbb5d4ea63ec6c2ceb39c067ea6424b5792 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 20 Jan 2020 19:28:42 +0000 Subject: gentoo resync : 20.01.2020 --- kde-frameworks/Manifest.gz | Bin 14228 -> 14230 bytes kde-frameworks/kdoctools/Manifest | 3 +- .../files/kdoctools-5.66.0-docbundledir.patch | 160 --------------------- kde-frameworks/kdoctools/kdoctools-5.66.0.ebuild | 2 +- 4 files changed, 2 insertions(+), 163 deletions(-) delete mode 100644 kde-frameworks/kdoctools/files/kdoctools-5.66.0-docbundledir.patch (limited to 'kde-frameworks') diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz index 0d17d5e27ac8..449a5cacde0c 100644 Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest index d22a47432b71..a95684fb1ba4 100644 --- a/kde-frameworks/kdoctools/Manifest +++ b/kde-frameworks/kdoctools/Manifest @@ -1,7 +1,6 @@ AUX kdoctools-5.54.0-gentoo-docbundledir.patch 1055 BLAKE2B 0b57d4d23fdac39a939d1355ddecb5d0ba53c1a2b2ef43fb1127834b1004b4fd63a8e32a160794a51879a103c658068a67663fe8f9e1cb99ede5154cbccf2c1d SHA512 18dcd82bfccec19eccb5993cfabf4ead9222dbf29cad3a9df4b1c225a2693ea0b882dac78f969da7bf98aa4bdf5b09ee28cef6ff28935502439ca20fad427bdb -AUX kdoctools-5.66.0-docbundledir.patch 5916 BLAKE2B 4f667d9ac8e8557d32ee611c2a801ce1ed4409b5d1abc1a69a6d0586b24df1bba69ae8fcb7e851f8a456445c747a88a2e36c2c71cc756e26ed6291236dbdd975 SHA512 aff893a950231fd4e922d8dcd67c951f3c84b15d80c4207fe39e8e5bc62b1b7c8527ed361ae8ae91eea92fbf9567aa5b970bcf87617ac93f9c48ddc0f08c790f DIST kdoctools-5.64.0.tar.xz 429464 BLAKE2B 56623d9171956752eac51ec9cd7c8bedb5ff57c66b14619d1f8e1253c39fd3b00284fdb6ac2f03b3fd54fdbcfe037f07a46c126effe81ae67f67dc801023e98f SHA512 213c343fee983093391b84a81186a36edc7e78651ccf19381579695f9ed70af660131614393420258d63538953e494ff7246892dc4f31e1469bd7ab318eef1f9 DIST kdoctools-5.66.0.tar.xz 428884 BLAKE2B 906593af7889a6190b3cc0173971d54bd70d63e81d58a6598f3c58639cde5558e5ebd01a86ee2d5be9b2f4ba2a6d87f6be512bc69882e3d2f3f056f509af9a5c SHA512 b830d99bb4c39fd1dd8cb942d0b2b987cdf260ab4547ce7c37650cc9e0b3607d7a0009c02f67cd5b9cc9234cd026bf669d9b17983b569425dff33323ce7df272 EBUILD kdoctools-5.64.0.ebuild 861 BLAKE2B 408c90fc755119e8723342e22743e77316731772b651923048628994b533a86a06c7a1641377842183873bfbfebe209f7b45c6c6ca8ac9b0d2e3618803f8a274 SHA512 997c5ef6f3c501a2ba3995380d23f8360c3a31ca94acebad1bdf0b8b0b98b004483cb3729665ac8f7e1aee2412dc062ea6fd263680d6a5ea7b5cbfeedd426fb4 -EBUILD kdoctools-5.66.0.ebuild 858 BLAKE2B d2eebf40ceed454bd88129c90e766dc51e86b2e48e55fc632ef6219be12e9035c828f5b09b62f4453f3e62ea58819158929072d2b1e42a08230d75195b13d3d4 SHA512 394df21cc9458dce3f8d59726e200980b31791008cb2e145c8ea251e40062971e893487dba59abf289b0d3c410bb51df2025b116c41f87656c9eacec43bcdd61 +EBUILD kdoctools-5.66.0.ebuild 865 BLAKE2B be62997e697c3b370ebb6c4b42c61cdbd8ad79e819e6251d0168e74a3033427c82a11465c69eaca901ef1a2e5a346daf3c4581c91f3d12476dee8c2be28ad9d9 SHA512 873dc14b695481515bc4ed8427d197077796a9524234df0c7b273d814e804f15aecb032128acebb9dc76d21d0f17f79c8907087e4ffaac4b53abd01342242e0f MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 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 640e4d83426c..000000000000 --- 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 -+#include -+#include -+ -+#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 -+#include -+#include -+ -+#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 0d80c0455b6c..7fb5ee8c626b 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=( -- cgit v1.2.3