| 1 |
commit: 8546dc42964239baa014711e0cfcb880a420a3d5 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 26 21:55:54 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 30 05:48:05 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8546dc42 |
| 7 |
|
| 8 |
app-doc/doxygen: Drop 1.8.15 and 1.8.16-r1 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/721400 |
| 11 |
Package-Manager: Portage-3.0.0, Repoman-2.3.23 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
app-doc/doxygen/Manifest | 2 - |
| 15 |
app-doc/doxygen/doxygen-1.8.15.ebuild | 139 -------------------- |
| 16 |
app-doc/doxygen/doxygen-1.8.16-r1.ebuild | 140 --------------------- |
| 17 |
app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch | 25 ---- |
| 18 |
.../files/doxygen-1.8.15-link_with_pthread.patch | 32 ----- |
| 19 |
...en-1.8.16-fix-external-tag-files-with-TOC.patch | 50 -------- |
| 20 |
...oxygen-1.8.16-ghostscript-compatilibility.patch | 39 ------ |
| 21 |
7 files changed, 427 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest |
| 24 |
index 617e2dfa6b3..9fcd0fe810f 100644 |
| 25 |
--- a/app-doc/doxygen/Manifest |
| 26 |
+++ b/app-doc/doxygen/Manifest |
| 27 |
@@ -1,3 +1 @@ |
| 28 |
-DIST doxygen-1.8.15.src.tar.gz 5097791 BLAKE2B 08903bf06666911df0810ea0a7b86066e7682833b03ae5660094112c5c6506f072c5818185ce8166d09328e62092461acdb4516b58fe9369119f5f6bdd64331a SHA512 a5512e78be66c1591d8ec7e284d5d25c92a97218c79e6fed3c538c723a8dfef4ff7085970bf271a6b639e907157cd4df9fb55d3c975f8d3302fb1012a4d92079 |
| 29 |
-DIST doxygen-1.8.16.src.tar.gz 5497317 BLAKE2B ec1ba4242bd3ef669f92101044049f10a6e5c2d69f5a7c8eb47915fdc0846ce4758eb8c1ab28ec61635bf36f83049f603f3b70033f7e22be18685cb1d9826462 SHA512 46a0189aa82d5a687bdd99a904f0c061fccca407d15867d14c8c4d13e8b21a8989e7ccd6af30840803b589ed20dd86084a4db880fba0d3bfa1fdcdd8d23e12de |
| 30 |
DIST doxygen-1.8.17.src.tar.gz 5138888 BLAKE2B 79d7d64fe2104f3fc802e9ee8f5fcd13ed4f0e23fe3e8d8013d1724d917d5f4e7d8c2df672e253aa2c8d67e839a6169632ebd87bc281b8ee70d217f486e402f7 SHA512 2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75 |
| 31 |
|
| 32 |
diff --git a/app-doc/doxygen/doxygen-1.8.15.ebuild b/app-doc/doxygen/doxygen-1.8.15.ebuild |
| 33 |
deleted file mode 100644 |
| 34 |
index a2b7e8c0836..00000000000 |
| 35 |
--- a/app-doc/doxygen/doxygen-1.8.15.ebuild |
| 36 |
+++ /dev/null |
| 37 |
@@ -1,139 +0,0 @@ |
| 38 |
-# Copyright 1999-2020 Gentoo Authors |
| 39 |
-# Distributed under the terms of the GNU General Public License v2 |
| 40 |
- |
| 41 |
-EAPI=6 |
| 42 |
-PYTHON_COMPAT=( python3_6 ) |
| 43 |
- |
| 44 |
-CMAKE_MAKEFILE_GENERATOR="emake" |
| 45 |
- |
| 46 |
-inherit cmake-utils eutils llvm python-any-r1 |
| 47 |
-if [[ ${PV} = *9999* ]]; then |
| 48 |
- inherit git-r3 |
| 49 |
- EGIT_REPO_URI="https://github.com/doxygen/doxygen.git" |
| 50 |
- SRC_URI="" |
| 51 |
-else |
| 52 |
- SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz" |
| 53 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 54 |
-fi |
| 55 |
- |
| 56 |
-DESCRIPTION="Documentation system for most programming languages" |
| 57 |
-HOMEPAGE="http://www.doxygen.org" |
| 58 |
- |
| 59 |
-LICENSE="GPL-2" |
| 60 |
-SLOT="0" |
| 61 |
-IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU" |
| 62 |
- |
| 63 |
-RDEPEND="app-text/ghostscript-gpl |
| 64 |
- dev-lang/perl |
| 65 |
- media-libs/libpng:0= |
| 66 |
- virtual/libiconv |
| 67 |
- clang? ( <sys-devel/clang-10:= ) |
| 68 |
- dot? ( |
| 69 |
- media-gfx/graphviz |
| 70 |
- media-libs/freetype |
| 71 |
- ) |
| 72 |
- doxysearch? ( dev-libs/xapian:= ) |
| 73 |
- latex? ( |
| 74 |
- dev-texlive/texlive-bibtexextra |
| 75 |
- dev-texlive/texlive-fontsextra |
| 76 |
- dev-texlive/texlive-fontutils |
| 77 |
- dev-texlive/texlive-latex |
| 78 |
- dev-texlive/texlive-latexextra |
| 79 |
- ) |
| 80 |
- qt5? ( |
| 81 |
- dev-qt/qtgui:5 |
| 82 |
- dev-qt/qtwidgets:5 |
| 83 |
- dev-qt/qtxml:5 |
| 84 |
- ) |
| 85 |
- sqlite? ( dev-db/sqlite:3 ) |
| 86 |
- " |
| 87 |
- |
| 88 |
-REQUIRED_USE="doc? ( latex )" |
| 89 |
- |
| 90 |
-DEPEND="sys-devel/flex |
| 91 |
- sys-devel/bison |
| 92 |
- doc? ( ${PYTHON_DEPS} ) |
| 93 |
- ${RDEPEND}" |
| 94 |
- |
| 95 |
-# src_test() defaults to make -C testing but there is no such directory (bug #504448) |
| 96 |
-RESTRICT="test" |
| 97 |
- |
| 98 |
-PATCHES=( |
| 99 |
- "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348 |
| 100 |
- "${FILESDIR}/${PN}-1.8.15-link_with_pthread.patch" |
| 101 |
- "${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692 |
| 102 |
- "${FILESDIR}/${PN}-1.8.14-xml-c++.patch" #doxygen/doxygen#6892 |
| 103 |
-) |
| 104 |
- |
| 105 |
-DOCS=( LANGUAGE.HOWTO README.md ) |
| 106 |
- |
| 107 |
-LLVM_MAX_SLOT=9 |
| 108 |
- |
| 109 |
-pkg_setup() { |
| 110 |
- use clang && llvm_pkg_setup |
| 111 |
- use doc && python-any-r1_pkg_setup |
| 112 |
-} |
| 113 |
- |
| 114 |
-src_prepare() { |
| 115 |
- cmake-utils_src_prepare |
| 116 |
- |
| 117 |
- # Ensure we link to -liconv |
| 118 |
- if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then |
| 119 |
- local pro |
| 120 |
- for pro in */*.pro.in */*/*.pro.in; do |
| 121 |
- echo "unix:LIBS += -liconv" >> "${pro}" || die |
| 122 |
- done |
| 123 |
- fi |
| 124 |
- |
| 125 |
- # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 |
| 126 |
- sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die |
| 127 |
- |
| 128 |
- # fix pdf doc |
| 129 |
- sed -i.orig -e "s:g_kowal:g kowal:" \ |
| 130 |
- doc/maintainers.txt || die |
| 131 |
- |
| 132 |
- if is-flagq "-O3" ; then |
| 133 |
- ewarn |
| 134 |
- ewarn "Compiling with -O3 is known to produce incorrectly" |
| 135 |
- ewarn "optimized code which breaks doxygen." |
| 136 |
- ewarn |
| 137 |
- elog |
| 138 |
- elog "Continuing with -O2 instead ..." |
| 139 |
- elog |
| 140 |
- replace-flags "-O3" "-O2" |
| 141 |
- fi |
| 142 |
-} |
| 143 |
- |
| 144 |
-src_configure() { |
| 145 |
- local mycmakeargs=( |
| 146 |
- -Duse_libclang=$(usex clang) |
| 147 |
- -Dbuild_doc=$(usex doc) |
| 148 |
- -Dbuild_search=$(usex doxysearch) |
| 149 |
- -Dbuild_wizard=$(usex qt5) |
| 150 |
- -Duse_sqlite3=$(usex sqlite) |
| 151 |
- ) |
| 152 |
- use doc && mycmakeargs+=( |
| 153 |
- -DDOC_INSTALL_DIR="share/doc/${P}" |
| 154 |
- ) |
| 155 |
- |
| 156 |
- cmake-utils_src_configure |
| 157 |
-} |
| 158 |
- |
| 159 |
-src_compile() { |
| 160 |
- cmake-utils_src_compile |
| 161 |
- |
| 162 |
- if use doc; then |
| 163 |
- export VARTEXFONTS="${T}/fonts" # bug #564944 |
| 164 |
- |
| 165 |
- if ! use dot; then |
| 166 |
- sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ |
| 167 |
- {Doxyfile,doc/Doxyfile} \ |
| 168 |
- || die "disabling dot failed" |
| 169 |
- fi |
| 170 |
- cmake-utils_src_make -C "${BUILD_DIR}" docs |
| 171 |
- fi |
| 172 |
-} |
| 173 |
- |
| 174 |
-src_install() { |
| 175 |
- cmake-utils_src_install |
| 176 |
-} |
| 177 |
|
| 178 |
diff --git a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild |
| 179 |
deleted file mode 100644 |
| 180 |
index 5ad7097b6d4..00000000000 |
| 181 |
--- a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild |
| 182 |
+++ /dev/null |
| 183 |
@@ -1,140 +0,0 @@ |
| 184 |
-# Copyright 1999-2020 Gentoo Authors |
| 185 |
-# Distributed under the terms of the GNU General Public License v2 |
| 186 |
- |
| 187 |
-EAPI=6 |
| 188 |
-PYTHON_COMPAT=( python3_6 ) |
| 189 |
- |
| 190 |
-CMAKE_MAKEFILE_GENERATOR="emake" |
| 191 |
- |
| 192 |
-inherit cmake-utils eutils llvm python-any-r1 |
| 193 |
-if [[ ${PV} = *9999* ]]; then |
| 194 |
- inherit git-r3 |
| 195 |
- EGIT_REPO_URI="https://github.com/doxygen/doxygen.git" |
| 196 |
- SRC_URI="" |
| 197 |
-else |
| 198 |
- SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz" |
| 199 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 200 |
-fi |
| 201 |
- |
| 202 |
-DESCRIPTION="Documentation system for most programming languages" |
| 203 |
-HOMEPAGE="http://www.doxygen.org" |
| 204 |
- |
| 205 |
-LICENSE="GPL-2" |
| 206 |
-SLOT="0" |
| 207 |
-IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU" |
| 208 |
- |
| 209 |
-RDEPEND="app-text/ghostscript-gpl |
| 210 |
- dev-lang/perl |
| 211 |
- media-libs/libpng:0= |
| 212 |
- virtual/libiconv |
| 213 |
- clang? ( <sys-devel/clang-10:= ) |
| 214 |
- dot? ( |
| 215 |
- media-gfx/graphviz |
| 216 |
- media-libs/freetype |
| 217 |
- ) |
| 218 |
- doxysearch? ( dev-libs/xapian:= ) |
| 219 |
- latex? ( |
| 220 |
- dev-texlive/texlive-bibtexextra |
| 221 |
- dev-texlive/texlive-fontsextra |
| 222 |
- dev-texlive/texlive-fontutils |
| 223 |
- dev-texlive/texlive-latex |
| 224 |
- dev-texlive/texlive-latexextra |
| 225 |
- ) |
| 226 |
- qt5? ( |
| 227 |
- dev-qt/qtgui:5 |
| 228 |
- dev-qt/qtwidgets:5 |
| 229 |
- dev-qt/qtxml:5 |
| 230 |
- ) |
| 231 |
- sqlite? ( dev-db/sqlite:3 ) |
| 232 |
- " |
| 233 |
- |
| 234 |
-REQUIRED_USE="doc? ( latex )" |
| 235 |
- |
| 236 |
-DEPEND="sys-devel/flex |
| 237 |
- sys-devel/bison |
| 238 |
- doc? ( ${PYTHON_DEPS} ) |
| 239 |
- ${RDEPEND}" |
| 240 |
- |
| 241 |
-# src_test() defaults to make -C testing but there is no such directory (bug #504448) |
| 242 |
-RESTRICT="test" |
| 243 |
- |
| 244 |
-PATCHES=( |
| 245 |
- "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348 |
| 246 |
- "${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch" |
| 247 |
- "${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692 |
| 248 |
- "${FILESDIR}/${PN}-1.8.16-ghostscript-compatilibility.patch" #695710 |
| 249 |
- "${FILESDIR}/${PN}-1.8.16-fix-external-tag-files-with-TOC.patch" #701930 |
| 250 |
-) |
| 251 |
- |
| 252 |
-DOCS=( LANGUAGE.HOWTO README.md ) |
| 253 |
-LLVM_MAX_SLOT=9 |
| 254 |
- |
| 255 |
-pkg_setup() { |
| 256 |
- use clang && llvm_pkg_setup |
| 257 |
- use doc && python-any-r1_pkg_setup |
| 258 |
-} |
| 259 |
- |
| 260 |
-src_prepare() { |
| 261 |
- cmake-utils_src_prepare |
| 262 |
- |
| 263 |
- # Ensure we link to -liconv |
| 264 |
- if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then |
| 265 |
- local pro |
| 266 |
- for pro in */*.pro.in */*/*.pro.in; do |
| 267 |
- echo "unix:LIBS += -liconv" >> "${pro}" || die |
| 268 |
- done |
| 269 |
- fi |
| 270 |
- |
| 271 |
- # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 |
| 272 |
- sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die |
| 273 |
- |
| 274 |
- # fix pdf doc |
| 275 |
- sed -i.orig -e "s:g_kowal:g kowal:" \ |
| 276 |
- doc/maintainers.txt || die |
| 277 |
- |
| 278 |
- if is-flagq "-O3" ; then |
| 279 |
- ewarn |
| 280 |
- ewarn "Compiling with -O3 is known to produce incorrectly" |
| 281 |
- ewarn "optimized code which breaks doxygen." |
| 282 |
- ewarn |
| 283 |
- elog |
| 284 |
- elog "Continuing with -O2 instead ..." |
| 285 |
- elog |
| 286 |
- replace-flags "-O3" "-O2" |
| 287 |
- fi |
| 288 |
-} |
| 289 |
- |
| 290 |
-src_configure() { |
| 291 |
- local mycmakeargs=( |
| 292 |
- -Duse_libclang=$(usex clang) |
| 293 |
- -Dbuild_doc=$(usex doc) |
| 294 |
- -Dbuild_search=$(usex doxysearch) |
| 295 |
- -Dbuild_wizard=$(usex qt5) |
| 296 |
- -Duse_sqlite3=$(usex sqlite) |
| 297 |
- -DGIT_EXECUTABLE="false" |
| 298 |
- ) |
| 299 |
- use doc && mycmakeargs+=( |
| 300 |
- -DDOC_INSTALL_DIR="share/doc/${P}" |
| 301 |
- ) |
| 302 |
- |
| 303 |
- cmake-utils_src_configure |
| 304 |
-} |
| 305 |
- |
| 306 |
-src_compile() { |
| 307 |
- cmake-utils_src_compile |
| 308 |
- |
| 309 |
- if use doc; then |
| 310 |
- export VARTEXFONTS="${T}/fonts" # bug #564944 |
| 311 |
- |
| 312 |
- if ! use dot; then |
| 313 |
- sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ |
| 314 |
- {Doxyfile,doc/Doxyfile} \ |
| 315 |
- || die "disabling dot failed" |
| 316 |
- fi |
| 317 |
- cmake-utils_src_make -C "${BUILD_DIR}" docs |
| 318 |
- fi |
| 319 |
-} |
| 320 |
- |
| 321 |
-src_install() { |
| 322 |
- cmake-utils_src_install |
| 323 |
-} |
| 324 |
|
| 325 |
diff --git a/app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch b/app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch |
| 326 |
deleted file mode 100644 |
| 327 |
index 8680d19dd46..00000000000 |
| 328 |
--- a/app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch |
| 329 |
+++ /dev/null |
| 330 |
@@ -1,25 +0,0 @@ |
| 331 |
-From f217b5c36b39a294b920437ff66055ee1a3fa5b7 Mon Sep 17 00:00:00 2001 |
| 332 |
-From: albert-github <albert.tests@×××××.com> |
| 333 |
-Date: Tue, 19 Mar 2019 10:42:24 +0100 |
| 334 |
-Subject: [PATCH] issue #6892 xml not well-formed (invalid token) for c++ |
| 335 |
- |
| 336 |
-the `declname` and `defname` should also be converted (compare as well the routine `generateXMLForMember`) |
| 337 |
---- |
| 338 |
- src/xmlgen.cpp | 4 ++-- |
| 339 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
| 340 |
- |
| 341 |
-diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp |
| 342 |
-index 420a653fc..568e48886 100644 |
| 343 |
---- a/src/xmlgen.cpp |
| 344 |
-+++ b/src/xmlgen.cpp |
| 345 |
-@@ -360,8 +360,8 @@ static void writeTemplateArgumentList(ArgumentList *al, |
| 346 |
- } |
| 347 |
- if (!a->name.isEmpty()) |
| 348 |
- { |
| 349 |
-- t << indentStr << " <declname>" << a->name << "</declname>" << endl; |
| 350 |
-- t << indentStr << " <defname>" << a->name << "</defname>" << endl; |
| 351 |
-+ t << indentStr << " <declname>" << convertToXML(a->name) << "</declname>" << endl; |
| 352 |
-+ t << indentStr << " <defname>" << convertToXML(a->name) << "</defname>" << endl; |
| 353 |
- } |
| 354 |
- if (!a->defval.isEmpty()) |
| 355 |
- { |
| 356 |
|
| 357 |
diff --git a/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch |
| 358 |
deleted file mode 100644 |
| 359 |
index 54c0a96e5e1..00000000000 |
| 360 |
--- a/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch |
| 361 |
+++ /dev/null |
| 362 |
@@ -1,32 +0,0 @@ |
| 363 |
---- a/addon/doxysearch/CMakeLists.txt 2019-04-03 18:43:47.995610511 +0200 |
| 364 |
-+++ b/addon/doxysearch/CMakeLists.txt 2019-04-03 18:45:27.730609191 +0200 |
| 365 |
-@@ -18,6 +18,7 @@ |
| 366 |
- ${ZLIB_LIBRARIES} |
| 367 |
- ${WIN_EXTRA_LIBS} |
| 368 |
- qtools |
| 369 |
-+ pthread |
| 370 |
- ) |
| 371 |
- |
| 372 |
- add_executable(doxysearch.cgi |
| 373 |
-@@ -27,6 +28,7 @@ |
| 374 |
- ${XAPIAN_LIBRARIES} |
| 375 |
- ${ZLIB_LIBRARIES} |
| 376 |
- ${WIN_EXTRA_LIBS} |
| 377 |
-+ pthread |
| 378 |
- ) |
| 379 |
- |
| 380 |
- install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin) |
| 381 |
---- a/addon/doxywizard/CMakeLists.txt 2019-04-03 18:43:59.139610364 +0200 |
| 382 |
-+++ b/addon/doxywizard/CMakeLists.txt 2019-04-03 18:45:14.151609371 +0200 |
| 383 |
-@@ -102,9 +102,9 @@ |
| 384 |
- ) |
| 385 |
- |
| 386 |
- if(Qt5Core_FOUND) |
| 387 |
-- target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml) |
| 388 |
-+ target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml pthread) |
| 389 |
- else() |
| 390 |
-- target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY}) |
| 391 |
-+ target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} pthread) |
| 392 |
- endif() |
| 393 |
- |
| 394 |
- install(TARGETS doxywizard DESTINATION bin) |
| 395 |
|
| 396 |
diff --git a/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch b/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch |
| 397 |
deleted file mode 100644 |
| 398 |
index cc0704b440f..00000000000 |
| 399 |
--- a/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch |
| 400 |
+++ /dev/null |
| 401 |
@@ -1,50 +0,0 @@ |
| 402 |
-From 4a72a9b07e805b4ba27560e8e921bcee0002ef4c Mon Sep 17 00:00:00 2001 |
| 403 |
-From: albert-github <albert.tests@×××××.com> |
| 404 |
-Date: Mon, 9 Sep 2019 13:28:28 +0200 |
| 405 |
-Subject: [PATCH] issue #7248: Including external tag files with TOC produces a |
| 406 |
- broken index.qhp |
| 407 |
- |
| 408 |
-Ignore automatically generated anchor names when importing a tag file. |
| 409 |
- |
| 410 |
-Upstream: https://github.com/doxygen/doxygen/pull/7250 |
| 411 |
---- |
| 412 |
- src/tagreader.cpp | 19 ++++++++++++++++++- |
| 413 |
- 1 file changed, 18 insertions(+), 1 deletion(-) |
| 414 |
- |
| 415 |
-diff --git a/src/tagreader.cpp b/src/tagreader.cpp |
| 416 |
-index 56dbe7df9..d79d9b5c5 100644 |
| 417 |
---- a/src/tagreader.cpp |
| 418 |
-+++ b/src/tagreader.cpp |
| 419 |
-@@ -494,6 +494,23 @@ class TagFileParser : public QXmlDefaultHandler |
| 420 |
- |
| 421 |
- void endDocAnchor() |
| 422 |
- { |
| 423 |
-+ // Check whether or not the tag is automatically generate, in that case ignore the tag. |
| 424 |
-+ switch(m_state) |
| 425 |
-+ { |
| 426 |
-+ case InClass: |
| 427 |
-+ case InFile: |
| 428 |
-+ case InNamespace: |
| 429 |
-+ case InGroup: |
| 430 |
-+ case InPage: |
| 431 |
-+ case InMember: |
| 432 |
-+ case InPackage: |
| 433 |
-+ case InDir: |
| 434 |
-+ if (QString(m_curString).startsWith("autotoc_md")) return; |
| 435 |
-+ break; |
| 436 |
-+ default: |
| 437 |
-+ warn("Unexpected tag 'docanchor' found"); |
| 438 |
-+ return; |
| 439 |
-+ } |
| 440 |
- switch(m_state) |
| 441 |
- { |
| 442 |
- case InClass: m_curClass->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break; |
| 443 |
-@@ -504,7 +521,7 @@ class TagFileParser : public QXmlDefaultHandler |
| 444 |
- case InMember: m_curMember->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break; |
| 445 |
- case InPackage: m_curPackage->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break; |
| 446 |
- case InDir: m_curDir->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break; |
| 447 |
-- default: warn("Unexpected tag 'docanchor' found"); break; |
| 448 |
-+ default: warn("Unexpected tag 'docanchor' found"); break; // Not really necessary anymore |
| 449 |
- } |
| 450 |
- } |
| 451 |
- |
| 452 |
|
| 453 |
diff --git a/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch b/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch |
| 454 |
deleted file mode 100644 |
| 455 |
index 55445fa19dc..00000000000 |
| 456 |
--- a/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch |
| 457 |
+++ /dev/null |
| 458 |
@@ -1,39 +0,0 @@ |
| 459 |
-From f08e87623368134c6541af12995b811ef9aff069 Mon Sep 17 00:00:00 2001 |
| 460 |
-From: albert-github <albert.tests@×××××.com> |
| 461 |
-Date: Tue, 12 Nov 2019 11:42:22 +0100 |
| 462 |
-Subject: [PATCH] issue #7290 error: Problem running ghostscript gs -q -g562x56 |
| 463 |
- -r384x384x -sDEVICE=ppmraw -sOutputFile=_form0.pnm -dNOPAUSE -dBATCH -- |
| 464 |
- _form0.ps. Check your installation! |
| 465 |
- |
| 466 |
-@maehr had a talk with Robin Watts and Ken Sharp at IRC and there seem to be basically 3 different problems: |
| 467 |
-* `-r%dx%d` (the dimension for `r` shouldn't be `-r384x384x`, but `-r384x384`), |
| 468 |
-* misuse / unnecessary use of `--` and |
| 469 |
-* since 9.50 the command needs more control access (that might be worked around by either whitelisting the file via `--permit-file-read=_form0.eps` (only works from 9.50 and upwards) or generally accepting any file with `-dNOSAFER` (works since quite some time). The second option is considered to be unsafe if we would process any file, but in this case we process self produced / controlled files. I don't know if doxygen has any threat model that it assumes. ). |
| 470 |
- |
| 471 |
-> Ken Sharp: Yeah the %dx is wrong, as Robin says its sheer luck that works |
| 472 |
-the -- isn't needed and is what's causing the first problem |
| 473 |
-and file control is the new bugbear |
| 474 |
- |
| 475 |
-The suggestions have been implemented and test / docs works now with old and new version. |
| 476 |
---- |
| 477 |
- src/formula.cpp | 4 ++-- |
| 478 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
| 479 |
- |
| 480 |
-diff --git a/src/formula.cpp b/src/formula.cpp |
| 481 |
-index 534f56ac..3d8e6ce1 100644 |
| 482 |
---- a/src/formula.cpp |
| 483 |
-+++ b/src/formula.cpp |
| 484 |
-@@ -193,8 +193,8 @@ void FormulaList::generateBitmaps(const char *path) |
| 485 |
- // used. |
| 486 |
- |
| 487 |
- char gsArgs[4096]; |
| 488 |
-- sprintf(gsArgs,"-q -g%dx%d -r%dx%dx -sDEVICE=ppmraw " |
| 489 |
-- "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -- %s.ps", |
| 490 |
-+ sprintf(gsArgs,"-q -g%dx%d -r%dx%d -sDEVICE=ppmraw " |
| 491 |
-+ "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -dNOSAFER %s.ps", |
| 492 |
- gx,gy,(int)(scaleFactor*72),(int)(scaleFactor*72), |
| 493 |
- formBase.data(),formBase.data() |
| 494 |
- ); |
| 495 |
--- |
| 496 |
-2.24.1 |
| 497 |
- |
Archives