Accepting request 1318694 from devel:tools

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1318694
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/doxygen?expand=0&rev=109

doxygen-1.15.0.src.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8cafe605867ad475aaf288a3852783076e1df83aabf16488bbfa958062e7440
+size 9203196

doxygen-testsuite-failure-final-solution.patch

@@ -0,0 +1,48 @@
+Index: doxygen-1.15.0/testing/CMakeLists.txt
+===================================================================
+--- doxygen-1.15.0.orig/testing/CMakeLists.txt
++++ doxygen-1.15.0/testing/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # run all tests sequentially (keep for backward compatibility)
+ add_custom_target(tests
+   COMMENT "Running doxygen tests..."
+-  COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --xmlxsd --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
++  COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
+   DEPENDS doxygen ${update_doxmlparser_dependency}
+ )
+ 
+@@ -15,6 +15,6 @@ foreach(TEST_FILE ${TEST_FILES})
+   string(REGEX REPLACE "^.*/([0-9][0-9][0-9]*).*$" "\\1" TEST_ID "${TEST_FILE}")
+   # add a test target for each test
+   add_test(NAME ${TEST_NAME}
+-    COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --xmlxsd --doxygen $<TARGET_FILE:doxygen> --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
++    COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
+   )
+ endforeach()
+Index: doxygen-1.15.0/testing/runtests.py
+===================================================================
+--- doxygen-1.15.0.orig/testing/runtests.py
++++ doxygen-1.15.0/testing/runtests.py
+@@ -88,7 +88,21 @@ class Tester:
+         elif not os.path.isfile(expected_file):
+             return (True,'%s absent' % expected_file)
+         else:
+-            diff = xpopen('diff -b -w -u %s %s' % (got_file,expected_file))
++            got_file_tmp = got_file + "_tmp"
++            with xopen(got_file,'r') as f:
++                with xopen(got_file_tmp,"w") as out_file:
++                    lines = f.read().replace("<","\n<").replace(">",">\n").splitlines()
++                    filtered = [ line for line in lines if line.strip() ]
++                    out_file.write('\n'.join(filtered))
++            expected_file_tmp = got_file + "_tmp1"
++            with xopen(expected_file,'r') as f:
++                with xopen(expected_file_tmp,"w") as out_file:
++                    lines = f.read().replace("<","\n<").replace(">",">\n").splitlines()
++                    filtered = [ line for line in lines if line.strip() ]
++                    out_file.write('\n'.join(filtered))
++            diff = xpopen('diff -b -w -u %s %s' % (got_file_tmp,expected_file_tmp))
++            os.remove(got_file_tmp)
++            os.remove(expected_file_tmp)
+             if diff and not diff.startswith("No differences"):
+                 return (True,'Difference between generated output and reference:\n%s' % diff)
+         return (False,'')

doxygen.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Wed Nov 12 10:56:26 UTC 2025 - pgajdos@suse.com
+
+- added patches
+  https://github.com/doxygen/doxygen/pull/11864
+  * doxygen-testsuite-failure-final-solution.patch
+- TEST_FLAGS="--xmlxsd" is no longer needed
+  (https://github.com/doxygen/doxygen/commit/8e2dcb4b91a3e1788e8253ad0f0ca921d362717a)
+
+-------------------------------------------------------------------
+Wed Oct 22 16:25:26 UTC 2025 - Christoph G <foss@grueninger.de>
+
+- update to 1.15.0
+  * Support Mathjax version 4
+  * Minor Doxywizard improvements
+  * Increase maximum number of allowed threads in config file
+  * New option MARKDOWN_STRICT which is enabled by default, and
+    will no longer treat ' as the end of a quoted text started
+    with ` (e.g. `word'). If you depend on the old behavior, set
+    this option to NO.
+
+-------------------------------------------------------------------
+Wed Sep 24 07:49:18 UTC 2025 - pgajdos@suse.com
+
+- upstream links to github repository
+- set TEST_FLAGS="--xmlxsd"
+  (https://github.com/doxygen/doxygen/issues/11772)
+
+-------------------------------------------------------------------
+Wed Jul 23 12:39:02 UTC 2025 - Franz Sirl <franz.sirl-obs@lauterbach.com>
+
+- Restore build on openSUSE 15.6 and SLE15 SP6/SP7
+
 -------------------------------------------------------------------
 Thu May 29 14:07:05 UTC 2025 - Christoph G <foss@grueninger.de>
 

doxygen.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package doxygen
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,30 +15,41 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
+%global rdir Release_1_15_0
 Name:           doxygen
-Version:        1.14.0
+Version:        1.15.0
 Release:        0
 Summary:        Automated C, C++, and Java Documentation Generator
 # qtools are used for building and they are GPL-3.0 licensed
 License:        GPL-2.0-or-later
 Group:          Development/Tools/Doc Generators
-URL:            https://www.doxygen.nl/
+URL:            https://github.com/doxygen/doxygen
-Source0:        https://www.doxygen.nl/files/doxygen-%{version}.src.tar.gz
+Source0:        https://github.com/doxygen/doxygen/releases/download/%{rdir}/doxygen-%{version}.src.tar.gz
 # suse specific
 Patch1:         %{name}-no-lowercase-man-names.patch
 Patch2:         reproducible.patch
+# https://github.com/doxygen/doxygen/pull/11864
+Patch3:         doxygen-testsuite-failure-final-solution.patch
 BuildRequires:  bison
 BuildRequires:  cmake >= 3.14
 BuildRequires:  flex
+%if 0%{?suse_version} && 0%{?suse_version} < 1600
+BuildRequires:  gcc14-c++
+%else
 BuildRequires:  gcc-c++
+%endif
+%if 0%{?is_opensuse} || 0%{?suse_version} >= 1600
 BuildRequires:  llvm-clang-devel
+%else
+BuildRequires:  clang17-devel
+%endif
 BuildRequires:  python3-base
 BuildRequires:  python3-xml
 # Do not bother building documentation with latex since it is present on the
 # web trivialy for all versions of doxygen
 Obsoletes:      doxygen-doc
 
-
 %description
 Doxygen is the de facto standard tool for generating documentation
 from annotated C++ sources, but it also supports other popular
@@ -48,8 +59,7 @@ and to some extent D. Doxygen also supports the hardware description
 language VHDL.
 
 %prep
-%setup -q
+%autosetup -p1
-%autopatch -p1
 
 %build
 %cmake \
@@ -58,6 +68,10 @@ language VHDL.
     -Dbuild_search=OFF \
     -Dbuild_wizard=OFF \
     -Duse_libclang=ON \
+%if 0%{?suse_version} && 0%{?suse_version} < 1600
+    -DCMAKE_C_COMPILER=gcc-14 \
+    -DCMAKE_CXX_COMPILER=g++-14 \
+%endif
     -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
     -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
     -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \

doxywizard.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package doxywizard
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,20 +16,25 @@
 #
 
 
+%global rdir Release_1_15_0
 Name:           doxywizard
-Version:        1.14.0
+Version:        1.15.0
 Release:        0
 Summary:        Graphical User Interface for Doxygen
 # qtools are used for building and they are GPL-3.0 licensed
 License:        GPL-2.0-or-later
 Group:          Development/Tools/Doc Generators
-URL:            https://www.doxygen.nl/
+URL:            https://github.com/doxygen/doxygen
-Source:         https://www.doxygen.nl/files/doxygen-%{version}.src.tar.gz
+Source:         https://github.com/doxygen/doxygen/releases/download/%{rdir}/doxygen-%{version}.src.tar.gz
 Source1:        doxywizard.desktop
 BuildRequires:  bison
 BuildRequires:  cmake >= 3.14
 BuildRequires:  flex
+%if 0%{?suse_version} && 0%{?suse_version} < 1600
+BuildRequires:  gcc14-c++
+%else
 BuildRequires:  gcc-c++
+%endif
 BuildRequires:  libjpeg-devel
 BuildRequires:  pkgconfig
 BuildRequires:  python3-base
@@ -37,6 +42,7 @@ BuildRequires:  python3-xml
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(Qt6Core)
 BuildRequires:  pkgconfig(Qt6Gui)
+BuildRequires:  pkgconfig(Qt6Svg)
 BuildRequires:  pkgconfig(Qt6Widgets)
 BuildRequires:  pkgconfig(Qt6Xml)
 Requires:       doxygen = %{version}
@@ -54,6 +60,10 @@ configuration files.
 %build
 %cmake \
     -Dbuild_wizard=ON \
+%if 0%{?suse_version} && 0%{?suse_version} < 1600
+    -DCMAKE_C_COMPILER=gcc-14 \
+    -DCMAKE_CXX_COMPILER=g++-14 \
+%endif
     -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
     -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
     -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \