From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 76F11158020 for ; Thu, 10 Nov 2022 06:10:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 692E8E0905; Thu, 10 Nov 2022 06:10:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3FF14E0905 for ; Thu, 10 Nov 2022 06:10:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F342340A5D for ; Thu, 10 Nov 2022 06:10:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6143D599 for ; Thu, 10 Nov 2022 06:10:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1668060531.cdd49b29d2550717d9ca52a3f89d8facf1646ddb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-doc/doxygen/Manifest app-doc/doxygen/doxygen-1.9.1.ebuild app-doc/doxygen/doxygen-1.9.2.ebuild app-doc/doxygen/doxygen-1.9.3.ebuild app-doc/doxygen/files/doxygen-1.8.16-link_with_pthread.patch app-doc/doxygen/files/doxygen-1.8.17-ensure_static_support_libraries.patch app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch app-doc/doxygen/files/doxygen-1.9.2-xml-static.patch X-VCS-Directories: app-doc/doxygen/files/ app-doc/doxygen/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cdd49b29d2550717d9ca52a3f89d8facf1646ddb X-VCS-Branch: master Date: Thu, 10 Nov 2022 06:10:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9f8e4db5-eace-449c-8171-7fa664b20da6 X-Archives-Hash: 252ce48664f716b208aac1c2c0fbf8fc commit: cdd49b29d2550717d9ca52a3f89d8facf1646ddb Author: Sam James gentoo org> AuthorDate: Thu Nov 10 06:08:51 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Nov 10 06:08:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd49b29 app-doc/doxygen: drop 1.9.1, 1.9.2, 1.9.3 Signed-off-by: Sam James gentoo.org> app-doc/doxygen/Manifest | 3 - app-doc/doxygen/doxygen-1.9.1.ebuild | 132 --------------------- app-doc/doxygen/doxygen-1.9.2.ebuild | 132 --------------------- app-doc/doxygen/doxygen-1.9.3.ebuild | 129 -------------------- .../files/doxygen-1.8.16-link_with_pthread.patch | 16 --- ...en-1.8.17-ensure_static_support_libraries.patch | 27 ----- .../files/doxygen-1.8.9.1-empty-line-sigsegv.patch | 20 ---- .../doxygen/files/doxygen-1.9.1-header-dep.patch | 25 ---- .../doxygen/files/doxygen-1.9.2-xml-static.patch | 29 ----- 9 files changed, 513 deletions(-) diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest index a3ec76f59f93..4eeb34d8ba29 100644 --- a/app-doc/doxygen/Manifest +++ b/app-doc/doxygen/Manifest @@ -1,5 +1,2 @@ -DIST doxygen-1.9.1.src.tar.gz 5117435 BLAKE2B 28c1a1cb8390e17e2b399cea765f837782ee268a999606eef4031a5f65943c793c97bdbd2e2a25a39358ecac5df2c7a62aa4cca72753a924e4e718c512b8a9c7 SHA512 637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed -DIST doxygen-1.9.2.src.tar.gz 5076037 BLAKE2B 7b21b228a2049f3048fba744d94066524a0fca37335a7ffd2616fd62a8a7d8d9d28d0bd506245c63771264a279a21f327e5386a9b4c490eea7f79ddd9583b566 SHA512 2729d013b0363a919bbf6babd300389b76e95dd9dbb16ac0f57fc5a0392d3e2076ea4fba958a236311513e68e4aa056a77bd22c9c92b410a17eed095e5adccc0 -DIST doxygen-1.9.3.src.tar.gz 5152094 BLAKE2B 1dabbed1058544159cf369fa1728410545d51857f053d43202fc2b1b19a7fda887fad711efa88770eac98ee7da7cf6fe3d13b03c0525db680b5f5f87f4c16fba SHA512 a4a3efac6897d9aeabc4a1eab6530883da782cdd8461c96b47a82f89328a877c91916d3a338706a8232270732efa37e9f05440cb4034976622e35f301aa1659b DIST doxygen-1.9.4.src.tar.gz 5196383 BLAKE2B 8fe27a8821e3309aa0314586b569a7e295425ba50f4c3e56eb1e2e726f15197c7e1b4c68803b4017345b5a67fddbadcc5a5b30039287a38c3a804bfce844c513 SHA512 613f17800ebd05b66b1954af4d51282a1779678e7ade6c43046fc940742a697ebdf3af8e94ac70a3422bc96def663e70eaea8c4349d192e2fe5e516c57cc345a DIST doxygen-1.9.5.src.tar.gz 5251459 BLAKE2B 46ce6c767ec60ba4b4e2d4e343f78b401b142f242e7037ce8877a5316ad5685a7c080045de793aa8fc1334cd593f9ef5f55d1b6259cb8966ce0b804c8860efbc SHA512 4ad4c1ecd4a12220442f354b90aa56f80e78fcaf288d5e36da421437d59811ed3d429ee13717692886a55b9628ae565d40ce13c51792ccc8bba15b1e018cb651 diff --git a/app-doc/doxygen/doxygen-1.9.1.ebuild b/app-doc/doxygen/doxygen-1.9.1.ebuild deleted file mode 100644 index ba0582b0ce36..000000000000 --- a/app-doc/doxygen/doxygen-1.9.1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit cmake flag-o-matic llvm python-any-r1 -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/doxygen/doxygen.git" -else - SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz" - SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 qt5 sqlite" -# We need TeX for tests, bug #765472 -RESTRICT="!doc? ( test )" - -BDEPEND="sys-devel/bison - sys-devel/flex - ${PYTHON_DEPS} -" -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 - ) - doc? ( - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - dev-texlive/texlive-plaingeneric - ) - doxysearch? ( dev-libs/xapian:= ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - sqlite? ( dev-db/sqlite:3 ) -" -DEPEND="${RDEPEND}" - -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.17-ensure_static_support_libraries.patch" - "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch" - "${FILESDIR}/${PN}-1.9.1-header-dep.patch" - "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch" -) - -DOCS=( LANGUAGE.HOWTO README.md ) - -pkg_setup() { - use clang && llvm_pkg_setup - python-any-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # 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_src_configure -} - -src_compile() { - cmake_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 - - # -j1 for bug #770070 - cmake_src_compile docs -j1 - fi -} - -src_install() { - cmake_src_install -} diff --git a/app-doc/doxygen/doxygen-1.9.2.ebuild b/app-doc/doxygen/doxygen-1.9.2.ebuild deleted file mode 100644 index 0e31081c4367..000000000000 --- a/app-doc/doxygen/doxygen-1.9.2.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit cmake flag-o-matic llvm python-any-r1 -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/doxygen/doxygen.git" -else - SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz" - SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 qt5 sqlite" -# We need TeX for tests, bug #765472 -RESTRICT="!doc? ( test )" - -BDEPEND="sys-devel/bison - sys-devel/flex - ${PYTHON_DEPS} -" -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 - ) - doc? ( - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - dev-texlive/texlive-plaingeneric - ) - doxysearch? ( dev-libs/xapian:= ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - sqlite? ( dev-db/sqlite:3 ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch" - "${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch" - "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch" - "${FILESDIR}/${PN}-1.9.1-header-dep.patch" - "${FILESDIR}/${P}-xml-static.patch" - "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch" -) - -DOCS=( LANGUAGE.HOWTO README.md ) - -pkg_setup() { - use clang && llvm_pkg_setup - python-any-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # 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_src_configure -} - -src_compile() { - cmake_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 - - # -j1 for bug #770070 - cmake_src_compile docs -j1 - fi -} - -src_install() { - cmake_src_install -} diff --git a/app-doc/doxygen/doxygen-1.9.3.ebuild b/app-doc/doxygen/doxygen-1.9.3.ebuild deleted file mode 100644 index b4cc327223aa..000000000000 --- a/app-doc/doxygen/doxygen-1.9.3.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit cmake flag-o-matic llvm python-any-r1 -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/doxygen/doxygen.git" -else - SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz" - SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 qt5 sqlite" -# We need TeX for tests, bug #765472 -RESTRICT="!doc? ( test )" - -BDEPEND="sys-devel/bison - sys-devel/flex - ${PYTHON_DEPS} -" -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 - ) - doc? ( - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - dev-texlive/texlive-plaingeneric - ) - doxysearch? ( dev-libs/xapian:= ) - qt5? ( - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) - sqlite? ( dev-db/sqlite:3 ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch" - "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch" - "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch" -) - -DOCS=( LANGUAGE.HOWTO README.md ) - -pkg_setup() { - use clang && llvm_pkg_setup - python-any-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # 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_src_configure -} - -src_compile() { - cmake_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 - - # -j1 for bug #770070 - cmake_src_compile docs -j1 - fi -} - -src_install() { - cmake_src_install -} diff --git a/app-doc/doxygen/files/doxygen-1.8.16-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.16-link_with_pthread.patch deleted file mode 100644 index c3c49e6b5e7c..000000000000 --- a/app-doc/doxygen/files/doxygen-1.8.16-link_with_pthread.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt -index 6ae71a6..e03ea7c 100644 ---- a/addon/doxywizard/CMakeLists.txt -+++ b/addon/doxywizard/CMakeLists.txt -@@ -104,9 +104,9 @@ doxywizard.rc - ) - - if(Qt5Core_FOUND) -- target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version) -+ target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version pthread) - else() -- target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version) -+ target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version pthread) - endif() - - install(TARGETS doxywizard DESTINATION bin) diff --git a/app-doc/doxygen/files/doxygen-1.8.17-ensure_static_support_libraries.patch b/app-doc/doxygen/files/doxygen-1.8.17-ensure_static_support_libraries.patch deleted file mode 100644 index 285ea16ac96e..000000000000 --- a/app-doc/doxygen/files/doxygen-1.8.17-ensure_static_support_libraries.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d7b0a0ef152312b9242cbbe7405ee49310e7909e Mon Sep 17 00:00:00 2001 -From: Matthias Maier -Date: Sun, 1 Mar 2020 11:50:14 -0600 -Subject: [PATCH] CMake: Mark the libmsc library static - -With CMake 3.16.4 at least we end up with a shared library and -subsequent linking fails. ---- - libmscgen/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt -index 079fcfc..fbf3f4f 100644 ---- a/libmscgen/CMakeLists.txt -+++ b/libmscgen/CMakeLists.txt -@@ -16,7 +16,7 @@ foreach(lex_file ${LEX_FILES}) - FLEX_TARGET(${lex_file} ${lex_file}.l ${GENERATED_SRC}/${lex_file}.cpp COMPILE_FLAGS "${LEX_FLAGS}") - endforeach() - --add_library(mscgen -+add_library(mscgen STATIC - gd.c - gd_security.c - gdfontt.c --- -2.24.1 - diff --git a/app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch b/app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch deleted file mode 100644 index cfa56174c5eb..000000000000 --- a/app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch +++ /dev/null @@ -1,20 +0,0 @@ -removeEmptyLines() segfaults on empty string - -https://bugs.gentoo.org/show_bug.cgi?id=454348 -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676423 - -Patch written by Thibaut Paumard ---- a/src/htmlgen.cpp -+++ b/src/htmlgen.cpp -@@ -1022,6 +1022,11 @@ - static QCString removeEmptyLines(const QCString &s) - { - BufStr out(s.length()+1); -+ if (s.length()==0) -+ { -+ out.addChar('\0'); -+ return out.data(); -+ } - const char *p=s.data(); - if (p) - { diff --git a/app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch b/app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch deleted file mode 100644 index 66e647cf53b5..000000000000 --- a/app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6ea1b4104fe2524c9c1f2cdd5f7de8c1a48f3f87 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -Date: Tue, 14 Sep 2021 20:56:20 +0100 -Subject: [PATCH] Fix missing dependency on configvalues.h - -It's referenced by config.h, which is referenced by most things. - -This was failing to build for me with Ninja on the m68k Linux platform. I don't know why it works elsewhere, could just be luck. - ---- - src/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 18406488dd..0e0c5f78de 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -215,6 +215,7 @@ add_library(doxymain STATIC - ${GENERATED_SRC}/ce_parse.cpp - # custom generated files - ${GENERATED_SRC}/lang_cfg.h -+ ${GENERATED_SRC}/configvalues.h - ${GENERATED_SRC}/ce_parse.h - ${GENERATED_SRC}/resources.cpp - # diff --git a/app-doc/doxygen/files/doxygen-1.9.2-xml-static.patch b/app-doc/doxygen/files/doxygen-1.9.2-xml-static.patch deleted file mode 100644 index a106d6eb5a93..000000000000 --- a/app-doc/doxygen/files/doxygen-1.9.2-xml-static.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://github.com/doxygen/doxygen/pull/8862 -https://github.com/doxygen/doxygen/issues/8855 - -[sam: deleted msc hunk b/c we had it in a patch of our -own.] - -From 5c3a4ad2773fc911b341b36b00528603afbe1602 Mon Sep 17 00:00:00 2001 -From: albert-github -Date: Wed, 27 Oct 2021 16:41:28 +0200 -Subject: [PATCH] issue #8855 Unable to build 1.9.2 - -All other libraries have been declared STATIC so better to declare the cmls and mscgen libraries also STATIC. ---- - libxml/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libxml/CMakeLists.txt b/libxml/CMakeLists.txt -index 96c56534f9..596ed90887 100644 ---- a/libxml/CMakeLists.txt -+++ b/libxml/CMakeLists.txt -@@ -11,7 +11,7 @@ set_source_files_properties(${GENERATED_SRC}/xml.l.h PROPERTIES GENERATED 1) - - FLEX_TARGET(xml xml.l ${GENERATED_SRC}/xml.cpp COMPILE_FLAGS "${LEX_FLAGS}") - --add_library(xml -+add_library(xml STATIC - ${GENERATED_SRC}/xml.cpp - ${GENERATED_SRC}/xml.l.h - )