Hello community,
here is the log from the commit of package doxygen for openSUSE:Factory checked
in at 2020-10-15 13:46:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/doxygen (Old)
and /work/SRC/openSUSE:Factory/.doxygen.new.3486 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "doxygen"
Thu Oct 15 13:46:39 2020 rev:81 rq:841450 version:1.8.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/doxygen/doxygen.changes 2020-10-08
13:07:50.878936882 +0200
+++ /work/SRC/openSUSE:Factory/.doxygen.new.3486/doxygen.changes
2020-10-15 13:46:52.821211092 +0200
@@ -1,0 +2,10 @@
+Mon Oct 12 15:55:24 UTC 2020 - Franz Sirl <franz.sirl-...@lauterbach.com>
+
+- Use gcc9 for building on SLE_15 based distributions to workaround
+ gcc7 bug PR85180.
+- Adjust building with libclang support for doxygen-1.8.20.
+ - doxygen-llvm-libs.patch
+ - doxygen-libclang-cpp.patch
+ + doxygen-no-libclang-cpp.patch
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/doxygen/doxywizard.changes 2020-09-24
16:13:11.208835174 +0200
+++ /work/SRC/openSUSE:Factory/.doxygen.new.3486/doxywizard.changes
2020-10-15 13:46:57.813213117 +0200
@@ -1,0 +2,9 @@
+Mon Oct 12 15:51:33 UTC 2020 - Franz Sirl <franz.sirl-...@lauterbach.com>
+
+- Use gcc9 for building on SLE_15 based distributions to workaround
+ gcc7 bug PR85180.
+ - doxygen-llvm-libs.patch
+ - doxygen-libclang-cpp.patch
+ + doxygen-no-libclang-cpp.patch
+
+-------------------------------------------------------------------
Old:
----
doxygen-libclang-cpp.patch
doxygen-llvm-libs.patch
New:
----
doxygen-no-libclang-cpp.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ doxygen.spec ++++++
--- /var/tmp/diff_new_pack.5lODHY/_old 2020-10-15 13:46:58.981213606 +0200
+++ /var/tmp/diff_new_pack.5lODHY/_new 2020-10-15 13:46:58.981213606 +0200
@@ -16,8 +16,11 @@
#
+%if 0%{?sle_version} >= 150100
# build with "--with libclang" to enable libclang support
%bcond_with libclang
+%endif
+
Name: doxygen
Version: 1.8.20
Release: 0
@@ -33,14 +36,17 @@
Patch1: %{name}-no-lowercase-man-names.patch
# PATCH-FIX-UPSTREAM: add missing returns to non-void functions
Patch3: vhdlparser-no-return.patch
-Patch6: doxygen-llvm-libs.patch
-Patch10: doxygen-libclang-cpp.patch
+Patch10: doxygen-no-libclang-cpp.patch
# PATCH-FIX-UPSTREAM
Patch11: 0001-issue-7979-C++-enums-being-defined-in-multiple-files.patch
BuildRequires: bison
BuildRequires: cmake >= 2.8.12
BuildRequires: flex
+%if 0%{?suse_version} <= 1500
+BuildRequires: gcc9-c++
+%else
BuildRequires: gcc-c++
+%endif
BuildRequires: python3-base
BuildRequires: python3-xml
# Do not bother building documentation with latex since it is present on the
@@ -64,10 +70,7 @@
%patch1 -p1
%patch3 -p1
%if %{with libclang}
-%patch6
-%endif
-%if %{with libclang}
-%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
+%if 0%{?sle_version} == 150100 || (0%{?sle_version} == 150200 &&
!0%{?is_opensuse})
%patch10 -p1
%endif
%endif
@@ -82,6 +85,10 @@
%if %{with libclang}
-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_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 ++++++
--- /var/tmp/diff_new_pack.5lODHY/_old 2020-10-15 13:46:59.001213614 +0200
+++ /var/tmp/diff_new_pack.5lODHY/_new 2020-10-15 13:46:59.001213614 +0200
@@ -31,7 +31,11 @@
BuildRequires: bison
BuildRequires: cmake >= 2.8.12
BuildRequires: flex
+%if 0%{?suse_version} <= 1500
+BuildRequires: gcc9-c++
+%else
BuildRequires: gcc-c++
+%endif
BuildRequires: libjpeg-devel
BuildRequires: pkgconfig
BuildRequires: python3-base
@@ -61,6 +65,10 @@
export CXXFLAGS="%{optflags} -fPIC"
%cmake \
-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_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
++++++ doxygen-no-libclang-cpp.patch ++++++
--- 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()
