From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9D6C1139694 for ; Sat, 24 Jun 2017 15:13:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7680E0D3C; Sat, 24 Jun 2017 15:13:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C2EB0E0D3C for ; Sat, 24 Jun 2017 15:13:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 97E0D341821 for ; Sat, 24 Jun 2017 15:13:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30EE5748A for ; Sat, 24 Jun 2017 15:13:10 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1498317167.558ddc978497aae5aa47721176f8b83b1234046c.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 558ddc978497aae5aa47721176f8b83b1234046c X-VCS-Branch: master Date: Sat, 24 Jun 2017 15:13:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e7b690c7-4419-4c97-8648-a20a9897ce0b X-Archives-Hash: 6f7b90974c2b3c21a803e2df0e1cdda7 commit: 558ddc978497aae5aa47721176f8b83b1234046c Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jun 16 21:53:10 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 24 15:12:47 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=558ddc97 kde5.eclass: Add KDE_QTHELP for QCH file support Do not compress .qch and .tags files. See also: https://mail.kde.org/pipermail/distributions/2017-June/000227.html eclass/kde5.eclass | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 3b6810526a..e5e5fb2400 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -79,6 +79,14 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_ # Defaults to "doc". Otherwise, use alternative KDE handbook path. : ${KDE_DOC_DIR:=doc} +# @ECLASS-VARIABLE: KDE_QTHELP +# @DESCRIPTION: +# If set to "false", do nothing. +# Otherwise, add "+qthelp" to IUSE, add the appropriate dependency, and +# generate and install Qt compressed help files. +# If set to "optional", config with -DBUILD_QCH=ON when USE=qthelp. +: ${KDE_QTHELP:=false} + # @ECLASS-VARIABLE: KDE_TEST # @DESCRIPTION: # If set to "false", do nothing. @@ -144,6 +152,8 @@ SLOT=5 if [[ ${CATEGORY} = kde-frameworks ]]; then KDE_SUBSLOT=true + [[ $(get_version_component_range 2) -ge 36 || ${KDE_BUILD_TYPE} = live ]] && \ + KDE_QTHELP=true fi case ${KDE_SUBSLOT} in @@ -223,6 +233,18 @@ case ${KDE_HANDBOOK} in ;; esac +case ${KDE_QTHELP} in + false) ;; + *) + IUSE+=" +qthelp" + COMMONDEPEND+=" qthelp? ( $(add_qt_dep qt-docs) )" + DEPEND+=" qthelp? ( + $(add_qt_dep qthelp) + >=app-doc/doxygen-1.8.13-r1 + )" + ;; +esac + case ${KDE_TEST} in false) ;; *) @@ -647,6 +669,10 @@ kde5_src_configure() { cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON ) fi + if use_if_iuse qthelp ; then + cmakeargs+=( -DBUILD_QCH=ON ) + fi + # install mkspecs in the same directory as qt stuff cmakeargs+=(-DKDE_INSTALL_USE_QT_SYS_PATHS=ON) @@ -704,6 +730,14 @@ kde5_src_install() { cmake-utils_src_install + # We don't want QCH and tags files to be compressed, because then + # cmake can't find the tags and qthelp viewers can't find the docs + local p=$(best_version dev-qt/qtcore:5) + local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev) + if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then + docompress -x /usr/share/doc/qt-${pv} + fi + # We don't want /usr/share/doc/HTML to be compressed, # because then khelpcenter can't find the docs if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then