Accepting request 999470 from home:1Antoine1:branches:science

- Update to version 1.9.5: See https://doxygen.nl/manual/changelog.html.
- Remove upstreamed patches:
  * doxygen-modify-footer.patch
  * doxygen-gcc12.patch
  * doxygen-1.9.4-fix-symlink-detection.patch
- Add doxygen-1.9.4-fix-symlink-detection.patch: Fix symlink
  detection issue leading to givaro build to hang
  (gh#doxygen/doxygen#9491).

OBS-URL: https://build.opensuse.org/request/show/999470
OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=171
This commit is contained in:
Petr Gajdos 2022-08-29 09:03:23 +00:00 committed by Git OBS Bridge
parent 3a9fc5e4c0
commit 5a2a99f8d0
7 changed files with 21 additions and 48 deletions

View File

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

3
doxygen-1.9.5.src.tar.gz Normal file
View File

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

View File

@ -1,22 +0,0 @@
From 5198966c8d5fec89116d025c74934ac03ea511fa Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Fri, 6 May 2022 09:55:16 +0200
Subject: [PATCH] issue #9312: Build: cache.h:53:14: error: 'exchange' is not a
member of 'std'
---
src/cache.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/cache.h b/src/cache.h
index 0ff3092ed5..e218eb27d2 100644
--- a/src/cache.h
+++ b/src/cache.h
@@ -19,6 +19,7 @@
#include <list>
#include <unordered_map>
#include <mutex>
+#include <utility>
#include <ctype.h>
/*! Fixed size cache for value type V using keys of type K.

View File

@ -1,13 +0,0 @@
Index: doxygen-1.8.16/Doxyfile
===================================================================
--- 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

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Aug 26 19:05:07 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org>
- Update to version 1.9.5: See https://doxygen.nl/manual/changelog.html.
- Remove upstreamed patches:
* doxygen-modify-footer.patch
* doxygen-gcc12.patch
* doxygen-1.9.4-fix-symlink-detection.patch
-------------------------------------------------------------------
Tue Aug 23 23:16:27 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org>
- Add doxygen-1.9.4-fix-symlink-detection.patch: Fix symlink
detection issue leading to givaro build to hang
(gh#doxygen/doxygen#9491).
-------------------------------------------------------------------
Mon Jun 27 11:12:51 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -22,7 +22,7 @@
%endif
Name: doxygen
Version: 1.9.4
Version: 1.9.5
Release: 0
Summary: Automated C, C++, and Java Documentation Generator
# qtools are used for building and they are GPL-3.0 licensed
@ -31,11 +31,7 @@ Group: Development/Tools/Doc Generators
URL: https://www.doxygen.nl/
Source0: https://www.doxygen.nl/files/doxygen-%{version}.src.tar.gz
# suse specific
Patch0: %{name}-modify_footer.patch
# suse specific
Patch1: %{name}-no-lowercase-man-names.patch
# PATCH-FIX-UPSTREAM
Patch2: doxygen-gcc12.patch
# The unified libclang-cpp library doesn't exist on older Leap / SLE
Patch10: doxygen-no-libclang-cpp.patch
BuildRequires: bison
@ -66,9 +62,7 @@ as well.
%prep
%setup -q
# Leap 15 and SLE don't accept '%%autopatch -M'
%patch0 -p1
%patch1 -p1
%patch2 -p1
%if %{with libclang}
%if 0%{?sle_version} == 150100 || (0%{?sle_version} == 150200 && !0%{?is_opensuse})
%patch10 -p1

View File

@ -17,7 +17,7 @@
Name: doxywizard
Version: 1.9.4
Version: 1.9.5
Release: 0
Summary: Graphical User Interface for Doxygen
# qtools are used for building and they are GPL-3.0 licensed
@ -26,8 +26,6 @@ Group: Development/Tools/Doc Generators
URL: https://www.doxygen.nl/
Source: https://www.doxygen.nl/files/doxygen-%{version}.src.tar.gz
Source1: doxywizard.desktop
# PATCH-FIX-UPSTREAM
Patch0: doxygen-gcc12.patch
BuildRequires: bison
BuildRequires: cmake >= 2.8.12
BuildRequires: flex