From 88ebe56470c37b02a044e1091cad6b2df0f3be8f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 11 May 2018 16:02:49 +0100 Subject: gentoo resync : 11.05.2018 --- dev-qt/qdoc/Manifest | 7 +- .../files/qdoc-5.11.0-revert-static-clang.patch | 239 +++++++++++++++++++++ dev-qt/qdoc/qdoc-5.11.0_beta4.ebuild | 37 ---- dev-qt/qdoc/qdoc-5.11.0_rc.ebuild | 39 ++++ dev-qt/qdoc/qdoc-5.7.1.ebuild | 24 --- 5 files changed, 281 insertions(+), 65 deletions(-) create mode 100644 dev-qt/qdoc/files/qdoc-5.11.0-revert-static-clang.patch delete mode 100644 dev-qt/qdoc/qdoc-5.11.0_beta4.ebuild create mode 100644 dev-qt/qdoc/qdoc-5.11.0_rc.ebuild delete mode 100644 dev-qt/qdoc/qdoc-5.7.1.ebuild (limited to 'dev-qt/qdoc') diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest index 3c9fbe33e013..1edff3284f98 100644 --- a/dev-qt/qdoc/Manifest +++ b/dev-qt/qdoc/Manifest @@ -1,9 +1,8 @@ -DIST qttools-everywhere-src-5.11.0-beta4.tar.xz 9676452 BLAKE2B 7d90408d3a322b5d9d421af1f29549321a788fb5d5a117911a7b6363c30524ce66e19c991ede7433c3e609fa80ec1e066ea2b6ddb467836defb502b8e6f1c017 SHA512 cbc0de24eb1a49852cc5860a60d42f2d90923b723b40dc48e1334f26db15d9851e069a78c5cc161f546231b5d8c1e7bcc0d8900f582680f4ad04df55149d3645 -DIST qttools-opensource-src-5.7.1.tar.xz 10011108 BLAKE2B c677b52720dfddf37eb07cfd62a678bc69d5b564b571d39874bc61ea6d597f2a3964a305c6fe303a0f8b2f2eafc765922dfb4de55d3f63efcf5921aba38a12a7 SHA512 10e4e060943596602bae0f99091de0923d3ebc761d44a5d193bfd17b77cf8fdf3c4466fb19363bbd3a354955ed09db9132b23833557f5216c7b4df758c17406e +AUX qdoc-5.11.0-revert-static-clang.patch 10328 BLAKE2B 0860936b2764e8b787f3153fb129ec4339538c9a0386dce94d1002dddcfd4404a87b74eb25f8d4321019b504198a24f150df82c890c05b34e40aedc111728ee3 SHA512 843f771f5e67a71426341fe1e85b5a0505d16a776aeec879ce4fe4dad9b4284aeb3b9a47e783b831a9f6548e10f637a2c02f826158e27bd042b961b6cb2b1a36 +DIST qttools-everywhere-src-5.11.0-rc.tar.xz 9678972 BLAKE2B aa666409b9b2638fe2ce34c4629228a272bb0277179c9162c112d044ca9f775c808b85e29c3a2412ac1340653de3c3e68071d78bcfc91f025fa829ad0ccda389 SHA512 060f1087645b7e2487fe53e84a9d26f461b48ab65edf530db85e3496b7ec298fb5351b75e7be59925217b2f3216805bf1ec7e35726e30d94513f3ba52412c222 DIST qttools-opensource-src-5.9.4.tar.xz 9779504 BLAKE2B 993b80c7e960e3dc968cd3a85cb5b78414a70fd73f89d687b753ac6eb37acea6d2dbf25e07686706f47eb803ead5d046f707fe52285451e6605ad27119a0cb54 SHA512 9a24f6118206076e8f6af1a257ba752aa3042aad3a1d6caafa3b221d811854f9d973de137cfd9b141b23db18f9b5101df70419c5ff17c75613f2a6ddb23c61c3 DIST qttools-opensource-src-5.9.5.tar.xz 9573924 BLAKE2B 7e987a509480592c85601176817e25602d3d33cb0ce27145ba80541e4e450851363072cb51e5a46eb3827a4ac83473c98e6557a82887265b1118996121d04228 SHA512 8eaaba434493ab23337f7074dc2f35ecf79f023fd7f031ff7473ac8fd3475c2fa32dd5e79f9d6f740dd7c59eedf9d95b6fbafc08494c081a0fa4d082c1b4fe7e -EBUILD qdoc-5.11.0_beta4.ebuild 753 BLAKE2B a25c8f934982505e93a78e05b8772eb1476e31f4f3e3b315698aa518da2ed8dbec86867491bc5694ec1d6dd16e62869bd7d0b8abd59d39e7b8f9208053b14b4a SHA512 91546d1b9c02e16338186c56875222ac7fee28f99479f320d7cd1734908b96b9af036ea3c8dfe4a0f5d713a0731514bdeafe08e5542ca59ecc97cd51ba2036e1 -EBUILD qdoc-5.7.1.ebuild 404 BLAKE2B ac7a1447f06626bcb05eaea2b704e100bf8b3a72745e93e3f704cbe6af1e3149169386a80b715510a17fdc3de2640e0bd9b1331920f394b2c50f09a3c520e860 SHA512 64244aff93afc21ff69ce94032b6e722cb68e21842939acaf0971353889af1fa5a8d4854ed2f3cd3c93af5c054e8dcf56a73692be314668c70da1884d36949ed +EBUILD qdoc-5.11.0_rc.ebuild 819 BLAKE2B 2f7e298536a0fe6bab61e115de0f59d3c4968492d8da3247619d19966a56e5e048dc0539a17ee01fd7f5615bdfca6972372984ac20dc1b34b8611ed3ae9f23aa SHA512 128ee5814b82ffdd7e86017dfef3509fbce3c8b049dd7faf53dce0d17949e01ab139c9aec92f7eba4cd2a6fc5104e0ca4fe06219b7d44f4cd0a1d7c8d47e568b EBUILD qdoc-5.9.4.ebuild 534 BLAKE2B 3817288c91c7c034346c8b9d093d243cbb37229c411117d20efad801fd483730f51de736fffd3f697a081b8be2a083b5e9ee50a1e73d646100aa409306389eb8 SHA512 ab20a092b666c13b4e248c6abe9e2fff6a79d740ee3ea996cd3aecd72b23857e950b9555fb0293908c49b4719f923876b5035247e28210bbd82cf19a99e3c57d EBUILD qdoc-5.9.5.ebuild 538 BLAKE2B 717a554d3d094d660b350fd7cad133ab97a695b11c7199e2ec2d1a0a7c0c7188b463b26e3fa3336de270dc103a1341e126056d0917b138f00b9195e4f4e76287 SHA512 d1872b17a326d91cae9e5edb425a0d5ed75ef3802f73f7b30ef5117636d11915686075f54ffd95f2b150cb6a6f2521a6e510a6dab27c8ef12d8c69eb34cf46ad MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf diff --git a/dev-qt/qdoc/files/qdoc-5.11.0-revert-static-clang.patch b/dev-qt/qdoc/files/qdoc-5.11.0-revert-static-clang.patch new file mode 100644 index 000000000000..e5496019b8e5 --- /dev/null +++ b/dev-qt/qdoc/files/qdoc-5.11.0-revert-static-clang.patch @@ -0,0 +1,239 @@ +Reverting upstream regression. + + +From fddf7ee536e4fd0061d0ee933707881cebe54223 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= +Date: Wed, 18 Apr 2018 13:35:10 +0200 +Subject: Link qdoc to static libclang + +Done-with: Mikhail Svetkin +Change-Id: Ifbd4e1b27f658f7d4f287a8a51f0cda54814e754 +Reviewed-by: Simon Hausmann +--- + mkspecs/features/qt_find_clang.prf | 197 ------------------------------------+ + src/qdoc/qdoc.pro | 8 -- + 2 files changed, 3 insertions(+), 202 deletions(-) + +--- a/mkspecs/features/qt_find_clang.prf 2018-05-03 13:02:49.000000000 +0200 ++++ b/mkspecs/features/qt_find_clang.prf 2018-05-10 12:54:26.778546039 +0200 +@@ -90,200 +90,9 @@ + + !contains(QMAKE_DEFAULT_LIBDIRS, $$CLANG_LIBDIR): CLANG_LIBS = -L$${CLANG_LIBDIR} + equals(QMAKE_HOST.os, Windows): \ +- CLANG_LIBS += -llibclang_static -ladvapi32 -lshell32 -lMincore +- else: { +- !equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--start-group +- CLANG_LIBS += -lclangAnalysis \ +- -lclangApplyReplacements \ +- -lclangARCMigrate \ +- -lclangAST \ +- -lclangASTMatchers \ +- -lclangBasic \ +- -lclangChangeNamespace \ +- -lclangCodeGen \ +- -lclangCrossTU \ +- -lclangDaemon \ +- -lclangDriver \ +- -lclangDynamicASTMatchers \ +- -lclangEdit \ +- -lclangFormat \ +- -lclangFrontend \ +- -lclangFrontendTool \ +- -lclangHandleCXX \ +- -lclangIncludeFixer \ +- -lclangIncludeFixerPlugin \ +- -lclangIndex \ +- -lclangLex \ +- -lclangMove \ +- -lclangParse \ +- -lclangQuery \ +- -lclangReorderFields \ +- -lclangRewrite \ +- -lclangRewriteFrontend \ +- -lclangSema \ +- -lclangSerialization \ +- -lclang_static \ +- -lclangStaticAnalyzerCheckers \ +- -lclangStaticAnalyzerCore \ +- -lclangStaticAnalyzerFrontend \ +- -lclangTidy \ +- -lclangTidyAndroidModule \ +- -lclangTidyBoostModule \ +- -lclangTidyBugproneModule \ +- -lclangTidyCERTModule \ +- -lclangTidyCppCoreGuidelinesModule \ +- -lclangTidyFuchsiaModule \ +- -lclangTidyGoogleModule \ +- -lclangTidyHICPPModule \ +- -lclangTidyLLVMModule \ +- -lclangTidyMiscModule \ +- -lclangTidyModernizeModule \ +- -lclangTidyMPIModule \ +- -lclangTidyObjCModule \ +- -lclangTidyPerformanceModule \ +- -lclangTidyPlugin \ +- -lclangTidyReadabilityModule \ +- -lclangTidyUtils \ +- -lclangTooling \ +- -lclangToolingASTDiff \ +- -lclangToolingCore \ +- -lclangToolingRefactor \ +- -lfindAllSymbols \ +- -lLLVMAArch64AsmParser \ +- -lLLVMAArch64AsmPrinter \ +- -lLLVMAArch64CodeGen \ +- -lLLVMAArch64Desc \ +- -lLLVMAArch64Disassembler \ +- -lLLVMAArch64Info \ +- -lLLVMAArch64Utils \ +- -lLLVMAMDGPUAsmParser \ +- -lLLVMAMDGPUAsmPrinter \ +- -lLLVMAMDGPUCodeGen \ +- -lLLVMAMDGPUDesc \ +- -lLLVMAMDGPUDisassembler \ +- -lLLVMAMDGPUInfo \ +- -lLLVMAMDGPUUtils \ +- -lLLVMAnalysis \ +- -lLLVMARMAsmParser \ +- -lLLVMARMAsmPrinter \ +- -lLLVMARMCodeGen \ +- -lLLVMARMDesc \ +- -lLLVMARMDisassembler \ +- -lLLVMARMInfo \ +- -lLLVMARMUtils \ +- -lLLVMAsmParser \ +- -lLLVMAsmPrinter \ +- -lLLVMBinaryFormat \ +- -lLLVMBitReader \ +- -lLLVMBitWriter \ +- -lLLVMBPFAsmParser \ +- -lLLVMBPFAsmPrinter \ +- -lLLVMBPFCodeGen \ +- -lLLVMBPFDesc \ +- -lLLVMBPFDisassembler \ +- -lLLVMBPFInfo \ +- -lLLVMCodeGen \ +- -lLLVMCore \ +- -lLLVMCoroutines \ +- -lLLVMCoverage \ +- -lLLVMDebugInfoCodeView \ +- -lLLVMDebugInfoDWARF \ +- -lLLVMDebugInfoMSF \ +- -lLLVMDebugInfoPDB \ +- -lLLVMDemangle \ +- -lLLVMDlltoolDriver \ +- -lLLVMExecutionEngine \ +- -lLLVMFuzzMutate \ +- -lLLVMGlobalISel \ +- -lLLVMHexagonAsmParser \ +- -lLLVMHexagonCodeGen \ +- -lLLVMHexagonDesc \ +- -lLLVMHexagonDisassembler \ +- -lLLVMHexagonInfo \ +- -lLLVMInstCombine \ +- -lLLVMInstrumentation \ +- -lLLVMInterpreter \ +- -lLLVMipo \ +- -lLLVMIRReader \ +- -lLLVMLanaiAsmParser \ +- -lLLVMLanaiAsmPrinter \ +- -lLLVMLanaiCodeGen \ +- -lLLVMLanaiDesc \ +- -lLLVMLanaiDisassembler \ +- -lLLVMLanaiInfo \ +- -lLLVMLibDriver \ +- -lLLVMLineEditor \ +- -lLLVMLinker \ +- -lLLVMLTO \ +- -lLLVMMC \ +- -lLLVMMCDisassembler \ +- -lLLVMMCJIT \ +- -lLLVMMCParser \ +- -lLLVMMipsAsmParser \ +- -lLLVMMipsAsmPrinter \ +- -lLLVMMipsCodeGen \ +- -lLLVMMipsDesc \ +- -lLLVMMipsDisassembler \ +- -lLLVMMipsInfo \ +- -lLLVMMIRParser \ +- -lLLVMMSP430AsmPrinter \ +- -lLLVMMSP430CodeGen \ +- -lLLVMMSP430Desc \ +- -lLLVMMSP430Info \ +- -lLLVMNVPTXAsmPrinter \ +- -lLLVMNVPTXCodeGen \ +- -lLLVMNVPTXDesc \ +- -lLLVMNVPTXInfo \ +- -lLLVMObjCARCOpts \ +- -lLLVMObject \ +- -lLLVMObjectYAML \ +- -lLLVMOption \ +- -lLLVMOrcJIT \ +- -lLLVMPasses \ +- -lLLVMPowerPCAsmParser \ +- -lLLVMPowerPCAsmPrinter \ +- -lLLVMPowerPCCodeGen \ +- -lLLVMPowerPCDesc \ +- -lLLVMPowerPCDisassembler \ +- -lLLVMPowerPCInfo \ +- -lLLVMProfileData \ +- -lLLVMRuntimeDyld \ +- -lLLVMScalarOpts \ +- -lLLVMSelectionDAG \ +- -lLLVMSparcAsmParser \ +- -lLLVMSparcAsmPrinter \ +- -lLLVMSparcCodeGen \ +- -lLLVMSparcDesc \ +- -lLLVMSparcDisassembler \ +- -lLLVMSparcInfo \ +- -lLLVMSupport \ +- -lLLVMSymbolize \ +- -lLLVMSystemZAsmParser \ +- -lLLVMSystemZAsmPrinter \ +- -lLLVMSystemZCodeGen \ +- -lLLVMSystemZDesc \ +- -lLLVMSystemZDisassembler \ +- -lLLVMSystemZInfo \ +- -lLLVMTableGen \ +- -lLLVMTarget \ +- -lLLVMTransformUtils \ +- -lLLVMVectorize \ +- -lLLVMWindowsManifest \ +- -lLLVMX86AsmParser \ +- -lLLVMX86AsmPrinter \ +- -lLLVMX86CodeGen \ +- -lLLVMX86Desc \ +- -lLLVMX86Disassembler \ +- -lLLVMX86Info \ +- -lLLVMX86Utils \ +- -lLLVMXCoreAsmPrinter \ +- -lLLVMXCoreCodeGen \ +- -lLLVMXCoreDesc \ +- -lLLVMXCoreDisassembler \ +- -lLLVMXCoreInfo \ +- -lLLVMXRay +- !equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--end-group +- } ++ CLANG_LIBS += -llibclang -ladvapi32 -lshell32 ++ else: \ ++ CLANG_LIBS += -lclang + + !versionIsAtLeast($$CLANG_VERSION, "3.9.0") { + log("LLVM/Clang version >= 3.9.0 required, version provided: $${CLANG_VERSION}.$$escape_expand(\\n)") +--- a/src/qdoc/qdoc.pro 2018-05-10 12:51:22.832458913 +0200 ++++ b/src/qdoc/qdoc.pro 2018-05-10 12:54:27.746557021 +0200 +@@ -15,14 +15,6 @@ + LIBS += $$CLANG_LIBS + !contains(QMAKE_DEFAULT_INCDIRS, $$CLANG_INCLUDEPATH): INCLUDEPATH += $$CLANG_INCLUDEPATH + +-# Support static libclang linking on different platforms +-equals(QMAKE_HOST.os, Windows): { +- DEFINES += CINDEX_LINKAGE= +-} else { +- LIBS += -lz -ldl +- equals(QMAKE_HOST.os, Darwin): LIBS += -lcurses -lm -lxml2 +-} +- + !contains(QMAKE_DEFAULT_LIBDIRS, $$CLANG_LIBDIR):!disable_external_rpath: QMAKE_RPATHDIR += $$CLANG_LIBDIR + DEFINES += $$shell_quote(CLANG_RESOURCE_DIR=\"$${CLANG_LIBDIR}/clang/$${CLANG_VERSION}/include\") + diff --git a/dev-qt/qdoc/qdoc-5.11.0_beta4.ebuild b/dev-qt/qdoc/qdoc-5.11.0_beta4.ebuild deleted file mode 100644 index 4c656e1bf9f6..000000000000 --- a/dev-qt/qdoc/qdoc-5.11.0_beta4.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Qt documentation generator" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~x86" -fi - -IUSE="qml" - -DEPEND=" - ~dev-qt/qtcore-${PV} - sys-devel/clang:= - qml? ( ~dev-qt/qtdeclarative-${PV} ) -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/qdoc -) - -src_prepare() { - qt_use_disable_mod qml qmldevtools-private \ - src/qdoc/qdoc.pro - - export LLVM_INSTALL_DIR="$(llvm-config --prefix)" - # this is normally loaded in qttools.pro, so skipped by using - # QT_TARGET_SUBDIRS causing build to fail - sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die - - qt5-build_src_prepare -} diff --git a/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild b/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild new file mode 100644 index 000000000000..2d1c8473347a --- /dev/null +++ b/dev-qt/qdoc/qdoc-5.11.0_rc.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +QT5_MODULE="qttools" +inherit qt5-build + +DESCRIPTION="Qt documentation generator" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~x86" +fi + +IUSE="qml" + +DEPEND=" + ~dev-qt/qtcore-${PV} + sys-devel/clang:= + qml? ( ~dev-qt/qtdeclarative-${PV} ) +" +RDEPEND="${DEPEND}" + +QT5_TARGET_SUBDIRS=( + src/qdoc +) + +PATCHES=( "${FILESDIR}/${PN}-5.11.0-revert-static-clang.patch" ) + +src_prepare() { + qt_use_disable_mod qml qmldevtools-private \ + src/qdoc/qdoc.pro + + export LLVM_INSTALL_DIR="$(llvm-config --prefix)" + # this is normally loaded in qttools.pro, so skipped by using + # QT_TARGET_SUBDIRS causing build to fail + sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die + + qt5-build_src_prepare +} diff --git a/dev-qt/qdoc/qdoc-5.7.1.ebuild b/dev-qt/qdoc/qdoc-5.7.1.ebuild deleted file mode 100644 index 4bcb43a00753..000000000000 --- a/dev-qt/qdoc/qdoc-5.7.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -QT5_MODULE="qttools" -inherit qt5-build - -DESCRIPTION="Qt documentation generator" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm ~hppa ppc ppc64 x86" -fi - -IUSE="" - -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtxml-${PV} -" -RDEPEND="${DEPEND}" - -QT5_TARGET_SUBDIRS=( - src/qdoc -) -- cgit v1.2.3