From c1d1b4b24b2204d4bc34dd4725212e05a49e27fcc3f2e6b62ed47ad706c17245 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 24 Apr 2023 12:02:05 +0000 Subject: [PATCH 1/3] Accepting request 1082502 from home:dimstar:Factory - Add _multibuild to define 2nd spec file as additional flavor. Eliminates the need for source package links in OBS. OBS-URL: https://build.opensuse.org/request/show/1082502 OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=180 --- _multibuild | 4 ++++ doxygen.changes | 6 ++++++ 2 files changed, 10 insertions(+) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..93729a8 --- /dev/null +++ b/_multibuild @@ -0,0 +1,4 @@ + + doxywizard.spec + + diff --git a/doxygen.changes b/doxygen.changes index 408eac8..2aa44d5 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 24 11:40:17 UTC 2023 - Dominique Leuenberger + +- Add _multibuild to define 2nd spec file as additional flavor. + Eliminates the need for source package links in OBS. + ------------------------------------------------------------------- Thu Mar 16 02:17:05 UTC 2023 - Stefan Brüns From 855accc7edfb6957e6d4398d7050054091ce5761a971292ddfbd56ab46a9b99f Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 25 Apr 2023 11:16:20 +0000 Subject: [PATCH 2/3] Accepting request 1082509 from home:dimstar:Factory - Re-download patches: the server presents them with shorter hash refs: * Fix-boundingbox-parsing_part1.patch * Fix-boundingbox-parsing_part2.patch * Fix-boundingbox-parsing_part3.patch * Fix-boundingbox-parsing_part4.patch OBS-URL: https://build.opensuse.org/request/show/1082509 OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=181 --- Fix-boundingbox-parsing_part1.patch | 4 ++-- Fix-boundingbox-parsing_part2.patch | 8 ++++---- Fix-boundingbox-parsing_part3.patch | 4 ++-- Fix-boundingbox-parsing_part4.patch | 4 ++-- doxygen.changes | 11 +++++++++++ 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/Fix-boundingbox-parsing_part1.patch b/Fix-boundingbox-parsing_part1.patch index c90d447..f23b986 100644 --- a/Fix-boundingbox-parsing_part1.patch +++ b/Fix-boundingbox-parsing_part1.patch @@ -12,7 +12,7 @@ Subject: [PATCH] Add TinyDeflate as dependency diff --git a/TinyDeflate/README.md b/TinyDeflate/README.md new file mode 100644 -index 00000000000..8df1acaae26 +index 0000000000..8df1acaae2 --- /dev/null +++ b/TinyDeflate/README.md @@ -0,0 +1,360 @@ @@ -378,7 +378,7 @@ index 00000000000..8df1acaae26 + diff --git a/TinyDeflate/gunzip.hh b/TinyDeflate/gunzip.hh new file mode 100644 -index 00000000000..c0039d5f832 +index 0000000000..c0039d5f83 --- /dev/null +++ b/TinyDeflate/gunzip.hh @@ -0,0 +1,1430 @@ diff --git a/Fix-boundingbox-parsing_part2.patch b/Fix-boundingbox-parsing_part2.patch index cd4d7a9..773f5bb 100644 --- a/Fix-boundingbox-parsing_part2.patch +++ b/Fix-boundingbox-parsing_part2.patch @@ -11,7 +11,7 @@ Subject: [PATCH] issue #9319: Doc build fails with cairo 1.17.6 4 files changed, 120 insertions(+), 13 deletions(-) diff --git a/TinyDeflate/gunzip.hh b/TinyDeflate/gunzip.hh -index c0039d5f832..c237298fdb0 100644 +index c0039d5f83..c237298fdb 100644 --- a/TinyDeflate/gunzip.hh +++ b/TinyDeflate/gunzip.hh @@ -944,23 +944,27 @@ namespace gunzip_ns @@ -54,7 +54,7 @@ index c0039d5f832..c237298fdb0 100644 #define Fail_If(condition) do { \ /*assert(!(condition));*/ \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e9df895ce3a..0e33638c42d 100644 +index e9df895ce3..0e33638c42 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,7 @@ @@ -66,7 +66,7 @@ index e9df895ce3a..0e33638c42d 100644 ${PROJECT_SOURCE_DIR}/libmd5 ${PROJECT_SOURCE_DIR}/liblodepng diff --git a/src/dotrunner.cpp b/src/dotrunner.cpp -index d3b2615f4ed..5be9f20de9c 100644 +index d3b2615f4e..5be9f20de9 100644 --- a/src/dotrunner.cpp +++ b/src/dotrunner.cpp @@ -16,6 +16,8 @@ @@ -202,7 +202,7 @@ index d3b2615f4ed..5be9f20de9c 100644 //--------------------------------------------------------------------------------- diff --git a/src/doxygen.cpp b/src/doxygen.cpp -index 78b72ebfecc..55068e74dcb 100644 +index 78b72ebfec..55068e74dc 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -11930,8 +11930,6 @@ void parseInput() diff --git a/Fix-boundingbox-parsing_part3.patch b/Fix-boundingbox-parsing_part3.patch index 99f20b4..76624e7 100644 --- a/Fix-boundingbox-parsing_part3.patch +++ b/Fix-boundingbox-parsing_part3.patch @@ -9,7 +9,7 @@ Subject: [PATCH] Fix and work around compiler warnings and remove dead code 2 files changed, 11 insertions(+), 35 deletions(-) diff --git a/TinyDeflate/gunzip.hh b/TinyDeflate/gunzip.hh -index c237298fdb0..a631815a255 100644 +index c237298fdb..a631815a25 100644 --- a/TinyDeflate/gunzip.hh +++ b/TinyDeflate/gunzip.hh @@ -430,7 +430,7 @@ namespace gunzip_ns @@ -31,7 +31,7 @@ index c237298fdb0..a631815a255 100644 if(len > maxlen) { diff --git a/src/dotrunner.cpp b/src/dotrunner.cpp -index 5be9f20de9c..9246029cb61 100644 +index 5be9f20de9..9246029cb6 100644 --- a/src/dotrunner.cpp +++ b/src/dotrunner.cpp @@ -16,7 +16,16 @@ diff --git a/Fix-boundingbox-parsing_part4.patch b/Fix-boundingbox-parsing_part4.patch index aeabf31..66c4066 100644 --- a/Fix-boundingbox-parsing_part4.patch +++ b/Fix-boundingbox-parsing_part4.patch @@ -10,7 +10,7 @@ Subject: [PATCH] issue #9319: Doc build fails with cairo 1.17.6 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/TinyDeflate/gunzip.hh b/TinyDeflate/gunzip.hh -index a631815a255..652058ab823 100644 +index a631815a25..652058ab82 100644 --- a/TinyDeflate/gunzip.hh +++ b/TinyDeflate/gunzip.hh @@ -430,7 +430,7 @@ namespace gunzip_ns @@ -23,7 +23,7 @@ index a631815a255..652058ab823 100644 struct result_of : std::invoke_result {}; #else diff --git a/src/dotrunner.cpp b/src/dotrunner.cpp -index 9246029cb61..2e87a0d4a37 100644 +index 9246029cb6..2e87a0d4a3 100644 --- a/src/dotrunner.cpp +++ b/src/dotrunner.cpp @@ -20,6 +20,7 @@ diff --git a/doxygen.changes b/doxygen.changes index 2aa44d5..4d6d236 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Apr 24 12:16:18 UTC 2023 - Dominique Leuenberger + +- Re-download patches: the server presents them with shorter hash + refs: + * Fix-boundingbox-parsing_part1.patch + * Fix-boundingbox-parsing_part2.patch + * Fix-boundingbox-parsing_part3.patch + * Fix-boundingbox-parsing_part4.patch + + ------------------------------------------------------------------- Mon Apr 24 11:40:17 UTC 2023 - Dominique Leuenberger From 771f3b1bd9533b63066004a0c1c09309e8ce9b451b305854333519a09b35c143 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 25 Apr 2023 11:33:31 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=182 --- Fix-boundingbox-parsing_part1.patch | 4 ++-- Fix-boundingbox-parsing_part2.patch | 8 ++++---- Fix-boundingbox-parsing_part3.patch | 4 ++-- Fix-boundingbox-parsing_part4.patch | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Fix-boundingbox-parsing_part1.patch b/Fix-boundingbox-parsing_part1.patch index f23b986..c90d447 100644 --- a/Fix-boundingbox-parsing_part1.patch +++ b/Fix-boundingbox-parsing_part1.patch @@ -12,7 +12,7 @@ Subject: [PATCH] Add TinyDeflate as dependency diff --git a/TinyDeflate/README.md b/TinyDeflate/README.md new file mode 100644 -index 0000000000..8df1acaae2 +index 00000000000..8df1acaae26 --- /dev/null +++ b/TinyDeflate/README.md @@ -0,0 +1,360 @@ @@ -378,7 +378,7 @@ index 0000000000..8df1acaae2 + diff --git a/TinyDeflate/gunzip.hh b/TinyDeflate/gunzip.hh new file mode 100644 -index 0000000000..c0039d5f83 +index 00000000000..c0039d5f832 --- /dev/null +++ b/TinyDeflate/gunzip.hh @@ -0,0 +1,1430 @@ diff --git a/Fix-boundingbox-parsing_part2.patch b/Fix-boundingbox-parsing_part2.patch index 773f5bb..cd4d7a9 100644 --- a/Fix-boundingbox-parsing_part2.patch +++ b/Fix-boundingbox-parsing_part2.patch @@ -11,7 +11,7 @@ Subject: [PATCH] issue #9319: Doc build fails with cairo 1.17.6 4 files changed, 120 insertions(+), 13 deletions(-) diff --git a/TinyDeflate/gunzip.hh b/TinyDeflate/gunzip.hh -index c0039d5f83..c237298fdb 100644 +index c0039d5f832..c237298fdb0 100644 --- a/TinyDeflate/gunzip.hh +++ b/TinyDeflate/gunzip.hh @@ -944,23 +944,27 @@ namespace gunzip_ns @@ -54,7 +54,7 @@ index c0039d5f83..c237298fdb 100644 #define Fail_If(condition) do { \ /*assert(!(condition));*/ \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e9df895ce3..0e33638c42 100644 +index e9df895ce3a..0e33638c42d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,7 @@ @@ -66,7 +66,7 @@ index e9df895ce3..0e33638c42 100644 ${PROJECT_SOURCE_DIR}/libmd5 ${PROJECT_SOURCE_DIR}/liblodepng diff --git a/src/dotrunner.cpp b/src/dotrunner.cpp -index d3b2615f4e..5be9f20de9 100644 +index d3b2615f4ed..5be9f20de9c 100644 --- a/src/dotrunner.cpp +++ b/src/dotrunner.cpp @@ -16,6 +16,8 @@ @@ -202,7 +202,7 @@ index d3b2615f4e..5be9f20de9 100644 //--------------------------------------------------------------------------------- diff --git a/src/doxygen.cpp b/src/doxygen.cpp -index 78b72ebfec..55068e74dc 100644 +index 78b72ebfecc..55068e74dcb 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -11930,8 +11930,6 @@ void parseInput() diff --git a/Fix-boundingbox-parsing_part3.patch b/Fix-boundingbox-parsing_part3.patch index 76624e7..99f20b4 100644 --- a/Fix-boundingbox-parsing_part3.patch +++ b/Fix-boundingbox-parsing_part3.patch @@ -9,7 +9,7 @@ Subject: [PATCH] Fix and work around compiler warnings and remove dead code 2 files changed, 11 insertions(+), 35 deletions(-) diff --git a/TinyDeflate/gunzip.hh b/TinyDeflate/gunzip.hh -index c237298fdb..a631815a25 100644 +index c237298fdb0..a631815a255 100644 --- a/TinyDeflate/gunzip.hh +++ b/TinyDeflate/gunzip.hh @@ -430,7 +430,7 @@ namespace gunzip_ns @@ -31,7 +31,7 @@ index c237298fdb..a631815a25 100644 if(len > maxlen) { diff --git a/src/dotrunner.cpp b/src/dotrunner.cpp -index 5be9f20de9..9246029cb6 100644 +index 5be9f20de9c..9246029cb61 100644 --- a/src/dotrunner.cpp +++ b/src/dotrunner.cpp @@ -16,7 +16,16 @@ diff --git a/Fix-boundingbox-parsing_part4.patch b/Fix-boundingbox-parsing_part4.patch index 66c4066..aeabf31 100644 --- a/Fix-boundingbox-parsing_part4.patch +++ b/Fix-boundingbox-parsing_part4.patch @@ -10,7 +10,7 @@ Subject: [PATCH] issue #9319: Doc build fails with cairo 1.17.6 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/TinyDeflate/gunzip.hh b/TinyDeflate/gunzip.hh -index a631815a25..652058ab82 100644 +index a631815a255..652058ab823 100644 --- a/TinyDeflate/gunzip.hh +++ b/TinyDeflate/gunzip.hh @@ -430,7 +430,7 @@ namespace gunzip_ns @@ -23,7 +23,7 @@ index a631815a25..652058ab82 100644 struct result_of : std::invoke_result {}; #else diff --git a/src/dotrunner.cpp b/src/dotrunner.cpp -index 9246029cb6..2e87a0d4a3 100644 +index 9246029cb61..2e87a0d4a37 100644 --- a/src/dotrunner.cpp +++ b/src/dotrunner.cpp @@ -20,6 +20,7 @@