[arch-commits] Commit in qt6-doc/kde-unstable (PKGBUILD qt6-doc-bindir.patch)
Antonio Rojas
arojas at archlinux.org
Thu Apr 29 11:46:10 UTC 2021
Date: Thursday, April 29, 2021 @ 11:46:10
Author: arojas
Revision: 413999
Use upstream patch
Modified:
qt6-doc/kde-unstable/PKGBUILD
Deleted:
qt6-doc/kde-unstable/qt6-doc-bindir.patch
----------------------+
PKGBUILD | 5 +++--
qt6-doc-bindir.patch | 18 ------------------
2 files changed, 3 insertions(+), 20 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-04-29 11:00:03 UTC (rev 413998)
+++ PKGBUILD 2021-04-29 11:46:10 UTC (rev 413999)
@@ -15,9 +15,9 @@
groups=(qt6)
_pkgfn="qt-everywhere-src-$_qtver"
source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/single/$_pkgfn.tar.xz
- qt6-doc-bindir.patch)
+ qt6-doc-bindir.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=582fdf06)
sha256sums=('80dae2b7ca95c95183a07274067386012016fd22b5cbc6ce320b82b3275f8a1f'
- '60eebdf88559fefdb2b7c65b5f4ec091942aa1ffa371bedb4080545383b46109')
+ '7ab018729ae933f7f4ba0a4783f8f66277c681aa9dd7657ecdf011120b56bda1')
prepare() {
patch -d $_pkgfn/qtbase -p1 -i ../../qt6-doc-bindir.patch # Use installed tools
@@ -26,6 +26,7 @@
build() {
cmake -B build -S $_pkgfn \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DQT_HOST_PATH=/usr \
-DINSTALL_BINDIR=lib/qt6/bin \
-DINSTALL_DOCDIR=share/doc/qt6 \
-DINSTALL_ARCHDATADIR=lib/qt6 \
Deleted: qt6-doc-bindir.patch
===================================================================
--- qt6-doc-bindir.patch 2021-04-29 11:00:03 UTC (rev 413998)
+++ qt6-doc-bindir.patch 2021-04-29 11:46:10 UTC (rev 413999)
@@ -1,18 +0,0 @@
-diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake
-index 8e4bd28918..963114e1ec 100644
---- a/cmake/QtDocsHelpers.cmake
-+++ b/cmake/QtDocsHelpers.cmake
-@@ -31,12 +31,7 @@ function(qt_internal_add_docs)
- return()
- endif()
-
-- if(QT_SUPERBUILD)
-- set(doc_tools_dir "${QtBase_BINARY_DIR}/${INSTALL_BINDIR}")
-- else()
-- set(doc_tools_dir "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_BINDIR}")
-- endif()
--
-+ set(doc_tools_dir "/usr/lib/qt6/bin")
- set(qdoc_bin "${doc_tools_dir}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
- set(qtattributionsscanner_bin "${doc_tools_dir}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}")
- set(qhelpgenerator_bin "${doc_tools_dir}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
More information about the arch-commits
mailing list