diff --git a/Fix-qch-build.patch b/Fix-qch-build.patch new file mode 100644 index 0000000..71fd65e --- /dev/null +++ b/Fix-qch-build.patch @@ -0,0 +1,33 @@ +From 573e92315a4bc14230ba5bb930bad36035a67671 Mon Sep 17 00:00:00 2001 +From: Peter Feichtinger +Date: Sat, 2 Feb 2019 17:03:54 +0100 +Subject: [PATCH] Fix QCH build + +This changes the file extension of the qhelpgenerator input file to use +a .qhp extension instead of .xml. This is required because an update to +qhelpgenerator now rejects the .xml extension. +--- + Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 88fb9c9..59904f7 100644 +--- a/Makefile ++++ b/Makefile +@@ -171,13 +171,13 @@ output/cppreference-doc-en-cpp.devhelp2: \ + #build the .qch (QT help) file + output/cppreference-doc-en-cpp.qch: output/qch-help-project-cpp.xml + #qhelpgenerator only works if the project file is in the same directory as the documentation +- cp "output/qch-help-project-cpp.xml" "output/reference/qch.xml" ++ cp "output/qch-help-project-cpp.xml" "output/reference/qch.qhp" + + pushd "output/reference" > /dev/null; \ +- $(qhelpgenerator) "qch.xml" -o "../cppreference-doc-en-cpp.qch"; \ ++ $(qhelpgenerator) "qch.qhp" -o "../cppreference-doc-en-cpp.qch"; \ + popd > /dev/null + +- rm -f "output/reference/qch.xml" ++ rm -f "output/reference/qch.qhp" + + output/qch-help-project-cpp.xml: output/cppreference-doc-en-cpp.devhelp2 + #build the file list diff --git a/cppreference-doc.changes b/cppreference-doc.changes index 481bf75..14bfe9f 100644 --- a/cppreference-doc.changes +++ b/cppreference-doc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 9 12:53:45 UTC 2019 - Christophe Giboudeaux + +- Add Fix-qch-build.patch to fix the qch generation. + ------------------------------------------------------------------- Wed Mar 28 08:40:30 UTC 2018 - badshah400@gmail.com diff --git a/cppreference-doc.spec b/cppreference-doc.spec index ee4934a..dc72489 100644 --- a/cppreference-doc.spec +++ b/cppreference-doc.spec @@ -1,7 +1,7 @@ # # spec file for package cppreference-doc # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,11 +23,12 @@ Summary: Cppreference documentation for offline reading License: CC-BY-SA-3.0 Group: Documentation/HTML Url: http://en.cppreference.com/w/ -Source: http://upload.cppreference.com/mwiki/images/c/cb/cppreference-doc-20180311.tar.xz -BuildRequires: python3-lxml -BuildRequires: libqt5-qttools +Source: http://upload.cppreference.com/mwiki/images/c/cb/cppreference-doc-20180311.tar.xz +Patch0: Fix-qch-build.patch BuildRequires: devhelp -BuildRequires: fdupes +BuildRequires: fdupes +BuildRequires: libqt5-qttools +BuildRequires: python3-lxml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,7 +37,6 @@ Cppreference is a complete online reference for the C and C++ languages and stan %package devhelp Summary: Cppreference documentation for offline reading - devhelp version -License: CC-BY-SA-3.0 Group: Documentation/Other Requires: %{name} = %{version} @@ -48,7 +48,6 @@ This package provides the documentation in the devhelp format. %package qhelp Summary: Cppreference documentation for offline reading - qhelp version -License: CC-BY-SA-3.0 Group: Documentation/Other Requires: %{name} = %{version} @@ -59,6 +58,7 @@ This package provides the documentation in the qhelp format. %prep %setup -q +%patch0 -p1 %build make %{?_smp_mflags} qhelpgenerator=qhelpgenerator-qt5 @@ -85,4 +85,3 @@ rm %{buildroot}%{_datadir}/devhelp/books/cppreference-doxygen*.xml %{_datadir}/cppreference/doc/qch/ %changelog -