[packages/doxygen] Up to 1.14.0
arekm
arekm at pld-linux.org
Sat Oct 18 14:33:17 CEST 2025
commit 502c656a635359794a32aa04f556d51c1bc8e563
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Oct 18 14:32:56 2025 +0200
Up to 1.14.0
doxygen-doc.patch | 21 ------
doxygen.spec | 19 +++---
flex2.6.patch | 197 ------------------------------------------------------
3 files changed, 9 insertions(+), 228 deletions(-)
---
diff --git a/doxygen.spec b/doxygen.spec
index b45b681..16024d9 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -12,7 +12,7 @@ Summary(pt_BR.UTF-8): Um sistema de documentação para C/C++
Summary(ru.UTF-8): Система документирования для C та C++
Summary(uk.UTF-8): Система документування для C та C++
Name: doxygen
-Version: 1.8.10
+Version: 1.14.0
Release: 1
Epoch: 1
License: GPL v2
@@ -21,23 +21,24 @@ Group: Development/Tools
#Source0Download: https://www.doxygen.nl/download.html
#Source0: https://www.doxygen.nl/files/%{name}-%{version}.src.tar.gz
Source0: http://downloads.sourceforge.net/doxygen/%{name}-%{version}.src.tar.gz
-# Source0-md5: 79767ccd986f12a0f949015efb5f058f
-Patch0: %{name}-doc.patch
-Patch1: flex2.6.patch
+# Source0-md5: a86f6c0203e51a57fbcaf98830d1be16
URL: https://www.doxygen.nl/
+%if %{with qt}
+BuildRequires: Qt6Core-devel
+BuildRequires: Qt6Gui-devel
+BuildRequires: Qt6Xml-devel
+%endif
%{?with_qt:BuildRequires: QtGui-devel >= 4.3}
%{?with_qt:BuildRequires: QtXml-devel >= 4.3}
BuildRequires: bison
BuildRequires: cmake >= 2.8.12
-BuildRequires: flex
+BuildRequires: flex >= 2.6.4
BuildRequires: ghostscript
BuildRequires: ghostscript-fonts-std
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
BuildRequires: perl-base
BuildRequires: python3
-%{?with_qt:BuildRequires: qt4-build >= 4.3}
-%{?with_qt:BuildRequires: qt4-qmake >= 4.3}
%{?with_doc:BuildRequires: texlive-latex}
%{?with_doc:BuildRequires: texlive-pdftex}
%{?with_xapian:BuildRequires: xapian-core-devel}
@@ -182,8 +183,6 @@ wygenerowanych przez Doxygena.
%prep
%setup -q
-%patch -P0 -p1
-%patch -P1 -p1
%build
install -d build
@@ -192,7 +191,7 @@ cd build
-DBUILD_SHARED_LIBS=OFF \
%{?with_doc:-Dbuild_doc=ON} \
%{?with_xapian:-Dbuild_search=ON} \
- %{?with_qt:-Dbuild_wizard=ON}
+ %{?with_qt:-Dbuild_wizard=ON -Dforce_qt=Qt6}
%{__make}
diff --git a/doxygen-doc.patch b/doxygen-doc.patch
deleted file mode 100644
index 08f240d..0000000
--- a/doxygen-doc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- doxygen-1.8.10/doc/CMakeLists.txt.orig 2021-04-24 19:09:10.889930009 +0200
-+++ doxygen-1.8.10/doc/CMakeLists.txt 2021-04-24 19:09:33.446474476 +0200
-@@ -88,17 +88,7 @@ install(FILES
- "${PROJECT_BINARY_DIR}/man/doxywizard.1"
- "${PROJECT_BINARY_DIR}/man/doxysearch.1"
- "${PROJECT_BINARY_DIR}/man/doxyindexer.1"
-- DESTINATION man/man1
--)
--
--install(FILES
-- "${PROJECT_BINARY_DIR}/latex/doxygen_manual.pdf"
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
--)
--
--install(DIRECTORY
-- "${PROJECT_BINARY_DIR}/html"
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+ DESTINATION share/man/man1
- )
-
- endif()
diff --git a/flex2.6.patch b/flex2.6.patch
deleted file mode 100644
index d3f19b0..0000000
--- a/flex2.6.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka at exherbo.org>
-Date: Thu, 19 Nov 2015 12:00:54 +0100
-Subject: [PATCH] Support flex-2.6.0
-
-The version checks only considered YY_FLEX_SUBMINOR_VERSION and did not
-take YY_FLEX_MINOR_VERSION into account, which made them fail with
-flex-2.6.0.
----
- src/code.l | 2 +-
- src/commentscan.l | 4 ++--
- src/fortrancode.l | 2 +-
- src/pycode.l | 2 +-
- src/vhdlcode.l | 2 +-
- src/xmlcode.l | 2 +-
- 6 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/code.l b/src/code.l
-index 332358010..25719af2f 100644
---- a/src/code.l
-+++ b/src/code.l
-@@ -3700,7 +3700,7 @@ void codeFreeScanner()
- extern "C" { // some bogus code to keep the compiler happy
- void codeYYdummy() { yy_flex_realloc(0,0); }
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
- #endif
-
-diff --git a/src/commentscan.l b/src/commentscan.l
-index cf892a067..26298576e 100644
---- a/src/commentscan.l
-+++ b/src/commentscan.l
-@@ -1128,7 +1128,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
- // but we need to know the position in the input buffer where this
- // rule matched.
- // for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
--#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
-+#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
- inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
- #else
- inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
-@@ -1190,7 +1190,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
- g_memberGroupHeader.resize(0);
- parseMore=TRUE;
- needNewEntry = TRUE;
--#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
-+#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
- inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
- #else
- inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);
-diff --git a/src/fortrancode.l b/src/fortrancode.l
-index fb91a8300..352912b71 100644
---- a/src/fortrancode.l
-+++ b/src/fortrancode.l
-@@ -1306,7 +1306,7 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
- extern "C" { // some bogus code to keep the compiler happy
- void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
- #else
- extern "C" { // some bogus code to keep the compiler happy
-diff --git a/src/pycode.l b/src/pycode.l
-index 3c41a69ec..f58f7c139 100644
---- a/src/pycode.l
-+++ b/src/pycode.l
-@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/,
- extern "C" { // some bogus code to keep the compiler happy
- void pycodeYYdummy() { yy_flex_realloc(0,0); }
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
- #endif
-
-diff --git a/src/vhdlcode.l b/src/vhdlcode.l
-index 369ae4881..695704844 100644
---- a/src/vhdlcode.l
-+++ b/src/vhdlcode.l
-@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner()
- extern "C" { // some bogus code to keep the compiler happy
- void vhdlcodeYYdummy() { yy_flex_realloc(0,0); }
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
- #endif
-
-From 8c51120ad55b440b738ef0b96f8169d84a7ae88a Mon Sep 17 00:00:00 2001
-From: Dimitri van Heesch <dimitri at stack.nl>
-Date: Sun, 22 Nov 2015 13:58:59 +0100
-Subject: [PATCH] Support flex-2.6.0
-
----
- src/code.l | 4 ++--
- src/commentscan.l | 4 ++--
- src/fortrancode.l | 6 +++---
- src/pycode.l | 2 +-
- src/vhdlcode.l | 2 +-
- src/xmlcode.l | 2 +-
- 6 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/code.l b/src/code.l
-index 25719af2f..f014924a0 100644
---- a/src/code.l
-+++ b/src/code.l
-@@ -3700,7 +3700,7 @@ void codeFreeScanner()
- extern "C" { // some bogus code to keep the compiler happy
- void codeYYdummy() { yy_flex_realloc(0,0); }
- }
--#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
--#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
-+#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
-+#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
- #endif
-
-diff --git a/src/commentscan.l b/src/commentscan.l
-index 26298576e..ffed075b0 100644
---- a/src/commentscan.l
-+++ b/src/commentscan.l
-@@ -1128,7 +1128,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
- // but we need to know the position in the input buffer where this
- // rule matched.
- // for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
--#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
-+#if YY_FLEX_MAJOR_VERSION>=2 && (YY_FLEX_MINOR_VERSION>5 || (YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33))
- inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
- #else
- inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
-@@ -1190,7 +1190,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
- g_memberGroupHeader.resize(0);
- parseMore=TRUE;
- needNewEntry = TRUE;
--#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
-+#if YY_FLEX_MAJOR_VERSION>=2 && (YY_FLEX_MINOR_VERSION>5 || (YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33))
- inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
- #else
- inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);
-diff --git a/src/fortrancode.l b/src/fortrancode.l
-index 352912b71..82e78c184 100644
---- a/src/fortrancode.l
-+++ b/src/fortrancode.l
-@@ -1302,11 +1302,11 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
- return;
- }
-
--#if !defined(YY_FLEX_SUBMINOR_VERSION)
-+#if !defined(YY_FLEX_SUBMINOR_VERSION)
- extern "C" { // some bogus code to keep the compiler happy
-- void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
-+ void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
- }
--#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
- #else
- extern "C" { // some bogus code to keep the compiler happy
-diff --git a/src/pycode.l b/src/pycode.l
-index f58f7c139..2b2a6684e 100644
---- a/src/pycode.l
-+++ b/src/pycode.l
-@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/,
- extern "C" { // some bogus code to keep the compiler happy
- void pycodeYYdummy() { yy_flex_realloc(0,0); }
- }
--#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
- #endif
-
-diff --git a/src/vhdlcode.l b/src/vhdlcode.l
-index 695704844..e4ae0e7ff 100644
---- a/src/vhdlcode.l
-+++ b/src/vhdlcode.l
-@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner()
- extern "C" { // some bogus code to keep the compiler happy
- void vhdlcodeYYdummy() { yy_flex_realloc(0,0); }
- }
--#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
- #endif
-
---- doxygen-1.8.10/src/xmlcode.l.orig 2021-04-24 18:28:51.986367667 +0200
-+++ doxygen-1.8.10/src/xmlcode.l 2021-04-24 18:28:55.833013495 +0200
-@@ -407,7 +407,7 @@ void resetXmlCodeParserState()
- extern "C" { // some bogus code to keep the compiler happy
- void xmlcodeYYdummy() { yy_flex_realloc(0,0); }
- }
--#elif YY_FLEX_SUBMINOR_VERSION<33
-+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
- #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
- #endif
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/doxygen.git/commitdiff/502c656a635359794a32aa04f556d51c1bc8e563
More information about the pld-cvs-commit
mailing list