SHA256
1
0
forked from pool/doxygen

Accepting request 1237886 from devel:tools

- update to Doxygen 1.13.2
  * Support for Plus sign code fence directives - GitHub flavor
  * String representation at "show configuration" in doxywizard
- Remove special paths for older Suse versions for which packages
  are no longer built anyway
  * Drop related patch doxygen-no-libclang-cpp.patch (forwarded request 1236969 from mathletic)

OBS-URL: https://build.opensuse.org/request/show/1237886
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/doxygen?expand=0&rev=104
This commit is contained in:
Ana Guerrero 2025-01-16 17:30:59 +00:00 committed by Git OBS Bridge
commit f6b796fd66
6 changed files with 19 additions and 58 deletions

View File

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

BIN
doxygen-1.13.2.src.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,11 +0,0 @@
--- doxygen-1.8.20/src/CMakeLists.txt.orig 2020-10-06 15:56:02.841527965 +0200
+++ doxygen-1.8.20/src/CMakeLists.txt 2020-10-06 16:07:14.226206979 +0200
@@ -341,7 +341,7 @@
set(CLANG_LIBS libclang clangTooling)
else() # dynamically linked version of clang
llvm_config(doxymain USE_SHARED support)
- set(CLANG_LIBS libclang clang-cpp)
+ set(CLANG_LIBS libclang clangTooling)
endif()
target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS})
endif()

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sat Jan 11 07:07:53 UTC 2025 - Christoph G <foss@grueninger.de>
- update to Doxygen 1.13.2
* Support for Plus sign code fence directives - GitHub flavor
* String representation at "show configuration" in doxywizard
- Remove special paths for older Suse versions for which packages
are no longer built anyway
* Drop related patch doxygen-no-libclang-cpp.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 2 16:50:30 UTC 2025 - Christoph G <foss@grueninger.de> Thu Jan 2 16:50:30 UTC 2025 - Christoph G <foss@grueninger.de>

View File

@ -15,14 +15,8 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
%if 0%{?sle_version} >= 150100
# build with "--with libclang" to enable libclang support
%bcond_with libclang
%endif
Name: doxygen Name: doxygen
Version: 1.13.1 Version: 1.13.2
Release: 0 Release: 0
Summary: Automated C, C++, and Java Documentation Generator Summary: Automated C, C++, and Java Documentation Generator
# qtools are used for building and they are GPL-3.0 licensed # qtools are used for building and they are GPL-3.0 licensed
@ -32,25 +26,18 @@ URL: https://www.doxygen.nl/
Source0: https://www.doxygen.nl/files/doxygen-%{version}.src.tar.gz Source0: https://www.doxygen.nl/files/doxygen-%{version}.src.tar.gz
# suse specific # suse specific
Patch1: %{name}-no-lowercase-man-names.patch Patch1: %{name}-no-lowercase-man-names.patch
# The unified libclang-cpp library doesn't exist on older Leap / SLE Patch2: reproducible.patch
Patch2: doxygen-no-libclang-cpp.patch
Patch3: reproducible.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: cmake >= 3.14 BuildRequires: cmake >= 3.14
BuildRequires: flex BuildRequires: flex
%if 0%{?suse_version} <= 1500
BuildRequires: gcc9-c++
%else
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%endif BuildRequires: llvm-clang-devel
BuildRequires: python3-base BuildRequires: python3-base
BuildRequires: python3-xml BuildRequires: python3-xml
# Do not bother building documentation with latex since it is present on the # Do not bother building documentation with latex since it is present on the
# web trivialy for all versions of doxygen # web trivialy for all versions of doxygen
Obsoletes: doxygen-doc Obsoletes: doxygen-doc
%if %{with libclang}
BuildRequires: llvm-clang-devel
%endif
%description %description
Doxygen is the de facto standard tool for generating documentation Doxygen is the de facto standard tool for generating documentation
@ -62,14 +49,7 @@ language VHDL.
%prep %prep
%setup -q %setup -q
# Leap 15 and SLE don't accept '%%autopatch -M' %autopatch -p1
%patch -P 1 -p1
%if %{with libclang}
%if 0%{?sle_version} == 150100 || (0%{?sle_version} == 150200 && !0%{?is_opensuse})
%patch -P 2 -p1
%endif
%endif
%patch -P 3 -p1
%build %build
%cmake \ %cmake \
@ -77,13 +57,7 @@ language VHDL.
-Dbuild_xmlparser=ON \ -Dbuild_xmlparser=ON \
-Dbuild_search=OFF \ -Dbuild_search=OFF \
-Dbuild_wizard=OFF \ -Dbuild_wizard=OFF \
%if %{with libclang}
-Duse_libclang=ON \ -Duse_libclang=ON \
%endif
%if 0%{?suse_version} <= 1500
-DCMAKE_C_COMPILER=gcc-9 \
-DCMAKE_CXX_COMPILER=g++-9 \
%endif
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ -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_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \

View File

@ -17,7 +17,7 @@
Name: doxywizard Name: doxywizard
Version: 1.13.1 Version: 1.13.2
Release: 0 Release: 0
Summary: Graphical User Interface for Doxygen Summary: Graphical User Interface for Doxygen
# qtools are used for building and they are GPL-3.0 licensed # qtools are used for building and they are GPL-3.0 licensed
@ -29,11 +29,7 @@ Source1: doxywizard.desktop
BuildRequires: bison BuildRequires: bison
BuildRequires: cmake >= 3.14 BuildRequires: cmake >= 3.14
BuildRequires: flex BuildRequires: flex
%if 0%{?suse_version} <= 1500
BuildRequires: gcc9-c++
%else
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%endif
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python3-base BuildRequires: python3-base
@ -44,11 +40,9 @@ BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5Xml)
Requires: doxygen = %{version} Requires: doxygen = %{version}
%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315
# for make tests # for make tests
BuildRequires: libxml2-tools BuildRequires: libxml2-tools
BuildRequires: texlive-bibtex BuildRequires: texlive-bibtex
%endif
%description %description
Doxywizard is a graphical front-end to read/edit/write doxygen Doxywizard is a graphical front-end to read/edit/write doxygen
@ -60,10 +54,6 @@ configuration files.
%build %build
%cmake \ %cmake \
-Dbuild_wizard=ON \ -Dbuild_wizard=ON \
%if 0%{?suse_version} <= 1500
-DCMAKE_C_COMPILER=gcc-9 \
-DCMAKE_CXX_COMPILER=g++-9 \
%endif
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ -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_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
@ -71,13 +61,11 @@ configuration files.
-DBUILD_STATIC_LIBS=ON -DBUILD_STATIC_LIBS=ON
%cmake_build %cmake_build
%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315
%check %check
export LANG=C.UTF-8 export LANG=C.UTF-8
# testing doxygen package here to avoid build # testing doxygen package here to avoid build
# cycle between latex and doxygen # cycle between latex and doxygen
%ctest %ctest
%endif
%install %install
%cmake_install %cmake_install