Mailinglist Archive: opensuse-commit (1903 mails)

< Previous Next >
commit cppreference-doc for openSUSE:Factory
Hello community,

here is the log from the commit of package cppreference-doc for
openSUSE:Factory checked in at 2019-04-17 10:09:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cppreference-doc (Old)
and /work/SRC/openSUSE:Factory/.cppreference-doc.new.17052 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "cppreference-doc"

Wed Apr 17 10:09:34 2019 rev:2 rq:694764 version:20180311

Changes:
--------
--- /work/SRC/openSUSE:Factory/cppreference-doc/cppreference-doc.changes
2018-05-15 10:30:57.425576099 +0200
+++
/work/SRC/openSUSE:Factory/.cppreference-doc.new.17052/cppreference-doc.changes
2019-04-17 10:09:49.170879007 +0200
@@ -1,0 +2,5 @@
+Tue Apr 9 12:53:45 UTC 2019 - Christophe Giboudeaux <christophe@xxxxxxx>
+
+- Add Fix-qch-build.patch to fix the qch generation.
+
+-------------------------------------------------------------------

New:
----
Fix-qch-build.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cppreference-doc.spec ++++++
--- /var/tmp/diff_new_pack.cmV85s/_old 2019-04-17 10:09:49.994879884 +0200
+++ /var/tmp/diff_new_pack.cmV85s/_new 2019-04-17 10:09:49.998879889 +0200
@@ -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/
#


@@ -24,10 +24,11 @@
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
+Patch0: Fix-qch-build.patch
BuildRequires: devhelp
BuildRequires: fdupes
+BuildRequires: libqt5-qttools
+BuildRequires: python3-lxml
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build

@@ -36,7 +37,6 @@

%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 @@

%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 @@

%prep
%setup -q
+%patch0 -p1

%build
make %{?_smp_mflags} qhelpgenerator=qhelpgenerator-qt5

++++++ Fix-qch-build.patch ++++++
From 573e92315a4bc14230ba5bb930bad36035a67671 Mon Sep 17 00:00:00 2001
From: Peter Feichtinger <shippo@xxxxxx>
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

< Previous Next >
This Thread
  • No further messages