Compare commits
No commits in common. "c8s" and "c9s" have entirely different histories.
|
|
@ -1,2 +1,2 @@
|
|||
8f999c95d1e42d725b7cd55bef0ed2a841eb0b34 SOURCES/doxygen-1.8.14.src.tar.gz
|
||||
94bc89bf18be85776e9aa8951713d5de211ed0d8 SOURCES/doxywizard.png
|
||||
cc4d42667e9a4e52146e1853274c53df41b58b52 doxywizard-icons.tar.xz
|
||||
30f368bbc99ee94a90202d5efb7b19fead0044cf doxygen-1.9.1.src.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,2 +1,55 @@
|
|||
SOURCES/doxygen-1.8.14.src.tar.gz
|
||||
SOURCES/doxywizard.png
|
||||
doxygen-1.3.8.src.tar.gz
|
||||
doxygen-1.3.9.src.tar.gz
|
||||
doxygen-1.3.9.1.src.tar.gz
|
||||
doxygen-1.4.1.src.tar.gz
|
||||
doxygen-1.4.2.src.tar.gz
|
||||
doxygen-1.4.3.src.tar.gz
|
||||
doxygen-1.4.4.src.tar.gz
|
||||
doxygen-1.4.5.src.tar.gz
|
||||
doxygen-1.4.6.src.tar.gz
|
||||
doxygen-1.4.7.src.tar.gz
|
||||
doxygen-1.5.2.src.tar.gz
|
||||
doxygen-1.5.3.src.tar.gz
|
||||
doxygen-1.5.4.src.tar.gz
|
||||
doxygen-1.5.5.src.tar.gz
|
||||
doxygen-1.5.6.src.tar.gz
|
||||
doxygen-1.5.7.1.src.tar.gz
|
||||
doxygen-1.5.8.src.tar.gz
|
||||
doxygen-1.5.9.src.tar.gz
|
||||
doxygen-1.6.0.src.tar.gz
|
||||
doxygen-1.6.1.src.tar.gz
|
||||
doxygen-1.6.2.src.tar.gz
|
||||
doxygen-1.6.2-20100208.tar.gz
|
||||
doxygen-1.7.1.src.tar.gz
|
||||
/doxygen-1.7.2.src.tar.gz
|
||||
/doxygen-1.7.3.src.tar.gz
|
||||
/doxygen-1.7.4.src.tar.gz
|
||||
/doxygen-1.7.5.src.tar.gz
|
||||
/doxygen-1.7.5.1.src.tar.gz
|
||||
/doxygen-1.7.6.src.tar.gz
|
||||
/doxygen-1.7.6.1.src.tar.gz
|
||||
/doxywizard.png
|
||||
/doxygen-1.8.0.src.tar.gz
|
||||
/doxygen-1.8.1.src.tar.gz
|
||||
/doxygen-1.8.1.1.src.tar.gz
|
||||
/doxygen-1.8.1.2.src.tar.gz
|
||||
/doxygen-1.8.2.src.tar.gz
|
||||
/doxygen-1.8.3.src.tar.gz
|
||||
/doxygen-1.8.3.1.src.tar.gz
|
||||
/doxygen-1.8.4.src.tar.gz
|
||||
/doxygen-1.8.5.src.tar.gz
|
||||
/doxygen-1.8.6.src.tar.gz
|
||||
/doxygen-1.8.7.src.tar.gz
|
||||
/doxygen-1.8.8.src.tar.gz
|
||||
/doxygen-1.8.9.1.src.tar.gz
|
||||
/doxygen-1.8.10.src.tar.gz
|
||||
/doxygen-1.8.11.src.tar.gz
|
||||
/doxygen-1.8.12.src.tar.gz
|
||||
/doxygen-1.8.13.src.tar.gz
|
||||
/doxygen-1.8.14.src.tar.gz
|
||||
/doxygen-1.8.15.src.tar.gz
|
||||
/doxygen-1.8.16.src.tar.gz
|
||||
/doxygen-1.8.17.src.tar.gz
|
||||
/doxygen-1.8.18.src.tar.gz
|
||||
/doxywizard-icons.tar.xz
|
||||
/doxygen-1.9.1.src.tar.gz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
diff -up doxygen/src/configimpl.l.orig doxygen/src/configimpl.l
|
||||
--- doxygen/src/configimpl.l.orig 2021-01-19 17:25:00.933789247 +0100
|
||||
+++ doxygen/src/configimpl.l 2021-01-19 17:26:09.704744240 +0100
|
||||
@@ -1175,8 +1175,7 @@ static void substEnvVarsInStrList(String
|
||||
for (const auto &s : sl)
|
||||
{
|
||||
QCString result = s.c_str();
|
||||
- // an argument with quotes will have an extra space at the end, so wasQuoted will be TRUE.
|
||||
- bool wasQuoted = (result.find(' ')!=-1) || (result.find('\t')!=-1);
|
||||
+ bool wasQuoted = (result.find(' ')!=-1) || (result.find('\t')!=-1) || (result.find('"')!=-1);
|
||||
// here we strip the quote again
|
||||
substEnvVarsInString(result);
|
||||
|
||||
@@ -1229,7 +1228,7 @@ static void substEnvVarsInStrList(String
|
||||
}
|
||||
if (p!=l) // add the leftover as a string
|
||||
{
|
||||
- results.push_back(result.right(l-p).data());
|
||||
+ results.push_back(result.right(l-p).str());
|
||||
}
|
||||
}
|
||||
else // just goto the next element in the list
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
commit 3b15963316b59cd1af3468a43535d90343916ffb
|
||||
Author: Dimitri van Heesch <doxygen@gmail.com>
|
||||
Date: Mon Jan 18 19:59:16 2021 +0100
|
||||
|
||||
issue #8343: doxygen-1.9.1 crashes when parsing config file
|
||||
|
||||
diff --git a/src/configimpl.l b/src/configimpl.l
|
||||
index 7f73ec01..56a2e108 100644
|
||||
--- a/src/configimpl.l
|
||||
+++ b/src/configimpl.l
|
||||
@@ -1210,7 +1210,7 @@ static void substEnvVarsInStrList(StringVector &sl)
|
||||
c=result.at(i);
|
||||
if (c=='"') // end quote
|
||||
{
|
||||
- results.push_back(result.mid(p,i-p).data());
|
||||
+ results.push_back(result.mid(p,i-p).str());
|
||||
p=i+1;
|
||||
break;
|
||||
}
|
||||
@@ -1222,7 +1222,7 @@ static void substEnvVarsInStrList(StringVector &sl)
|
||||
}
|
||||
else if (c==' ' || c=='\t') // separator
|
||||
{
|
||||
- if (i>p) results.push_back(result.mid(p,i-p).data());
|
||||
+ if (i>p) results.push_back(result.mid(p,i-p).str());
|
||||
p=i+1;
|
||||
}
|
||||
}
|
||||
@@ -1234,7 +1234,7 @@ static void substEnvVarsInStrList(StringVector &sl)
|
||||
}
|
||||
else // just goto the next element in the list
|
||||
{
|
||||
- if (!result.isEmpty()) results.push_back(result.data());
|
||||
+ if (!result.isEmpty()) results.push_back(result.str());
|
||||
}
|
||||
}
|
||||
sl = results;
|
||||
@@ -1409,7 +1409,7 @@ static void cleanUpPaths(StringVector &str)
|
||||
QFileInfo fi(path.c_str());
|
||||
if (fi.exists() && fi.isDir())
|
||||
{
|
||||
- path = fi.absFilePath().utf8().data();
|
||||
+ path = fi.absFilePath().utf8().str();
|
||||
if (path[path.size()-1]!='/') path+='/';
|
||||
}
|
||||
}
|
||||
@@ -1545,7 +1545,7 @@ void Config::checkAndCorrect()
|
||||
QString p = QDir::currentDirPath();
|
||||
if (p.at(p.length()-1)!='/')
|
||||
p.append('/');
|
||||
- stripFromPath.push_back(p.utf8().data());
|
||||
+ stripFromPath.push_back(p.utf8().str());
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1882,7 +1882,7 @@ void Config::checkAndCorrect()
|
||||
if (inputSources.empty())
|
||||
{
|
||||
// use current dir as the default
|
||||
- inputSources.push_back(QDir::currentDirPath().utf8().data());
|
||||
+ inputSources.push_back(QDir::currentDirPath().utf8().str());
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
diff -up doxygen-1.9.1/src/context.cpp.me doxygen-1.9.1/src/context.cpp
|
||||
--- doxygen-1.9.1/src/context.cpp.me 2021-02-10 10:56:44.575251899 +0100
|
||||
+++ doxygen-1.9.1/src/context.cpp 2021-02-10 10:57:54.522809720 +0100
|
||||
@@ -4062,11 +4062,11 @@ class MemberContext::Private : public De
|
||||
s_inst.addProperty("nameWithContextFor", &Private::nameWithContextFor);
|
||||
init=TRUE;
|
||||
}
|
||||
- if (md && !md->cookie()) { md->setCookie(new MemberContext::Private::Cachable(md)); }
|
||||
+ if (!md->cookie()) { md->setCookie(new MemberContext::Private::Cachable(md)); }
|
||||
|
||||
Cachable &cache = getCache();
|
||||
cache.propertyAttrs.reset(TemplateList::alloc());
|
||||
- if (md && md->isProperty())
|
||||
+ if (md->isProperty())
|
||||
{
|
||||
if (md->isGettable()) cache.propertyAttrs->append("get");
|
||||
if (md->isPrivateGettable()) cache.propertyAttrs->append("private get");
|
||||
@@ -4076,7 +4076,7 @@ class MemberContext::Private : public De
|
||||
if (md->isProtectedSettable()) cache.propertyAttrs->append("protected set");
|
||||
}
|
||||
cache.eventAttrs.reset(TemplateList::alloc());
|
||||
- if (md && md->isEvent())
|
||||
+ if (md->isEvent())
|
||||
{
|
||||
if (md->isAddable()) cache.eventAttrs->append("add");
|
||||
if (md->isRemovable()) cache.eventAttrs->append("remove");
|
||||
diff -up doxygen-1.9.1/src/docparser.cpp.me doxygen-1.9.1/src/docparser.cpp
|
||||
--- doxygen-1.9.1/src/docparser.cpp.me 2021-02-10 10:58:11.491500540 +0100
|
||||
+++ doxygen-1.9.1/src/docparser.cpp 2021-02-10 11:00:35.905512597 +0100
|
||||
@@ -1524,7 +1524,7 @@ reparsetoken:
|
||||
{
|
||||
QCString scope;
|
||||
doctokenizerYYsetStateSetScope();
|
||||
- doctokenizerYYlex();
|
||||
+ (void)doctokenizerYYlex();
|
||||
scope = g_token->name;
|
||||
g_context = scope;
|
||||
//printf("Found scope='%s'\n",scope.data());
|
||||
diff -up doxygen-1.9.1/src/dotgroupcollaboration.cpp.me doxygen-1.9.1/src/dotgroupcollaboration.cpp
|
||||
--- doxygen-1.9.1/src/dotgroupcollaboration.cpp.me 2021-02-10 11:01:10.588530954 +0100
|
||||
+++ doxygen-1.9.1/src/dotgroupcollaboration.cpp 2021-02-10 11:02:54.216221350 +0100
|
||||
@@ -309,6 +309,7 @@ void DotGroupCollaboration::Edge::write(
|
||||
{
|
||||
if (first) first=FALSE; else t << "\\n";
|
||||
t << DotNode::convertLabel(link->label);
|
||||
+ count++;
|
||||
}
|
||||
if (count==maxLabels) t << "\\n...";
|
||||
t << "\"";
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
diff -up doxygen-1.9.1/src/docparser.cpp.me doxygen-1.9.1/src/docparser.cpp
|
||||
--- doxygen-1.9.1/src/docparser.cpp.me 2021-02-10 10:52:09.481086282 +0100
|
||||
+++ doxygen-1.9.1/src/docparser.cpp 2021-02-10 10:55:32.418781686 +0100
|
||||
@@ -951,7 +951,7 @@ static void handlePendingStyleCommands(D
|
||||
children.append(new DocStyleChange(parent,g_nodeStack.count(),sc->style(),sc->tagName(),FALSE));
|
||||
g_initialStyleStack.push(sc);
|
||||
g_styleStack.pop();
|
||||
- sc = g_styleStack.top();
|
||||
+ sc = !g_styleStack.isEmpty() ? g_styleStack.top() : 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,38 +1,91 @@
|
|||
%if 0%{?fedora}
|
||||
%global xapian_core_support ON
|
||||
%global clang_support ON
|
||||
%else
|
||||
%global xapian_core_support OFF
|
||||
%global clang_support OFF
|
||||
%endif
|
||||
|
||||
Summary: A documentation system for C/C++
|
||||
Name: doxygen
|
||||
Epoch: 1
|
||||
Version: 1.8.14
|
||||
Release: 12%{?dist}
|
||||
Version: 1.9.1
|
||||
Release: 11%{?dist}
|
||||
|
||||
# No version is specified.
|
||||
License: GPL+
|
||||
Url: http://www.stack.nl/~dimitri/doxygen/index.html
|
||||
Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
|
||||
Url: http://www.doxygen.nl
|
||||
Source0: https://doxygen.nl/files/%{name}-%{version}.src.tar.gz
|
||||
# this icon is part of kdesdk
|
||||
Source1: doxywizard.png
|
||||
Source2: doxywizard.desktop
|
||||
|
||||
Source1: doxywizard.desktop
|
||||
# these icons are part of doxygen and converted from doxywizard.ico
|
||||
Source2: doxywizard-icons.tar.xz
|
||||
# upstream patches
|
||||
Patch1: doxgen-1.9.1-crash-when-parsing-config-file.patch
|
||||
Patch2: doxgen-1.9.1-crash-when-parsing-config-file-part2.patch
|
||||
Patch3: doxygen-1.9.1-Coverity_issues.patch
|
||||
Patch4: doxygen-1.9.1-crash_in_docparser.patch
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: %{_bindir}/python3
|
||||
BuildRequires: gcc-c++ gcc
|
||||
BuildRequires: perl-interpreter
|
||||
%if ! 0%{?_module_build}
|
||||
BuildRequires: tex(dvips)
|
||||
BuildRequires: tex(latex)
|
||||
BuildRequires: tex(multirow.sty)
|
||||
# From doc/manual.sty
|
||||
BuildRequires: tex(helvet.sty)
|
||||
BuildRequires: tex(sectsty.sty)
|
||||
BuildRequires: tex(tocloft.sty)
|
||||
BuildRequires: tex(xtab.sty)
|
||||
BuildRequires: tex(import.sty)
|
||||
BuildRequires: tex(tabu.sty)
|
||||
BuildRequires: tex(appendix.sty)
|
||||
BuildRequires: tex(fontenc.sty)
|
||||
BuildRequires: tex(fancyhdr.sty)
|
||||
# From templates/latex/doxygen.sty
|
||||
BuildRequires: tex(alltt.sty)
|
||||
BuildRequires: tex(calc.sty)
|
||||
BuildRequires: tex(float.sty)
|
||||
BuildRequires: tex(verbatim.sty)
|
||||
BuildRequires: tex(xcolor.sty)
|
||||
BuildRequires: tex(fancyvrb.sty)
|
||||
BuildRequires: tex(tabularx.sty)
|
||||
BuildRequires: tex(multirow.sty)
|
||||
BuildRequires: tex(hanging.sty)
|
||||
BuildRequires: tex(ifpdf.sty)
|
||||
BuildRequires: tex(adjustbox.sty)
|
||||
BuildRequires: tex(amssymb.sty)
|
||||
BuildRequires: tex(stackengine.sty)
|
||||
BuildRequires: tex(ulem.sty)
|
||||
# From doc/doxygen_manual.tex
|
||||
BuildRequires: tex(ifthen.sty)
|
||||
BuildRequires: tex(array.sty)
|
||||
BuildRequires: tex(geometry.sty)
|
||||
BuildRequires: tex(makeidx.sty)
|
||||
BuildRequires: tex(natbib.sty)
|
||||
BuildRequires: tex(graphicx.sty)
|
||||
BuildRequires: tex(multicol.sty)
|
||||
BuildRequires: tex(float.sty)
|
||||
BuildRequires: tex(geometry.sty)
|
||||
BuildRequires: tex(listings.sty)
|
||||
BuildRequires: tex(color.sty)
|
||||
BuildRequires: tex(xcolor.sty)
|
||||
BuildRequires: tex(textcomp.sty)
|
||||
BuildRequires: tex(wasysym.sty)
|
||||
BuildRequires: tex(import.sty)
|
||||
BuildRequires: tex(appendix.sty)
|
||||
BuildRequires: tex(hyperref.sty)
|
||||
BuildRequires: tex(pspicture.sty)
|
||||
BuildRequires: tex(inputenc.sty)
|
||||
BuildRequires: tex(mathptmx.sty)
|
||||
BuildRequires: tex(courier.sty)
|
||||
# From src/latexgen.cpp
|
||||
BuildRequires: tex(fixltx2e.sty)
|
||||
BuildRequires: tex(ifxetex.sty)
|
||||
BuildRequires: tex(caption.sty)
|
||||
BuildRequires: tex(etoc.sty)
|
||||
# From src/util.cpp
|
||||
BuildRequires: tex(newunicodechar.sty)
|
||||
# From templates/latex/tabu_doxygen.sty
|
||||
BuildRequires: tex(varwidth.sty)
|
||||
BuildRequires: tex(xtab.sty)
|
||||
BuildRequires: tex(tabu.sty)
|
||||
BuildRequires: /usr/bin/epstopdf
|
||||
BuildRequires: texlive-epstopdf
|
||||
BuildRequires: ghostscript
|
||||
|
|
@ -45,11 +98,17 @@ BuildRequires: zlib-devel
|
|||
BuildRequires: flex
|
||||
BuildRequires: bison
|
||||
BuildRequires: cmake
|
||||
%if %{xapian_core_support} == "ON"
|
||||
BuildRequires: git
|
||||
%if "x%{?xapian_core_support}" == "xON"
|
||||
BuildRequires: xapian-core-devel
|
||||
BuildRequires: zlib-devel
|
||||
%endif
|
||||
%if "x%{?clang_support}" == "xON"
|
||||
BuildRequires: llvm-devel
|
||||
BuildRequires: clang-devel
|
||||
%endif
|
||||
Requires: perl-interpreter
|
||||
Requires: platform-python
|
||||
Requires: graphviz
|
||||
|
||||
%description
|
||||
Doxygen can generate an online class browser (in HTML) and/or a
|
||||
|
|
@ -72,15 +131,69 @@ are used by doxygen.
|
|||
Summary: Support for producing latex/pdf output from doxygen
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: tex(latex)
|
||||
Requires: tex(dvips)
|
||||
%if 0%{?fedora} > 17 || 0%{?rhel} > 6
|
||||
Requires: tex(multirow.sty)
|
||||
# From doc/manual.sty
|
||||
Requires: tex(helvet.sty)
|
||||
Requires: tex(sectsty.sty)
|
||||
Requires: tex(tocloft.sty)
|
||||
Requires: tex(xtab.sty)
|
||||
Requires: tex(fontenc.sty)
|
||||
Requires: tex(fancyhdr.sty)
|
||||
# From templates/latex/doxygen.sty
|
||||
Requires: tex(alltt.sty)
|
||||
Requires: tex(calc.sty)
|
||||
Requires: tex(float.sty)
|
||||
Requires: tex(verbatim.sty)
|
||||
Requires: tex(xcolor.sty)
|
||||
Requires: tex(fancyvrb.sty)
|
||||
Requires: tex(tabularx.sty)
|
||||
Requires: tex(multirow.sty)
|
||||
Requires: tex(hanging.sty)
|
||||
Requires: tex(ifpdf.sty)
|
||||
Requires: tex(adjustbox.sty)
|
||||
Requires: tex(amssymb.sty)
|
||||
Requires: tex(stackengine.sty)
|
||||
Requires: tex(ulem.sty)
|
||||
# From doc/doxygen_manual.tex
|
||||
Requires: tex(ifthen.sty)
|
||||
Requires: tex(array.sty)
|
||||
Requires: tex(geometry.sty)
|
||||
Requires: tex(makeidx.sty)
|
||||
Requires: tex(natbib.sty)
|
||||
Requires: tex(graphicx.sty)
|
||||
Requires: tex(multicol.sty)
|
||||
Requires: tex(float.sty)
|
||||
Requires: tex(geometry.sty)
|
||||
Requires: tex(listings.sty)
|
||||
Requires: tex(color.sty)
|
||||
Requires: tex(xcolor.sty)
|
||||
Requires: tex(textcomp.sty)
|
||||
Requires: tex(wasysym.sty)
|
||||
Requires: tex(import.sty)
|
||||
Requires: tex(tabu.sty)
|
||||
Requires: tex(appendix.sty)
|
||||
Requires: texlive-epstopdf-bin
|
||||
Requires: tex(hyperref.sty)
|
||||
Requires: tex(pspicture.sty)
|
||||
Requires: tex(inputenc.sty)
|
||||
Requires: tex(mathptmx.sty)
|
||||
Requires: tex(courier.sty)
|
||||
# From src/latexgen.cpp
|
||||
Requires: tex(fixltx2e.sty)
|
||||
Requires: tex(ifxetex.sty)
|
||||
Requires: tex(caption.sty)
|
||||
Requires: tex(etoc.sty)
|
||||
# From src/util.cpp
|
||||
Requires: tex(newunicodechar.sty)
|
||||
# From templates/latex/tabu_doxygen.sty
|
||||
Requires: tex(varwidth.sty)
|
||||
# I'm 99% sure this isn't needed anymore since
|
||||
# doxygen has a local fork of tabu... but it doesn't seem to be hurting anything.
|
||||
Requires: tex(tabu.sty)
|
||||
# There also does not seem to be any references to xtab in the code... but eh.
|
||||
Requires: tex(xtab.sty)
|
||||
# Explicitly called binaries
|
||||
Requires: texlive-bibtex
|
||||
Requires: texlive-makeindex
|
||||
Requires: texlive-epstopdf
|
||||
%endif
|
||||
|
||||
%description latex
|
||||
|
|
@ -89,7 +202,7 @@ Requires: texlive-epstopdf-bin
|
|||
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%autosetup -p1 -a2
|
||||
|
||||
# convert into utf-8
|
||||
iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new
|
||||
|
|
@ -98,11 +211,10 @@ mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO
|
|||
|
||||
|
||||
%build
|
||||
|
||||
mkdir -p %{_target_platform}
|
||||
pushd %{_target_platform}
|
||||
%if ! 0%{?_module_build}
|
||||
%cmake \
|
||||
-DPYTHON_EXECUTABLE=%{_bindir}/python3 \
|
||||
-Duse_libclang=%{clang_support} \
|
||||
-Dbuild_doc=OFF \
|
||||
-Dbuild_wizard=ON \
|
||||
-Dbuild_xmlparser=ON \
|
||||
|
|
@ -110,9 +222,10 @@ pushd %{_target_platform}
|
|||
-DMAN_INSTALL_DIR=%{_mandir}/man1 \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
|
||||
-DBUILD_SHARED_LIBS=OFF \
|
||||
..
|
||||
%else
|
||||
%cmake \
|
||||
-DPYTHON_EXECUTABLE=%{_bindir}/python3 \
|
||||
-Duse_libclang=%{clang_support} \
|
||||
-Dbuild_doc=OFF \
|
||||
-Dbuild_wizard=OFF \
|
||||
-Dbuild_xmlparser=ON \
|
||||
|
|
@ -120,16 +233,20 @@ pushd %{_target_platform}
|
|||
-DMAN_INSTALL_DIR=%{_mandir}/man1 \
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
|
||||
-DBUILD_SHARED_LIBS=OFF \
|
||||
..
|
||||
%endif
|
||||
popd
|
||||
|
||||
make %{?_smp_mflags} -C %{_target_platform}
|
||||
%cmake_build %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot} -C %{_target_platform}
|
||||
%cmake_install
|
||||
|
||||
install -m644 -p -D %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/doxywizard.png
|
||||
# install icons
|
||||
icondir=%{buildroot}%{_datadir}/icons/hicolor
|
||||
mkdir -m755 -p $icondir/{16x16,32x32,48x48,128x128}/apps
|
||||
install -m644 -p -D doxywizard-6.png $icondir/16x16/apps/doxywizard.png
|
||||
install -m644 -p -D doxywizard-5.png $icondir/32x32/apps/doxywizard.png
|
||||
install -m644 -p -D doxywizard-4.png $icondir/48x48/apps/doxywizard.png
|
||||
install -m644 -p -D doxywizard-3.png $icondir/128x128/apps/doxywizard.png
|
||||
|
||||
# install man pages
|
||||
mkdir -p %{buildroot}/%{_mandir}/man1
|
||||
|
|
@ -138,7 +255,7 @@ cp doc/*.1 %{buildroot}/%{_mandir}/man1/
|
|||
rm -f %{buildroot}/%{_mandir}/man1/doxywizard.1*
|
||||
%endif
|
||||
|
||||
%if %{xapian_core_support} == "OFF"
|
||||
%if "x%{?xapian_core_support}" == "xOFF"
|
||||
rm -f %{buildroot}/%{_mandir}/man1/doxyindexer.1* %{buildroot}/%{_mandir}/man1/doxysearch.1*
|
||||
%endif
|
||||
|
||||
|
|
@ -146,21 +263,24 @@ rm -f %{buildroot}/%{_mandir}/man1/doxyindexer.1* %{buildroot}/%{_mandir}/man1/d
|
|||
rm -rf %{buildroot}/%{_docdir}/packages
|
||||
|
||||
%if ! 0%{?_module_build}
|
||||
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
|
||||
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
|
||||
%endif
|
||||
|
||||
%check
|
||||
%ctest
|
||||
|
||||
%files
|
||||
%doc LANGUAGE.HOWTO README.md
|
||||
%license LICENSE
|
||||
%if ! 0%{?_module_build}
|
||||
%if %{xapian_core_support} == "ON"
|
||||
%if "x%{?xapian_core_support}" == "xON"
|
||||
%{_bindir}/doxyindexer
|
||||
%{_bindir}/doxysearch*
|
||||
%endif
|
||||
%endif
|
||||
%{_bindir}/doxygen
|
||||
%{_mandir}/man1/doxygen.1*
|
||||
%if %{xapian_core_support} == "ON"
|
||||
%if "x%{?xapian_core_support}" == "xON"
|
||||
%{_mandir}/man1/doxyindexer.1*
|
||||
%{_mandir}/man1/doxysearch.1*
|
||||
%endif
|
||||
|
|
@ -170,7 +290,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
|
|||
%{_mandir}/man1/doxywizard*
|
||||
%{_datadir}/applications/doxywizard.desktop
|
||||
%endif
|
||||
%{_datadir}/pixmaps/doxywizard.png
|
||||
%{_datadir}/icons/hicolor/*/apps/doxywizard.png
|
||||
|
||||
%if ! 0%{?_module_build}
|
||||
%files latex
|
||||
|
|
@ -178,35 +298,148 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon May 13 2019 Than Ngo <than@redhat.com> - 1:1.8.14-12
|
||||
- Related: #1693329 - rpmdiff execshield failures, rebuilt against new annobin
|
||||
* Thu Aug 19 2021 Than Ngo <than@redhat.com> - 1:1.9.1-11
|
||||
- Resolves: #1990081, Enable LTO
|
||||
|
||||
* Thu May 09 2019 Than Ngo <than@redhat.com> - 1:1.8.14-11
|
||||
- Resolves: #1681518, gating tests
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.9.1-10
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Thu Apr 18 2019 Than Ngo <than@redhat.com> - 1:1.8.14-10
|
||||
- Resolves: #1693329, include license file
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.9.1-9
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Wed Oct 24 2018 Than Ngo <than@redhat.com> - 1:1.8.14-9
|
||||
- Related: #1633618, multilib regressions
|
||||
* Sun Mar 21 2021 Than Ngo <than@redhat.com> - 1:1.9.1-8
|
||||
- update source
|
||||
|
||||
* Tue Oct 09 2018 Than Ngo <than@redhat.com> - 1:1.8.14-8
|
||||
- Related: #1633618, rebuild
|
||||
* Mon Feb 22 2021 Than Ngo <than@redhat.com> - 1:1.9.1-7
|
||||
- drop test-suite
|
||||
|
||||
* Thu Sep 27 2018 Than Ngo <than@redhat.com> - 1:1.8.14-7
|
||||
- Resolves: #1633618, switch Requires from python3 to platform-python
|
||||
* Wed Feb 10 2021 Than Ngo <than@redhat.com> - 1:1.9.1-6
|
||||
- fixed Coverity issues
|
||||
- fixed crash in docparser
|
||||
|
||||
* Tue Aug 14 2018 Than Ngo <than@redhat.com> - 1:1.8.14-6
|
||||
- Resolves: #1615513 - doxygen FTBFS on rhel-8.0
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.9.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Jan 22 2021 Tom Stellard <tstellar@redhat.com> - 1:1.9.1-4
|
||||
- Rebuild for clang-11.1.0
|
||||
|
||||
* Tue Jan 19 2021 Than Ngo <than@redhat.com> - 1.9.1-3
|
||||
- fixed doxygen crashes when parsing config file part2
|
||||
|
||||
|
||||
* Tue Jan 19 2021 Than Ngo <than@redhat.com> - 1.9.1-2
|
||||
- fixed bz#1916161, crashes when parsing config file
|
||||
|
||||
* Mon Jan 11 2021 Than Ngo <than@redhat.com> - 1.9.1-1
|
||||
- update to 1.9.1
|
||||
|
||||
* Mon Jan 11 2021 Than Ngo <than@redhat.com> - 1.8.20-6
|
||||
- drop BR on ImageMagick in RHEL
|
||||
|
||||
* Tue Sep 29 2020 Than Ngo <than@redhat.com> - 1.8.20-5
|
||||
- backport upstream patches
|
||||
|
||||
* Thu Sep 17 2020 Than Ngo <than@redhat.com> - 1.8.20-4
|
||||
- Fix doxygen crash
|
||||
|
||||
* Tue Sep 15 2020 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:1.8.20-3
|
||||
- Fix doxygen producing different results on 32 and 64 bit architectures
|
||||
|
||||
* Fri Aug 28 2020 Scott Talbert <swt@techie.net> - 1:1.8.20-2
|
||||
- Fix issue with enums being defined in multiple files
|
||||
|
||||
* Tue Aug 25 2020 Than Ngo <than@redhat.com> - 1.8.20-1
|
||||
- update to 1.8.20
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.18-6
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.18-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 08 2020 Than Ngo <than@redhat.com> - 1.8.18-4
|
||||
- fixed link issue against new clang
|
||||
|
||||
* Thu Jun 18 2020 Than Ngo <than@redhat.com> - 1.8.18-3
|
||||
- fixed bz#1834591, enable clang support in fedora
|
||||
|
||||
* Wed May 27 2020 Tom Callaway <spot@fedoraproject.org> - 1.8.18-2
|
||||
- update tex dependencies
|
||||
|
||||
* Mon May 25 2020 Than Ngo <than@redhat.com> - 1.8.18-1
|
||||
- update to 1.8.18
|
||||
- backport fixes: buffer-overflow, memory leeks and md5 hash does not match for
|
||||
2 diffferent runs
|
||||
|
||||
* Thu Apr 02 2020 Björn Esser <besser82@fedoraproject.org> - 1:1.8.17-3
|
||||
- Fix string quoting for rpm >= 4.16
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.17-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Jan 14 2020 Than Ngo <than@redhat.com> - 1:1.8.17-1
|
||||
- resolves #1786799, update to 1.8.17
|
||||
|
||||
* Tue Dec 10 2019 Than Ngo <than@redhat.com> - 1:1.8.16-3
|
||||
- fixed covscan issues
|
||||
|
||||
* Mon Sep 16 2019 Than Ngo <than@redhat.com> - 1:1.8.16-2
|
||||
- backpored upstream patch to fix #7248
|
||||
|
||||
* Wed Sep 11 2019 Than Ngo <than@redhat.com> - 1:1.8.16-1
|
||||
- resolves #1742614, update to 1.8.16
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.15-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Mar 19 2019 Christoph Junghans <junghans@votca.org> - 1:1.8.15-9
|
||||
- Incl. xml fix for c++11
|
||||
|
||||
* Sat Mar 16 2019 Than Ngo <than@redhat.com> - 1:1.8.15-8
|
||||
- added license file
|
||||
|
||||
* Wed Mar 13 2019 Than Ngo <than@redhat.com> - 1:1.8.15-7
|
||||
- added Requirement on dot
|
||||
|
||||
* Thu Feb 14 2019 Than Ngo <than@redhat.com> - 1:1.8.15-6
|
||||
- fixed bz#1677000, fixed multilib issue
|
||||
|
||||
* Tue Feb 12 2019 Than Ngo <than@redhat.com> - 1:1.8.15-5
|
||||
- fixed bz#1675288, doxygen 1.8.15 segfault
|
||||
|
||||
* Fri Feb 08 2019 Than Ngo <than@redhat.com> - 1:1.8.15-4
|
||||
- fixed bz#673228 - operator whitespace changes cause wxpython FTBFS
|
||||
- fixed bz#1673230 - BR on tex(newunicodechar.sty) in doxygen-latex
|
||||
|
||||
* Tue Feb 05 2019 Than Ngo <than@redhat.com> - 1:1.8.15-3
|
||||
- fixed bz#1671999, backported from upstream
|
||||
- added test for XML output with an empty TOC
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.15-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Jan 28 2019 Than Ngo <than@redhat.com> - 1:1.8.15-1
|
||||
- update to 1.8.15
|
||||
|
||||
* Thu Dec 06 2018 Than Ngo <than@redhat.com> - 1:1.8.14-8
|
||||
- enable testing
|
||||
|
||||
* Mon Jul 23 2018 Than Ngo <than@redhat.com> - 1:1.8.14-7
|
||||
- add BR: gcc-c++ gcc
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.14-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Jun 27 2018 Than Ngo <than@redhat.com> - 1:1.8.14-5
|
||||
- support Qt5
|
||||
|
||||
* Wed Jun 20 2018 Than Ngo <than@redhat.com> - 1:1.8.14-4
|
||||
- added missing BR on adjustbox.sty for refman
|
||||
* Wed Jun 20 2018 Than Ngo <than@redhat.com> - 1.8.14-4
|
||||
- enble search addon on fedora
|
||||
|
||||
* Wed Jun 20 2018 Than Ngo <than@redhat.com> - 1:1.8.14-3
|
||||
- disable search addon
|
||||
* Mon Apr 30 2018 Than Ngo <than@redhat.com> - 1.8.14-3
|
||||
- added missing BR on adjustbox.sty for refman
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.14-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad
|
||||
SHA512 (doxygen-1.9.1.src.tar.gz) = 637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed
|
||||
Loading…
Reference in New Issue