Compare commits

..

53 commits

Author SHA1 Message Date
Than Ngo
3a587564e6 Update to 1.15.0 2025-11-13 17:10:42 +01:00
Fedora Release Engineering
baabc477de Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 19:29:57 +00:00
Than Ngo
9e9db0b11b Upstream fix for input buffer overflow 2025-06-25 10:14:00 +02:00
Yaakov Selkowitz
fea4e22773 Use bundled spdlog on RHEL, redux
The bundled spdlog is not compatible with the latest system version of fmt,
so they need to be either both bundled or both system.
2025-05-28 13:28:40 -04:00
Than Ngo
c02d84c334 Enable clang support for el 2025-05-25 14:06:04 +02:00
Than Ngo
0663928765 - Fix rhbz#2368381, update to 1.14.0
- Enable clang support and system fmt
2025-05-25 13:12:16 +02:00
Yaakov Selkowitz
44c8077568 Use bundled spdlog on RHEL
A standalone spdlog is not included in RHEL.
2025-02-11 12:06:49 -05:00
Than Ngo
5693173212 - built with system sqlite3 and spdlog 2025-02-10 09:41:48 +01:00
Florian Weimer
2b7dbf5b1c Introduce js-doxygen subpackage, unbundling Javascript during RPM builds 2025-02-07 17:42:25 +01:00
Fedora Release Engineering
b6484646a6 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 16:10:58 +00:00
Than Ngo
612ed5a652 - Fix rhbz#2336720, Update to 1.13.2
- Fix rhbz#2336536, FTBFS in ignition-transport
2025-01-13 09:24:54 +01:00
Than Ngo
b91cd71427 Fix rhbz#2335266, Update to 1.13.1 2025-01-03 14:59:24 +01:00
Than Ngo
d393de7f5c Fix rhbz#2334703, Update to 1.13.0 2025-01-02 13:57:09 +01:00
Than Ngo
c247f1e2e6 Fix rhbz#2295788, Non-reproducible file names in doxygen output 2024-10-28 20:03:30 +01:00
Than Ngo
bbac1e173a Fix rhbz#x2322116, broken markdown links to anchor 2024-10-28 15:03:02 +01:00
Than Ngo
a16cfa0db7 Fix rhbz#x2322116, Broken markdown links to anchors 2024-10-28 15:02:36 +01:00
Than Ngo
ff81bd65cd update to 1.12.0 2024-08-07 21:43:15 +02:00
Fedora Release Engineering
4e9dbd36c5 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 21:20:15 +00:00
Than Ngo
fd2734b8b7 fixed rhbz#2292250, update license 2024-06-14 14:48:31 +02:00
Than Ngo
8ad7d026f1 removed workaround for debuginfo 2024-05-31 14:03:24 +02:00
Than Ngo
ae09f35df0 tempprary disable debuginfo as workaround for koji build issue - GenericError: srpm mismatch 2024-05-29 13:49:10 +02:00
Than Ngo
4257f74e84 fixed rhbz#2283362, fix buffer overflow 2024-05-29 10:24:50 +02:00
Than Ngo
4a5fce1e93 update to 1.11.0 2024-05-21 12:28:59 +02:00
Fedora Release Engineering
7a97161fb8 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 09:46:43 +00:00
Than Ngo
bad8353277 don't use clang to build doxygen as workaround for a bug in gcc-14 2024-01-19 12:09:39 +01:00
Than Ngo
9ce183ac6f removed doxygen-1.9.7-unicode-test.ptch, it's merged in upstream 2024-01-11 09:30:52 +01:00
Than Ngo
70d4609ddc bz#2255826, update to 1.10 2023-12-26 21:42:36 +01:00
Than Ngo
ad93326fec fix bz#2235035, update to 1.9.8 2023-09-11 20:24:17 +02:00
Fedora Release Engineering
f644dcbbed Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 17:50:28 +00:00
Than Ngo
2e8846fbc2 - disable build_wizard for eln
- fixed broken unicode test
2023-05-30 13:58:04 +02:00
Than Ngo
7382a0f9f7 upload source 2023-05-19 16:04:56 +02:00
Than Ngo
1c01074635 fix #2208417, rebase to 1.9.7 2023-05-19 15:55:46 +02:00
Than Ngo
cc385e03b0 replace obsolescent egrep with grep -E 2023-03-10 16:59:51 +01:00
Than Ngo
4c2570a288 migrated to SPDX license 2023-02-17 09:31:53 +01:00
Than Ngo
6f8058dfe7 rebuilt against ghostscript-10 2023-01-25 10:17:17 +01:00
Than Ngo
c3bee77416 fixed bz#2162170, add Require on texlive-wasy 2023-01-20 09:30:29 +01:00
Fedora Release Engineering
3f85f0ae60 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 01:44:56 +00:00
Than Ngo
f977bc6479 fixed bz#2161515 - doxygen FTBFS if _module_build is 1 2023-01-18 09:51:23 +01:00
Than Ngo
3f948a6a3b added doxywizard-icons.tar.xz back 2023-01-03 15:05:18 +01:00
Than Ngo
f1d9aad3d5 fixed bz#2156564, update to 1.9.6 2023-01-03 14:54:41 +01:00
Pete Walter
9067a3fa84 Rebuild for llvm 15 2022-09-18 15:47:34 +01:00
Than Ngo
8868712c8f update to 1.9.5 2022-09-09 11:01:32 +02:00
Than Ngo
eaf38ac359 Fixed #2113876, Failed to build LaTex output 2022-08-04 11:41:14 +02:00
Fedora Release Engineering
cd11c2f98d Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 00:52:32 +00:00
Than Ngo
225d187031 1.9.4 release 2022-05-06 12:07:09 +02:00
Than Ngo
da0ebbca9f dropped obsoletes patches 2022-02-17 17:28:40 +01:00
Than Ngo
afb87de38e update to 1.9.4 snapshot 2022-02-17 14:56:28 +01:00
Fedora Release Engineering
fef22c40ea - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 00:59:37 +00:00
Than Ngo
195466f02e revert 1.9.1, noarch package built differently on different architectures 2021-10-27 12:28:12 +02:00
Than Ngo
4095f4066e update 2021-10-27 10:36:59 +02:00
Tom Stellard
31148b2047 Rebuild for llvm-13.0.0 2021-10-07 23:28:03 +00:00
Mattias Ellert
5671b82de3 Use predictable and reproducible filenames (rhbz#2000138) 2021-09-13 16:43:50 +02:00
Than Ngo
79be305ff0 rebase to 1.9.2 2021-08-19 13:06:43 +02:00
9 changed files with 363 additions and 215 deletions

16
.gitignore vendored
View file

@ -53,3 +53,19 @@ doxygen-1.7.1.src.tar.gz
/doxygen-1.8.18.src.tar.gz
/doxywizard-icons.tar.xz
/doxygen-1.9.1.src.tar.gz
/doxygen-1.9.2.src.tar.gz
/doxygen-1.9.2-d882240f-git.src.tar.gz
/doxygen-e18f715eb55121a4219d00bc4d824cebf1fb504b.tar.gz
/doxygen-1.9.4.src.tar.gz
/doxygen-1.9.5.src.tar.gz
/doxygen-1.9.6.src.tar.gz
/doxygen-1.9.7.src.tar.gz
/doxygen-1.9.8.src.tar.gz
/doxygen-1.10.0.src.tar.gz
/doxygen-1.11.0.src.tar.gz
/doxygen-1.12.0.src.tar.gz
/doxygen-1.13.0.src.tar.gz
/doxygen-1.13.1.src.tar.gz
/doxygen-1.13.2.src.tar.gz
/doxygen-1.14.0.src.tar.gz
/doxygen-1.15.0.src.tar.gz

36
README.rpm-packaging Normal file
View file

@ -0,0 +1,36 @@
# Javascript asset handling for RPM packaging
RPM packages should unbundle Javascript assets during the RPM build
process. Currently, this process is not fully automated.
If Doxygen HTML documentation is installed, add
%{?doxygen_js_requires}
to the subpackage that contains the HTML documentation.
If HTML documentation is installed during the %install phase, invoke
%{doxygen_unbundle_buildroot}
towards the end of the %install section. It will process Javascript
files under %{_docdir} (/usr/share/doc). If another directory needs
to be processed, use an explicit directory argument:
%{doxygen_unbundle_buildroot /usr/share/example/doc}
The path is relative to %{buildroot} or $RPM_BUILD_ROOT.
If HTML documentation is not installed, but propagated into package
using %doc directives, it is necessary to invoke
%{doxygen_unbundle}
after running Doxygen (typically from the %build section). This
unbundles assets found under the current directory. A specific
directory can be processed by passing it as an argument:
%{doxygen_unbundle example/doc}
In this case, the path argument is relative to the current directory,
not the buildroot.

View file

@ -1,22 +0,0 @@
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

View file

@ -1,64 +0,0 @@
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
{

View file

@ -1,49 +0,0 @@
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 << "\"";

View file

@ -1,12 +0,0 @@
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;
}
}
}

69
doxygen-unbundler Normal file
View file

@ -0,0 +1,69 @@
#!/usr/bin/bash -e
# Replace Doxygen-generated Javascript files with symblic links.
set -o pipefail
jsdir="$1"
buildroot="$2"
subdir="$3"
if test -z "$jsdir" ; then
echo "error: Javascript directory argument required" 1>&2
exit 1
fi
js_files="$(echo "$jsdir"/doxygen/*.js)"
if test -z "$buildroot" ; then
# Only absolute links are possible because the final installation
# destination is unknown.
if test -z "$subdir"; then
subdir="."
fi
find "$subdir" -type f -name '*.js' \
| while read js_file; do
for js_file_ref in $js_files; do
if cmp -s "$js_file_ref" "$js_file"; then
ln -sf "$js_file_ref" "$js_file"
break
fi
done
done
else
# Create relative links.
cd "$buildroot"
abs_buildroot="$(readlink -f .)"
cd "./$subdir"
# Compute the number of ../ needed to reach the root directory.
prefix=""
while true; do
p="$(readlink -f "${prefix:-.}")"
if test "$p" = "$abs_buildroot"; then
break
elif test "$p" = "/"; then
echo "error: Could not find buildroot directory" 1>&2
exit 1
elif test -z "$prefix"; then
prefix=".."
else
prefix="../$prefix"
fi
done
# Create relative links.
find . -type f -name '*.js' -printf "%d %p\n" \
| while read depth js_file; do
for js_file_ref in $js_files; do
if cmp -s "$js_file_ref" "$js_file"; then
target_prefix="$prefix"
i=1
while test "$i" -lt "$depth"; do
target_prefix="../$target_prefix"
i=$(($i + 1))
done
ln -sf "$target_prefix$js_file_ref" "$js_file"
fi
done
done
fi

View file

@ -1,40 +1,43 @@
# doxygen is known not to work properly with LTO at this point. Some of the issues
# are being worked on upstream and disabling LTO should be re-evaluated as
# we update this change. Until such time...
# Disable LTO
%global _lto_cflags %{nil}
%if 0%{?fedora}
%global xapian_core_support ON
%global clang_support ON
%global build_wizard ON
%global system_spdlog ON
%global system_fmt ON
%else
%global xapian_core_support OFF
%global clang_support OFF
%global build_wizard OFF
%global system_spdlog OFF
%global system_fmt OFF
%endif
%global build_search %{xapian_core_support}
%global clang_support ON
%global system_sqlite3 ON
Summary: A documentation system for C/C++
Name: doxygen
Epoch: 1
Version: 1.9.1
Release: 12%{?dist}
Epoch: 2
Version: 1.15.0
Release: 1%{?dist}
# No version is specified.
License: GPL+
Url: http://www.doxygen.nl
Source0: https://doxygen.nl/files/%{name}-%{version}.src.tar.gz
License: GPL-2.0-or-later
Url: https://github.com/doxygen
Source0: https://www.doxygen.nl/files/%{name}-%{version}.src.tar.gz
# this icon is part of kdesdk
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
Source3: README.rpm-packaging
Source4: doxygen-unbundler
# upstream fixes
BuildRequires: %{_bindir}/python3
BuildRequires: gcc-c++ gcc
BuildRequires: perl-interpreter
BuildRequires: perl-interpreter, perl-open
BuildRequires: texlive-bibtex
BuildRequires: web-assets-devel
# Building an RPM package typically needs unbundling of Javascript assets.
Requires: (js-doxygen if redhat-rpm-config)
%if ! 0%{?_module_build}
BuildRequires: tex(dvips)
BuildRequires: tex(latex)
@ -98,21 +101,40 @@ BuildRequires: ghostscript
BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: graphviz
%else
BuildRequires: zlib-devel
%endif
BuildRequires: zlib-devel
BuildRequires: flex
BuildRequires: bison
BuildRequires: cmake
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
%else
BuildRequires: gcc-c++ gcc
%endif
%if "%{system_spdlog}" == "ON"
BuildRequires: spdlog-devel
%else
# SPDLOG_VER* defined in deps/spdlog/include/spdlog/version.h
Provides: bundled(spdlog) = 1.14.1
%endif
%if "%{system_sqlite3}" == "ON"
BuildRequires: sqlite-devel
%else
# SQLITE_VERSION defined in deps/sqlite3/sqlite3.h
Provides: bundled(sqlite) = 3.42.0
%endif
%if "%{system_fmt}" == "ON"
BuildRequires: fmt-devel
%else
# deps/fmt/README.md
Provides: bundled(fmt) = 10.2.1
%endif
Requires: perl-interpreter
Requires: graphviz
@ -123,21 +145,32 @@ documentation is extracted directly from the sources. Doxygen can
also be configured to extract the code structure from undocumented
source files.
%if ! 0%{?_module_build}
%package -n js-doxygen
Summary: Javascript files used by Doxygen
Requires: web-assets-filesystem
BuildArch: noarch
%description -n js-doxygen
Javascript files for use by locally installed Doxygen documentation.
%if "x%{build_wizard}" == "xON"
%package doxywizard
Summary: A GUI for creating and editing configuration files
Requires: %{name} = %{epoch}:%{version}-%{release}
BuildRequires: qt5-qtbase-devel
BuildRequires: qt6-qtbase-devel
BuildRequires: qt6-qtsvg-devel
%description doxywizard
Doxywizard is a GUI for creating and editing configuration files that
are used by doxygen.
%endif
%if ! 0%{?_module_build}
%package latex
Summary: Support for producing latex/pdf output from doxygen
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: tex(latex)
Requires: tex(dvips)
Requires: texlive-wasy
%if 0%{?fedora} > 17 || 0%{?rhel} > 6
# From doc/manual.sty
Requires: tex(helvet.sty)
@ -210,42 +243,35 @@ Requires: texlive-epstopdf
%prep
%autosetup -p1 -a2
# convert into utf-8
iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new
touch -r LANGUAGE.HOWTO LANGUAGE.HOWTO.new
mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO
cp %{SOURCE3} .
%build
%if ! 0%{?_module_build}
%cmake \
-DPYTHON_EXECUTABLE=%{_bindir}/python3 \
-Duse_libclang=%{clang_support} \
-Dbuild_doc=OFF \
-Dbuild_wizard=ON \
-Dbuild_xmlparser=ON \
-Dbuild_search=%{xapian_core_support} \
-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 \
-Dbuild_search=OFF \
-DMAN_INSTALL_DIR=%{_mandir}/man1 \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DBUILD_SHARED_LIBS=OFF \
%endif
-Dbuild_wizard=%{build_wizard} \
-DBUILD_SHARED_LIBS=OFF \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-Dbuild_search=%{build_search} \
-Duse_libclang=%{clang_support} \
-DMAN_INSTALL_DIR=%{_mandir}/man1 \
-Dbuild_doc=OFF \
-DPYTHON_EXECUTABLE=%{_bindir}/python3 \
-Dbuild_xmlparser=ON \
-Duse_sys_sqlite3=%{system_sqlite3} \
-Duse_sys_spdlog=%{system_spdlog} \
-Duse_sys_fmt=%{system_fmt}
%cmake_build %{?_smp_mflags}
%install
%cmake_install
# install man pages
mkdir -p %{buildroot}/%{_mandir}/man1
cp doc/*.1 %{buildroot}/%{_mandir}/man1/
%if "x%{build_wizard}" == "xOFF"
rm -f %{buildroot}/%{_mandir}/man1/doxywizard.1*
%else
# install icons
icondir=%{buildroot}%{_datadir}/icons/hicolor
mkdir -m755 -p $icondir/{16x16,32x32,48x48,128x128}/apps
@ -253,12 +279,7 @@ 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
cp doc/*.1 %{buildroot}/%{_mandir}/man1/
%if 0%{?_module_build}
rm -f %{buildroot}/%{_mandir}/man1/doxywizard.1*
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
%endif
%if "x%{?xapian_core_support}" == "xOFF"
@ -268,15 +289,25 @@ rm -f %{buildroot}/%{_mandir}/man1/doxyindexer.1* %{buildroot}/%{_mandir}/man1/d
# remove duplicate
rm -rf %{buildroot}/%{_docdir}/packages
%if ! 0%{?_module_build}
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
%endif
# Install the asset files.
install -m644 -D --target-directory=%{buildroot}%{_jsdir}/doxygen templates/html/*.js
# Generate the macros file. Expand version/release/%%_jsdir.
mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
cat > %{buildroot}%{_rpmconfigdir}/macros.d/macros.doxygen <<'EOF'
%%doxygen_js_requires() Requires: js-doxygen >= %{version}-%{release}
%%doxygen_unbundle_buildroot() %%{_rpmconfigdir}/redhat/doxygen-unbundler "%{_jsdir}" "%%{buildroot}" %%[ %%# == 0 ? "%%{_docdir}" : "%%1"]
%%doxygen_unbundle() %{_rpmconfigdir}/redhat/doxygen-unbundler "%{_jsdir}" "" %%*
EOF
# Install the unbundler script.
install -m755 -D --target-directory=%{buildroot}%{_rpmconfigdir}/redhat %{SOURCE4}
%check
%ctest
%files
%doc LANGUAGE.HOWTO README.md
%doc LANGUAGE.HOWTO README.md README.rpm-packaging
%license LICENSE
%if ! 0%{?_module_build}
%if "x%{?xapian_core_support}" == "xON"
@ -290,13 +321,18 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
%{_mandir}/man1/doxyindexer.1*
%{_mandir}/man1/doxysearch.1*
%endif
%if ! 0%{?_module_build}
%{_rpmconfigdir}/macros.d/macros.doxygen
%{_rpmconfigdir}/redhat/doxygen-unbundler
%if "x%{build_wizard}" == "xON"
%files doxywizard
%{_bindir}/doxywizard
%{_mandir}/man1/doxywizard*
%{_datadir}/applications/doxywizard.desktop
%endif
%{_datadir}/icons/hicolor/*/apps/doxywizard.png
%endif
%files -n js-doxygen
%{_jsdir}/doxygen/*
%if ! 0%{?_module_build}
%files latex
@ -304,9 +340,147 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
%endif
%changelog
* Tue Nov 09 2021 Tom Stellard <tstellar@redhat.com> - 1:1.9.1-12
* Thu Nov 13 2025 Than Ngo <than@redhat.com> - 2:1.15.0-1
- Update to 1.15.0
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.14.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Wed Jun 25 2025 Than Ngo <than@redhat.com> - 2:1.14.0-3
- Upstream fix for input buffer overflow
* Wed May 28 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 2:1.14.0-2
- Use bundled spdlog on RHEL, redux
* Sun May 25 2025 Than Ngo <than@redhat.com> - 2:1.14.0-1
- Fix rhbz#2368381, update to 1.14.0
* Tue Feb 11 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 2:1.13.2-5
- Use bundled spdlog on RHEL
* Mon Feb 10 2025 Than Ngo <than@redhat.com> - 2:1.13.2-4
- built with system sqlite3 and spdlog
* Sat Feb 08 2025 Than Ngo <than@redhat.com> - 2:1.13.2-3
- Introduce js-doxygen subpackage and unbundle Javascript during RPM builds
- Use system spdlog and sqlite3
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.13.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Mon Jan 13 2025 Than Ngo <than@redhat.com> - 2:1.13.2-1
- Fix rhbz#2336720, Update to 1.13.2
- Fix rhbz#2336536, FTBFS in ignition-transport
* Fri Jan 03 2025 Than Ngo <than@redhat.com> - 2:1.13.1-1
- Fix rhbz#2335266, Update to 1.13.1
* Thu Jan 02 2025 Than Ngo <than@redhat.com> - 2:1.13.0-1
- Fix rhbz#2334703, Update to 1.13.0
* Mon Oct 28 2024 Than Ngo <than@redhat.com> - 2:1.12.0-3
- Fix rhbz#2295788, Non-reproducible file names in doxygen output
* Mon Oct 28 2024 Than Ngo <than@redhat.com> - 2:1.12.0-2
- Fix rhbz#x2322116, broken markdown links to anchors
* Wed Aug 07 2024 Than Ngo <than@redhat.com> - 2:1.12.0-1
- update to 1.12.0
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.11.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Jun 14 2024 Than Ngo <than@redhat.com> - 2:1.11.0-4
- fixed rhbz#2292250, update license
* Fri May 31 2024 Than Ngo <than@redhat.com> - 2:1.11.0-3
- removed workaround for debuginfo
* Wed May 29 2024 Than Ngo <than@redhat.com> - 2:1.11.0-2
- fixed rhbz#2283362, fix buffer overflow
* Tue May 21 2024 Than Ngo <than@redhat.com> - 2:1.11.0-1
- update to 1.11.0
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.10.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Than Ngo <than@redhat.com> - 2:1.10.0-2
- don't use clang to build doxygen as workaround for a bug in gcc-14
* Tue Dec 26 2023 Than Ngo <than@redhat.com> - 1.10.0-1
- bz#2255826, update to 1.10
* Mon Sep 11 2023 Than Ngo <than@redhat.com> - 1.9.8-1
- fix bz#2235035, update to 1.9.8
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.9.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue May 30 2023 Than Ngo <than@redhat.com> - 2:1.9.7-2
- disable build_wizard for eln
- fixed broken unicode test
* Fri May 19 2023 Than Ngo <than@redhat.com> - 2:1.9.7-1
- fix #2208417, rebase to 1.9.7
* Fri Mar 10 2023 Than Ngo <than@redhat.com> - 2:1.9.6-7
- replace obsolescent egrep with grep -E
* Fri Feb 17 2023 Than Ngo <than@redhat.com> - 2:1.9.6-6
- migrated to SPDX license
* Wed Jan 25 2023 Than Ngo <than@redhat.com> - 2:1.9.6-5
- rebuilt against new ghostscript-10
* Fri Jan 20 2023 Than Ngo <than@redhat.com> - 2:1.9.6-4
- fixed bz#2162170, add Require on texlive-wasy
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.9.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jan 18 2023 Than Ngo <than@redhat.com> - 2:1.9.6-2
- fixed bz#2161515 - doxygen FTBFS if _module_build is 1
* Tue Jan 03 2023 Than Ngo <than@redhat.com> - 2:1.9.6-1
- fixed bz#2156564, update to 1.9.6
* Sun Sep 18 2022 Pete Walter <pwalter@fedoraproject.org> - 2:1.9.5-2
- Rebuild for llvm 15
* Fri Sep 09 2022 Than Ngo <than@redhat.com> - 2:1.9.5-1
- 1.9.5
* Thu Aug 04 2022 Than Ngo <than@redhat.com> - 2:1.9.4-2
- Fixed #2113876, Failed to build LaTex output
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.9.4-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri May 06 2022 Than Ngo <than@redhat.com> - 2:1.9.4-1
- 1.9.4
* Thu Feb 17 2022 Than Ngo <than@redhat.com> - 2:1.9.4-0.20220217gite18f715e
- update to 1.9.4 snapshot
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.9.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Oct 27 2021 Than Ngo <than@redhat.com> - 2:1.9.1-12
- revert 1.9.1, noarch package built differently on different architectures
* Wed Oct 27 2021 Than Ngo <than@redhat.com> - 1:1.9.2-4
- update
* Thu Oct 07 2021 Tom Stellard <tstellar@redhat.com> - 1:1.9.2-3
- Rebuild for llvm-13.0.0
* Sun Sep 12 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:1.9.2-2
- Use predictable and reproducible filenames (rhbz#2000138)
* Thu Aug 19 2021 Than Ngo <than@redhat.com> - 1:1.9.2-1
- rebase to 1.9.2
* Tue Aug 17 2021 Björn Esser <besser82@fedoraproject.org> - 1:1.9.1-11
- Rebuild for clang-13.0.0

View file

@ -1,2 +1,2 @@
SHA512 (doxywizard-icons.tar.xz) = 865a86d7535e64ad92e36ba1f901d51cd6b603e762e5c68761a45bc1f965a36e6a6c8d29468ecb2ec799f0add2347537723832aff6660c76af453f80a0a370ad
SHA512 (doxygen-1.9.1.src.tar.gz) = 637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed
SHA512 (doxygen-1.15.0.src.tar.gz) = e53cc8da6cf1fe3ca3b3637647ed6afa28365351eac81d010f6691d939df5e449b3d898a6f695dd850d12659dfd7018fc864071b30fbca5dd196dc094ec4371e