Hello community, here is the log from the commit of package doxygen for openSUSE:Factory checked in at 2019-12-07 15:16:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/doxygen (Old) and /work/SRC/openSUSE:Factory/.doxygen.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "doxygen" Sat Dec 7 15:16:31 2019 rev:75 rq:746480 version:1.8.16 Changes: -------- --- /work/SRC/openSUSE:Factory/doxygen/doxygen.changes 2019-01-15 13:16:24.880355901 +0100 +++ /work/SRC/openSUSE:Factory/.doxygen.new.4691/doxygen.changes 2019-12-07 15:20:10.475755495 +0100 @@ -1,0 +2,32 @@ +Thu Nov 7 21:07:47 UTC 2019 - Stefan Brüns <[email protected]> + +- Add PR_7193_fix_blank_file_patterns.patch to populate the + default for FILE_PATTERNS if not set, otherwise no files are + processed [https://github.com/doxygen/doxygen/issues/7190] +- Remove obsolete and no longer applying patch: + doxygen-dot-one-thread.patch + +------------------------------------------------------------------- +Mon Sep 30 13:06:06 UTC 2019 - Franz Sirl <[email protected]> + +- Optional build with libclang support: + * add doxygen-llvm-libs.patch to link with monolithic libLLVM + * support "--with libclang" in specfile + +------------------------------------------------------------------- +Mon Sep 30 11:13:23 UTC 2019 - [email protected] + +- version update to 1.8.16 + - many bugs fixed + - many features implemented + - http://www.doxygen.nl/manual/changelog.html +- modified patches + % doxygen-modify_footer.patch (refreshed) +- deleted patches + - doxygen-empty-strings-segfault.patch (upstreamed) + - doxygen-latex-makeindex.patch (upstreamed) +- added patches + really do not require git executable + + doxygen-git-not-required.patch + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/doxygen/doxywizard.changes 2019-01-15 13:16:24.920355869 +0100 +++ /work/SRC/openSUSE:Factory/.doxygen.new.4691/doxywizard.changes 2019-12-07 15:20:11.403755367 +0100 @@ -1,0 +2,15 @@ +Mon Sep 30 11:13:23 UTC 2019 - [email protected] + +- version update to 1.8.16 + - many bugs fixed + - many features implemented + - http://www.doxygen.nl/manual/changelog.html +- modified patches + % doxygen-modify_footer.patch (refreshed) +- deleted patches + - doxygen-empty-strings-segfault.patch (upstreamed) + - doxygen-latex-makeindex.patch (upstreamed) +- added patches + really do not require git executable + + doxygen-git-not-required.patch +------------------------------------------------------------------- Old: ---- doxygen-1.8.15.src.tar.gz doxygen-dot-one-thread.patch doxygen-empty-strings-segfault.patch doxygen-latex-makeindex.patch New: ---- PR_7193_fix_blank_file_patterns.patch doxygen-1.8.16.src.tar.gz doxygen-git-not-required.patch doxygen-llvm-libs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ doxygen.spec ++++++ --- /var/tmp/diff_new_pack.cqt0Kg/_old 2019-12-07 15:20:12.375755232 +0100 +++ /var/tmp/diff_new_pack.cqt0Kg/_new 2019-12-07 15:20:12.375755232 +0100 @@ -16,8 +16,11 @@ # +# build with "--with libclang" to enable libclang support +%bcond_with libclang + Name: doxygen -Version: 1.8.15 +Version: 1.8.16 Release: 0 Summary: Automated C, C++, and Java Documentation Generator # qtools are used for building and they are GPL-3.0 licensed @@ -31,18 +34,20 @@ Patch1: %{name}-no-lowercase-man-names.patch # PATCH-FIX-UPSTREAM: add missing returns to non-void functions Patch3: vhdlparser-no-return.patch -# suse specific, for ppc64le ppc64, workaround for bnc#921577 -Patch4: doxygen-dot-one-thread.patch -# https://github.com/doxygen/doxygen/issues/6725 -Patch5: doxygen-latex-makeindex.patch -# https://github.com/doxygen/doxygen/issues/6749 -Patch6: doxygen-empty-strings-segfault.patch +# really do not require git executable +Patch5: doxygen-git-not-required.patch +Patch6: doxygen-llvm-libs.patch +# PATCH-FIX-UPSTREAM: Populate FILE_PATTERN default if not set (issue#7190) +Patch7: PR_7193_fix_blank_file_patterns.patch BuildRequires: bison BuildRequires: cmake >= 2.8.12 BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: python3-base BuildRequires: python3-xml +%if %{with libclang} +BuildRequires: llvm-clang-devel +%endif # Do not bother building documentation with latex since it is present on the # web trivialy for all versions of doxygen Obsoletes: doxygen-doc @@ -57,14 +62,14 @@ %prep %setup -q -%patch0 +%patch0 -p1 %patch1 -p1 %patch3 -p1 -%ifarch ppc64le ppc64 -%patch4 -p1 -%endif %patch5 -p1 -%patch6 -p1 +%if %{with libclang} +%patch6 +%endif +%patch7 -p1 %build %cmake \ @@ -72,9 +77,14 @@ -Dbuild_xmlparser=ON \ -Dbuild_search=OFF \ -Dbuild_wizard=OFF \ +%if %{with libclang} + -Duse_libclang=ON \ +%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" + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ + -DBUILD_SHARED_LIBS=OFF \ + -DBUILD_STATIC_LIBS=ON %make_jobs %install ++++++ doxywizard.spec ++++++ --- /var/tmp/diff_new_pack.cqt0Kg/_old 2019-12-07 15:20:12.391755230 +0100 +++ /var/tmp/diff_new_pack.cqt0Kg/_new 2019-12-07 15:20:12.395755229 +0100 @@ -17,7 +17,7 @@ Name: doxywizard -Version: 1.8.15 +Version: 1.8.16 Release: 0 Summary: Graphical User Interface for Doxygen # qtools are used for building and they are GPL-3.0 licensed @@ -28,6 +28,8 @@ Source1: doxywizard.desktop # PATCH-FIX-UPSTREAM: add missing returns to non-void functions Patch3: vhdlparser-no-return.patch +# really do not require git executable +Patch4: doxygen-git-not-required.patch BuildRequires: bison BuildRequires: cmake >= 2.8.12 BuildRequires: flex @@ -54,6 +56,7 @@ %prep %setup -q -n doxygen-%{version} %patch3 -p1 +%patch4 -p1 %build export CFLAGS="%{optflags} -fPIC" @@ -62,7 +65,9 @@ -Dbuild_wizard=ON \ -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" + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \ + -DBUILD_SHARED_LIBS=OFF \ + -DBUILD_STATIC_LIBS=ON %make_jobs %if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 ++++++ PR_7193_fix_blank_file_patterns.patch ++++++ >From a27369dbf3cccbe4b96bfde1aca49d96d4b396f0 Mon Sep 17 00:00:00 2001 From: albert-github <[email protected]> Date: Tue, 13 Aug 2019 19:23:42 +0200 Subject: [PATCH] issue #7190 1.8.16: Blank FILE_PATTERNS => no files processed This is actually a regression on #7195. Due to the fact that the init() routine has moved up, the settings for `FILE_PATTERNS` have already been done and a call to init does not operate on the `FILE_PATTERNS` variable but on the structure from which the `FILE_PATTERNS` was derived. We have should here operate on the `FILE_PATTERNS` directly as well., bu getting the default values out of the underlying structure. --- src/configimpl.h | 1 + src/configimpl.l | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/configimpl.h b/src/configimpl.h index 1594d47a3..55e056e8b 100644 --- a/src/configimpl.h +++ b/src/configimpl.h @@ -126,6 +126,7 @@ class ConfigList : public ConfigOption void setWidgetType(WidgetType w) { m_widgetType = w; } WidgetType widgetType() const { return m_widgetType; } QStrList *valueRef() { return &m_value; } + QStrList getDefault() { return m_defaultValue; } void writeTemplate(FTextStream &t,bool sl,bool); void compareDoxyfile(FTextStream &t); void substEnvVars(); diff --git a/src/configimpl.l b/src/configimpl.l index bcb5a8c34..2d91e1206 100644 --- a/src/configimpl.l +++ b/src/configimpl.l @@ -1652,11 +1652,17 @@ void Config::checkAndCorrect() QStrList &filePatternList = Config_getList(FILE_PATTERNS); if (filePatternList.isEmpty()) { - ConfigOption * opt = ConfigImpl::instance()->get("FILE_PATTERNS"); - if (opt->kind()==ConfigOption::O_List) + ConfigOption * opt = ConfigImpl::instance()->get("FILE_PATTERNS"); + if (opt->kind()==ConfigOption::O_List) + { + QStrList l = ((ConfigList*)opt)->getDefault(); + const char *p = l.first(); + while (p) { - ((ConfigList*)opt)->init(); + filePatternList.append(p); + p = l.next(); } + } } // add default pattern if needed ++++++ doxygen-1.8.15.src.tar.gz -> doxygen-1.8.16.src.tar.gz ++++++ ++++ 126680 lines of diff (skipped) ++++++ doxygen-git-not-required.patch ++++++ Index: doxygen-1.8.16/cmake/git_watcher.cmake =================================================================== --- doxygen-1.8.16.orig/cmake/git_watcher.cmake 2019-07-30 15:10:10.000000000 +0200 +++ doxygen-1.8.16/cmake/git_watcher.cmake 2019-09-30 10:10:55.145977348 +0200 @@ -69,7 +69,7 @@ CHECK_OPTIONAL_VARIABLE(GIT_WORKING_DIR # Check the optional git variable. # If it's not set, we'll try to find it using the CMake packaging system. if(NOT DEFINED GIT_EXECUTABLE) - find_package(Git QUIET REQUIRED) + find_package(Git QUIET) endif() CHECK_REQUIRED_VARIABLE(GIT_EXECUTABLE) ++++++ doxygen-llvm-libs.patch ++++++ --- src/CMakeLists.txt~ 2019-07-28 13:32:49.436473952 +0200 +++ src/CMakeLists.txt 2019-07-28 13:33:52.016439550 +0200 @@ -261,9 +261,8 @@ endif() include_directories(${LLVM_INCLUDE_DIRS}) add_definitions(${LLVM_DEFINITIONS}) - llvm_map_components_to_libnames(llvm_libs support core option) target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS}) - set(CLANG_LIBS libclang clangTooling ${llvm_libs}) + set(CLANG_LIBS libclang clangTooling LLVM) endif() target_link_libraries(doxygen ++++++ doxygen-modify_footer.patch ++++++ --- /var/tmp/diff_new_pack.cqt0Kg/_old 2019-12-07 15:20:13.039755140 +0100 +++ /var/tmp/diff_new_pack.cqt0Kg/_new 2019-12-07 15:20:13.043755140 +0100 @@ -1,14 +1,13 @@ -Index: Doxyfile +Index: doxygen-1.8.16/Doxyfile =================================================================== ---- Doxyfile.orig 2014-02-08 14:06:14.000000000 +0100 -+++ Doxyfile 2014-05-13 09:07:52.475141202 +0200 -@@ -148,7 +148,7 @@ +--- doxygen-1.8.16.orig/Doxyfile 2019-09-30 09:31:11.324583274 +0200 ++++ doxygen-1.8.16/Doxyfile 2019-09-30 09:31:20.108631879 +0200 +@@ -158,7 +158,7 @@ HTML_EXTRA_FILES = HTML_COLORSTYLE_HUE = 220 HTML_COLORSTYLE_SAT = 100 HTML_COLORSTYLE_GAMMA = 80 -HTML_TIMESTAMP = YES +HTML_TIMESTAMP = NO + HTML_DYNAMIC_MENUS = YES HTML_DYNAMIC_SECTIONS = YES HTML_INDEX_NUM_ENTRIES = 100 - GENERATE_DOCSET = YES -
