summaryrefslogtreecommitdiff
path: root/app-doc/doxygen
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-09-30 17:27:54 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-09-30 17:27:54 +0100
commitf70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
treee907cb121b30e3c1df1710719c0ddf4029597a47 /app-doc/doxygen
parentdb063b515939ab15261136b24e4bc44386335c0c (diff)
gentoo resync : 30.09.2020
Diffstat (limited to 'app-doc/doxygen')
-rw-r--r--app-doc/doxygen/Manifest8
-rw-r--r--app-doc/doxygen/doxygen-1.8.15.ebuild139
-rw-r--r--app-doc/doxygen/doxygen-1.8.16-r1.ebuild140
-rw-r--r--app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch25
-rw-r--r--app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch32
-rw-r--r--app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch50
-rw-r--r--app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch39
7 files changed, 0 insertions, 433 deletions
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 05235b9a3607..ba7cf9ac39ee 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,17 +1,9 @@
AUX doxygen-1.8.12-link_with_pthread.patch 1078 BLAKE2B bcf05d8e2c56e4c5a026ea8e8662e247aa48fb4c3ffeb2a26799ae98f1bbd1a9f9cfc55bcad4b9d254d6067fce8e51990ab9cecfcfa6fa9b1a9861c085525966 SHA512 01173974a66a4b6214f6506f9f9009da2ae3ee1b6f424763dfc2b1ce96293e71b463b1afb4c6ccdeac299c66132bbf6d3ee7fe543f1251ff429107f8b4017831
-AUX doxygen-1.8.14-xml-c++.patch 1064 BLAKE2B f75ead2f58b1dee3854061cb2554a5e9387b6f2d205bd2f8b231124281dd3b91b0f79cfb3059a02a56a579ebc68e4b8194755187c4a4ff7a582b2d11d72cadb7 SHA512 08f2e27a689fed08221ff3c4897be1054f5cf9be50cd131e48d6c05d4b3e87d1ffe2233193dba0667108977bb50ccd76694e6e66b92c625c286f1e34e5d3322a
-AUX doxygen-1.8.15-link_with_pthread.patch 1119 BLAKE2B 3c4dbb0440134d96e7879f4d18869eeffb06a43726dd6ce0441fc1f4bc4664088ebc185f38c1685adf3ddcff1de45a9a0b11e38206c9592c42cb7d45c2ba3f60 SHA512 fc7623892cdfc0fd93a9470ed7c29723b53f690618d86bdb9d4afd387af7dccd36c8b6a54b86d46c464a7960aa557570589e874cbd0ad825a379493143610e77
AUX doxygen-1.8.15-llvm7.patch 495 BLAKE2B 937de77966f8f7239469d02a442b7438c4de759b8f162d1ff2b6cee2c3b5097894c7ed2d14454e0051cfe707aa26605a0551da7ff1e69a608e171ce22adb5b7c SHA512 9dced7f1399a12a4e943f3d3353c771033e66eec11d102483909f16ffe2fded2e766362059a20198e325755f01751d419c5dccdb2f5a5c807bb7b4d3b73cd0bf
-AUX doxygen-1.8.16-fix-external-tag-files-with-TOC.patch 1968 BLAKE2B 739a9ace2ca96be8b696e7ac24f5ec1303e26f6f02250d5cb8eb26bbf41931905c976ceafd732daedf8260d1e19b4a056a779d984712bcc966c45d8a942ca151 SHA512 a0055694b216a89ccccdc763d02be92fd582f2230bd600062c8043afaca199502a2764eb19570ca0af4db4d43040d4f77e1ed5d5ff006d45747941c654f734ea
-AUX doxygen-1.8.16-ghostscript-compatilibility.patch 2046 BLAKE2B 5d2016db1ff06329347ad653537f00c9e5d0de74cbf07c9b1b988b24f140f7a5db136a6dde2fd1ee4cfa935d99cfc81196bc4ede8d32ae6a0b9b37c87b04c547 SHA512 398db683a53059a051b1a123567e870d9f46fb637716b3665af2fadfbd69de3297f4df5beeb7ed4faa38ef762775b7de0aea91fc00abb938059af693ff8cf75a
AUX doxygen-1.8.16-link_with_pthread.patch 691 BLAKE2B c6ced2c6aeb199d7f8ad39f39a90747d886e0841103a27d105fc40242fbb5dd289a3ff640203fe1d97bb51fdd559bb94dfddf4e2364d4bc630d861c75ff079f0 SHA512 5b23cc35faf571229b9ff7f1dd4745ade10d5ef0935d1ac9455e0036517ec3e038aacd1a565604f1621aa2c42584240939269777321993b02645334ca7dd18fa
AUX doxygen-1.8.17-ensure_static_support_libraries.patch 817 BLAKE2B 085e2c853e10b22f1be38bd85abb3f33b3cefd4fdb565b244626785d6e54972404638c956c9f03b06022184e8308c1b1b4715f5ef83a8cf34b9a7b938e951152 SHA512 bc076b02f5f9d2886d25ac2f1800475990542e956b59afedea2dfadb262bdb317a44f91b47fbd8cd27f77476e215629aeaf1d03a9cbf24f1aafa822a382bb05c
AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
-DIST doxygen-1.8.15.src.tar.gz 5097791 BLAKE2B 08903bf06666911df0810ea0a7b86066e7682833b03ae5660094112c5c6506f072c5818185ce8166d09328e62092461acdb4516b58fe9369119f5f6bdd64331a SHA512 a5512e78be66c1591d8ec7e284d5d25c92a97218c79e6fed3c538c723a8dfef4ff7085970bf271a6b639e907157cd4df9fb55d3c975f8d3302fb1012a4d92079
-DIST doxygen-1.8.16.src.tar.gz 5497317 BLAKE2B ec1ba4242bd3ef669f92101044049f10a6e5c2d69f5a7c8eb47915fdc0846ce4758eb8c1ab28ec61635bf36f83049f603f3b70033f7e22be18685cb1d9826462 SHA512 46a0189aa82d5a687bdd99a904f0c061fccca407d15867d14c8c4d13e8b21a8989e7ccd6af30840803b589ed20dd86084a4db880fba0d3bfa1fdcdd8d23e12de
DIST doxygen-1.8.17.src.tar.gz 5138888 BLAKE2B 79d7d64fe2104f3fc802e9ee8f5fcd13ed4f0e23fe3e8d8013d1724d917d5f4e7d8c2df672e253aa2c8d67e839a6169632ebd87bc281b8ee70d217f486e402f7 SHA512 2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75
-EBUILD doxygen-1.8.15.ebuild 3233 BLAKE2B a93bd53bf77ef393c5bc970d20d381f332011a7372337d1d82d08e6b979924e89d03a23ff79a94d869aeb36591255bcc0e064a497dabe47a247affaefa9b3a1e SHA512 81db790474ec2f7d5ca3402aa2d0d63d1db555ea7d667602651bd2b770b6ff9dc737e71c9551bd97f7a84b2cbf4ef4cb413ff789fb9d845a401df49f5b6265ab
-EBUILD doxygen-1.8.16-r1.ebuild 3339 BLAKE2B e1961eb2643f4d171593a854da3360eba8029617100e879b93fbbee3a666edc209b60b4ab0b997f93188ce838a407e78b360e5a7d09b6c6e12e546b5dccefa0a SHA512 722ea09c9a797dc5ed60b4b198764202ec114357155ed4f30ae89a32506019df3b2f7db95da04f16044ce9c256a30ad9161d86dbf653886d8ef58012fcc5351d
EBUILD doxygen-1.8.17.ebuild 3229 BLAKE2B bbefd6742c5dc0d21eca4636aa57f189c4cc150cb50211d0e7a80137348a811697dd89622dfe7b281417ebd9ed0397d8a03fb284e6ff92c7b29ad8216c6ca483 SHA512 b15e9ff7a4730d34dfc94bbc25a667d58a2a8db91434b3989b08393b896a1473f1c4cfbf1309253adf794c50515a2553ddf2ae593553536b130727f165d6f705
EBUILD doxygen-9999.ebuild 2892 BLAKE2B d9fa09ab0c9ea4d8771ec6e6a4f290aab7ca37ded9281469a1035e3d3fda477d60f7241f0ac8f40ada6ca643b308b2048c11477d5bfd737f20983bb4031bef00 SHA512 6781ed49e6a4020ab732b7ff69aead2127660d51f37150eec6c97a4231d3c266c7dc51f66918f52ed35f5b37e9d1ec376dab75a046872efb206fb1ef5661f7ad
MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.15.ebuild b/app-doc/doxygen/doxygen-1.8.15.ebuild
deleted file mode 100644
index a2b7e8c08367..000000000000
--- a/app-doc/doxygen/doxygen-1.8.15.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils eutils llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
- SRC_URI=""
-else
- SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
- 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"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
- dev-lang/perl
- media-libs/libpng:0=
- virtual/libiconv
- clang? ( <sys-devel/clang-10:= )
- dot? (
- media-gfx/graphviz
- media-libs/freetype
- )
- doxysearch? ( dev-libs/xapian:= )
- latex? (
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- qt5? (
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
- sqlite? ( dev-db/sqlite:3 )
- "
-
-REQUIRED_USE="doc? ( latex )"
-
-DEPEND="sys-devel/flex
- sys-devel/bison
- doc? ( ${PYTHON_DEPS} )
- ${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
- "${FILESDIR}/${PN}-1.8.15-link_with_pthread.patch"
- "${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692
- "${FILESDIR}/${PN}-1.8.14-xml-c++.patch" #doxygen/doxygen#6892
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-LLVM_MAX_SLOT=9
-
-pkg_setup() {
- use clang && llvm_pkg_setup
- use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # Ensure we link to -liconv
- if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
- local pro
- for pro in */*.pro.in */*/*.pro.in; do
- echo "unix:LIBS += -liconv" >> "${pro}" || die
- done
- fi
-
- # Call dot with -Teps instead of -Tps for EPS generation - bug #282150
- sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
- # fix pdf doc
- sed -i.orig -e "s:g_kowal:g kowal:" \
- doc/maintainers.txt || die
-
- if is-flagq "-O3" ; then
- ewarn
- ewarn "Compiling with -O3 is known to produce incorrectly"
- ewarn "optimized code which breaks doxygen."
- ewarn
- elog
- elog "Continuing with -O2 instead ..."
- elog
- replace-flags "-O3" "-O2"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -Duse_libclang=$(usex clang)
- -Dbuild_doc=$(usex doc)
- -Dbuild_search=$(usex doxysearch)
- -Dbuild_wizard=$(usex qt5)
- -Duse_sqlite3=$(usex sqlite)
- )
- use doc && mycmakeargs+=(
- -DDOC_INSTALL_DIR="share/doc/${P}"
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use doc; then
- export VARTEXFONTS="${T}/fonts" # bug #564944
-
- if ! use dot; then
- sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \
- {Doxyfile,doc/Doxyfile} \
- || die "disabling dot failed"
- fi
- cmake-utils_src_make -C "${BUILD_DIR}" docs
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-}
diff --git a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
deleted file mode 100644
index 5ad7097b6d4f..000000000000
--- a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils eutils llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
- SRC_URI=""
-else
- SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
- 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"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
- dev-lang/perl
- media-libs/libpng:0=
- virtual/libiconv
- clang? ( <sys-devel/clang-10:= )
- dot? (
- media-gfx/graphviz
- media-libs/freetype
- )
- doxysearch? ( dev-libs/xapian:= )
- latex? (
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- qt5? (
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
- sqlite? ( dev-db/sqlite:3 )
- "
-
-REQUIRED_USE="doc? ( latex )"
-
-DEPEND="sys-devel/flex
- sys-devel/bison
- doc? ( ${PYTHON_DEPS} )
- ${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
- "${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
- "${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692
- "${FILESDIR}/${PN}-1.8.16-ghostscript-compatilibility.patch" #695710
- "${FILESDIR}/${PN}-1.8.16-fix-external-tag-files-with-TOC.patch" #701930
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-LLVM_MAX_SLOT=9
-
-pkg_setup() {
- use clang && llvm_pkg_setup
- use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # Ensure we link to -liconv
- if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
- local pro
- for pro in */*.pro.in */*/*.pro.in; do
- echo "unix:LIBS += -liconv" >> "${pro}" || die
- done
- fi
-
- # Call dot with -Teps instead of -Tps for EPS generation - bug #282150
- sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
- # fix pdf doc
- sed -i.orig -e "s:g_kowal:g kowal:" \
- doc/maintainers.txt || die
-
- if is-flagq "-O3" ; then
- ewarn
- ewarn "Compiling with -O3 is known to produce incorrectly"
- ewarn "optimized code which breaks doxygen."
- ewarn
- elog
- elog "Continuing with -O2 instead ..."
- elog
- replace-flags "-O3" "-O2"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -Duse_libclang=$(usex clang)
- -Dbuild_doc=$(usex doc)
- -Dbuild_search=$(usex doxysearch)
- -Dbuild_wizard=$(usex qt5)
- -Duse_sqlite3=$(usex sqlite)
- -DGIT_EXECUTABLE="false"
- )
- use doc && mycmakeargs+=(
- -DDOC_INSTALL_DIR="share/doc/${P}"
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use doc; then
- export VARTEXFONTS="${T}/fonts" # bug #564944
-
- if ! use dot; then
- sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \
- {Doxyfile,doc/Doxyfile} \
- || die "disabling dot failed"
- fi
- cmake-utils_src_make -C "${BUILD_DIR}" docs
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-}
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
deleted file mode 100644
index 8680d19dd46f..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f217b5c36b39a294b920437ff66055ee1a3fa5b7 Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Tue, 19 Mar 2019 10:42:24 +0100
-Subject: [PATCH] issue #6892 xml not well-formed (invalid token) for c++
-
-the `declname` and `defname` should also be converted (compare as well the routine `generateXMLForMember`)
----
- src/xmlgen.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
-index 420a653fc..568e48886 100644
---- a/src/xmlgen.cpp
-+++ b/src/xmlgen.cpp
-@@ -360,8 +360,8 @@ static void writeTemplateArgumentList(ArgumentList *al,
- }
- if (!a->name.isEmpty())
- {
-- t << indentStr << " <declname>" << a->name << "</declname>" << endl;
-- t << indentStr << " <defname>" << a->name << "</defname>" << endl;
-+ t << indentStr << " <declname>" << convertToXML(a->name) << "</declname>" << endl;
-+ t << indentStr << " <defname>" << convertToXML(a->name) << "</defname>" << endl;
- }
- if (!a->defval.isEmpty())
- {
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
deleted file mode 100644
index 54c0a96e5e1a..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/addon/doxysearch/CMakeLists.txt 2019-04-03 18:43:47.995610511 +0200
-+++ b/addon/doxysearch/CMakeLists.txt 2019-04-03 18:45:27.730609191 +0200
-@@ -18,6 +18,7 @@
- ${ZLIB_LIBRARIES}
- ${WIN_EXTRA_LIBS}
- qtools
-+ pthread
- )
-
- add_executable(doxysearch.cgi
-@@ -27,6 +28,7 @@
- ${XAPIAN_LIBRARIES}
- ${ZLIB_LIBRARIES}
- ${WIN_EXTRA_LIBS}
-+ pthread
- )
-
- install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin)
---- a/addon/doxywizard/CMakeLists.txt 2019-04-03 18:43:59.139610364 +0200
-+++ b/addon/doxywizard/CMakeLists.txt 2019-04-03 18:45:14.151609371 +0200
-@@ -102,9 +102,9 @@
- )
-
- if(Qt5Core_FOUND)
-- target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml)
-+ target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml pthread)
- else()
-- target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
-+ target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} pthread)
- endif()
-
- install(TARGETS doxywizard DESTINATION bin)
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
deleted file mode 100644
index cc0704b440f6..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4a72a9b07e805b4ba27560e8e921bcee0002ef4c Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Mon, 9 Sep 2019 13:28:28 +0200
-Subject: [PATCH] issue #7248: Including external tag files with TOC produces a
- broken index.qhp
-
-Ignore automatically generated anchor names when importing a tag file.
-
-Upstream: https://github.com/doxygen/doxygen/pull/7250
----
- src/tagreader.cpp | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/src/tagreader.cpp b/src/tagreader.cpp
-index 56dbe7df9..d79d9b5c5 100644
---- a/src/tagreader.cpp
-+++ b/src/tagreader.cpp
-@@ -494,6 +494,23 @@ class TagFileParser : public QXmlDefaultHandler
-
- void endDocAnchor()
- {
-+ // Check whether or not the tag is automatically generate, in that case ignore the tag.
-+ switch(m_state)
-+ {
-+ case InClass:
-+ case InFile:
-+ case InNamespace:
-+ case InGroup:
-+ case InPage:
-+ case InMember:
-+ case InPackage:
-+ case InDir:
-+ if (QString(m_curString).startsWith("autotoc_md")) return;
-+ break;
-+ default:
-+ warn("Unexpected tag 'docanchor' found");
-+ return;
-+ }
- switch(m_state)
- {
- case InClass: m_curClass->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
-@@ -504,7 +521,7 @@ class TagFileParser : public QXmlDefaultHandler
- case InMember: m_curMember->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
- case InPackage: m_curPackage->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
- case InDir: m_curDir->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
-- default: warn("Unexpected tag 'docanchor' found"); break;
-+ default: warn("Unexpected tag 'docanchor' found"); break; // Not really necessary anymore
- }
- }
-
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
deleted file mode 100644
index 55445fa19dc4..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f08e87623368134c6541af12995b811ef9aff069 Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Tue, 12 Nov 2019 11:42:22 +0100
-Subject: [PATCH] issue #7290 error: Problem running ghostscript gs -q -g562x56
- -r384x384x -sDEVICE=ppmraw -sOutputFile=_form0.pnm -dNOPAUSE -dBATCH --
- _form0.ps. Check your installation!
-
-@maehr had a talk with Robin Watts and Ken Sharp at IRC and there seem to be basically 3 different problems:
-* `-r%dx%d` (the dimension for `r` shouldn't be `-r384x384x`, but `-r384x384`),
-* misuse / unnecessary use of `--` and
-* 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. ).
-
-> Ken Sharp: Yeah the %dx is wrong, as Robin says its sheer luck that works
-the -- isn't needed and is what's causing the first problem
-and file control is the new bugbear
-
-The suggestions have been implemented and test / docs works now with old and new version.
----
- src/formula.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/formula.cpp b/src/formula.cpp
-index 534f56ac..3d8e6ce1 100644
---- a/src/formula.cpp
-+++ b/src/formula.cpp
-@@ -193,8 +193,8 @@ void FormulaList::generateBitmaps(const char *path)
- // used.
-
- char gsArgs[4096];
-- sprintf(gsArgs,"-q -g%dx%d -r%dx%dx -sDEVICE=ppmraw "
-- "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -- %s.ps",
-+ sprintf(gsArgs,"-q -g%dx%d -r%dx%d -sDEVICE=ppmraw "
-+ "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -dNOSAFER %s.ps",
- gx,gy,(int)(scaleFactor*72),(int)(scaleFactor*72),
- formBase.data(),formBase.data()
- );
---
-2.24.1
-