[packages/qt5-qtbase] borrow debian patch for default include directories in qdoc
atler
atler at pld-linux.org
Fri Jun 21 21:21:41 CEST 2019
commit 3be8629a97c09815168c77bac56bc3af271ac986
Author: Jan Palus <atler at pld-linux.org>
Date: Fri Jun 21 21:19:24 2019 +0200
borrow debian patch for default include directories in qdoc
attempt to fix doc differences between x32 and other archs
qdoc_default_incdirs.diff | 19 +++++++++++++++++++
qt5-qtbase.spec | 2 ++
2 files changed, 21 insertions(+)
---
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index e6aa8ea..f2cce62 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -75,6 +75,7 @@ Source0: http://download.qt.io/official_releases/qt/5.13/%{version}/submodules/%
Source1: http://download.qt.io/official_releases/qt/5.13/%{version}/submodules/qttranslations-everywhere-src-%{version}.tar.xz
# Source1-md5: 071888e332858a1dfd733e2d264cb284
Patch0: %{name}-system_cacerts.patch
+Patch1: qdoc_default_incdirs.diff
URL: http://www.qt.io/
%{?with_directfb:BuildRequires: DirectFB-devel}
BuildRequires: EGL-devel
@@ -1175,6 +1176,7 @@ Generator plików makefile dla aplikacji Qt5.
%prep
%setup -q -n %{orgname}-everywhere-src-%{version} %{?with_qm:-a1}
%patch0 -p1
+%patch1 -p1
%{__sed} -i -e 's,usr/X11R6/,usr/,g' mkspecs/linux-g++-64/qmake.conf
diff --git a/qdoc_default_incdirs.diff b/qdoc_default_incdirs.diff
new file mode 100644
index 0000000..afab35e
--- /dev/null
+++ b/qdoc_default_incdirs.diff
@@ -0,0 +1,19 @@
+Description: pass default include directories to qdoc
+Author: Martin Smith <martin.smith at qt.io>
+Bug: https://bugs.debian.org/908328
+Forwarded: no
+Last-Update: 2018-10-29
+
+--- a/mkspecs/features/qt_docs.prf
++++ b/mkspecs/features/qt_docs.prf
+@@ -78,6 +78,10 @@ doc_command = $$QDOC $$QMAKE_DOCS
+ prepare_docs {
+ prepare_docs.commands += $$doc_command -prepare $$PREP_DOC_INDEXES -no-link-errors $(INCPATH)
+ generate_docs.commands += $$doc_command -generate $$DOC_INDEXES $(INCPATH)
++ for (incdir, QMAKE_DEFAULT_INCDIRS) {
++ prepare_docs.commands += -I$$shell_quote($$incdir)
++ generate_docs.commands += -I$$shell_quote($$incdir)
++ }
+ prepare_docs.depends += qtattributionsscanner
+ } else {
+ html_docs.commands += $$doc_command $$DOC_INDEXES $(INCPATH)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtbase.git/commitdiff/3be8629a97c09815168c77bac56bc3af271ac986
More information about the pld-cvs-commit
mailing list