* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/
@ 2022-05-14 20:40 Matthias Maier
0 siblings, 0 replies; 11+ messages in thread
From: Matthias Maier @ 2022-05-14 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 03f0bf4cdacfe0c0ce7fb7e5efe62d2b61b42115
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 20:37:58 2022 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat May 14 20:40:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03f0bf4c
app-doc/doxygen: do not force -std=libc++ when compiling with clang
Closes: https://bugs.gentoo.org/822615
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-doc/doxygen/doxygen-1.9.1.ebuild | 1 +
app-doc/doxygen/doxygen-1.9.2.ebuild | 1 +
app-doc/doxygen/doxygen-1.9.3.ebuild | 1 +
app-doc/doxygen/doxygen-1.9.4.ebuild | 1 +
.../doxygen/files/doxygen-1.9.1-do_not_force_libcxx.patch | 13 +++++++++++++
5 files changed, 17 insertions(+)
diff --git a/app-doc/doxygen/doxygen-1.9.1.ebuild b/app-doc/doxygen/doxygen-1.9.1.ebuild
index ae3d7c399068..ba0582b0ce36 100644
--- a/app-doc/doxygen/doxygen-1.9.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.1.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
"${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 )
diff --git a/app-doc/doxygen/doxygen-1.9.2.ebuild b/app-doc/doxygen/doxygen-1.9.2.ebuild
index 11119d56adfb..4549a203399b 100644
--- a/app-doc/doxygen/doxygen-1.9.2.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.2.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
"${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 )
diff --git a/app-doc/doxygen/doxygen-1.9.3.ebuild b/app-doc/doxygen/doxygen-1.9.3.ebuild
index 079039828291..b4cc327223aa 100644
--- a/app-doc/doxygen/doxygen-1.9.3.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.3.ebuild
@@ -58,6 +58,7 @@ 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 )
diff --git a/app-doc/doxygen/doxygen-1.9.4.ebuild b/app-doc/doxygen/doxygen-1.9.4.ebuild
index dde798573c04..925f54421fa8 100644
--- a/app-doc/doxygen/doxygen-1.9.4.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.4.ebuild
@@ -58,6 +58,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-1.9.4-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 )
diff --git a/app-doc/doxygen/files/doxygen-1.9.1-do_not_force_libcxx.patch b/app-doc/doxygen/files/doxygen-1.9.1-do_not_force_libcxx.patch
new file mode 100644
index 000000000000..f33f619e62ed
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.9.1-do_not_force_libcxx.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3775ed1..b3a1af6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,7 @@ option(build_doc "Build user manual (HTML and PDF)" OFF)
+ option(build_doc_chm "Build user manual (CHM)" OFF)
+ option(use_sqlite3 "Add support for sqlite3 output [experimental]." OFF)
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+- option(use_libc++ "Use libc++ as C++ standard library." ON)
++ option(use_libc++ "Use libc++ as C++ standard library." OFF)
+ endif()
+ option(use_libclang "Add support for libclang parsing." OFF)
+ option(static_libclang "Link to a statically compiled version of LLVM/libclang." OFF)
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/
@ 2023-05-27 3:06 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-05-27 3:06 UTC (permalink / raw
To: gentoo-commits
commit: fc9a4259cd3050b1e94947dc2c9738bf29f62036
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 03:05:07 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 27 03:05:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc9a4259
app-doc/doxygen: fix build w/ musl-1.2.4
Closes: https://bugs.gentoo.org/906920
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-doc/doxygen/doxygen-1.9.7-r1.ebuild | 1 +
app-doc/doxygen/doxygen-9999.ebuild | 1 +
.../doxygen/files/doxygen-1.9.7-musl-1.2.4.patch | 26 ++++++++++++++++++++++
3 files changed, 28 insertions(+)
diff --git a/app-doc/doxygen/doxygen-1.9.7-r1.ebuild b/app-doc/doxygen/doxygen-1.9.7-r1.ebuild
index 3d5cb989116b..367e877520b0 100644
--- a/app-doc/doxygen/doxygen-1.9.7-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.7-r1.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch"
"${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
"${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch"
+ "${FILESDIR}/${PN}-1.9.7-musl-1.2.4.patch"
)
DOCS=( LANGUAGE.HOWTO README.md )
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 3d5cb989116b..367e877520b0 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch"
"${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
"${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch"
+ "${FILESDIR}/${PN}-1.9.7-musl-1.2.4.patch"
)
DOCS=( LANGUAGE.HOWTO README.md )
diff --git a/app-doc/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch b/app-doc/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch
new file mode 100644
index 000000000000..2c71a0af9ae8
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/906920
+https://gitlab.exherbo.org/exherbo/arbor/-/commit/7b517ba0068adc471fe7b2ed8cfbb191a197ca17
+
+From 6d713aa98b36ee8219294515142c0225fbd09dfc Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Thu, 25 May 2023 10:52:29 +0200
+Subject: [PATCH] Apply upstream fix for spdlog
+
+Fixes the build with musl >= 1.2.4, see
+https://github.com/gabime/spdlog/commit/287a00d364990edbb621fe5e392aeb550135fb96
+for details.
+--- a/deps/spdlog/include/spdlog/details/os-inl.h
++++ b/deps/spdlog/include/spdlog/details/os-inl.h
+@@ -236,8 +236,8 @@ SPDLOG_INLINE size_t filesize(FILE *f)
+ # else
+ int fd = ::fileno(f);
+ # endif
+-// 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
+-# if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
++// 64 bits(but not in osx, linux/musl or cygwin, where fstat64 is deprecated)
++# if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
+ struct stat64 st;
+ if (::fstat64(fd, &st) == 0)
+ {
+--
+2.41.0.rc2
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/
@ 2022-11-10 6:10 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-11-10 6:10 UTC (permalink / raw
To: gentoo-commits
commit: cdd49b29d2550717d9ca52a3f89d8facf1646ddb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 06:08:51 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 ----
| 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 <tamiko@43-1.org>
-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 <paumard@users.sourceforge.net>
---- 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 <chewi@gentoo.org>
-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 <albert.tests@gmail.com>
-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
- )
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/
@ 2021-09-15 22:03 James Le Cuirot
0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2021-09-15 22:03 UTC (permalink / raw
To: gentoo-commits
commit: bc6813534a01bb4eb0dd15442672af080a48ac12
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 22:02:45 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Sep 15 22:02:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc681353
app-doc/doxygen: Patch to add missing header dependency for 1.9.1
It was failing to build with Ninja, but only on m68k for some bizarre
reason. Probably just luck.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
app-doc/doxygen/doxygen-1.9.1.ebuild | 1 +
app-doc/doxygen/doxygen-9999.ebuild | 1 +
| 25 ++++++++++++++++++++++
3 files changed, 27 insertions(+)
diff --git a/app-doc/doxygen/doxygen-1.9.1.ebuild b/app-doc/doxygen/doxygen-1.9.1.ebuild
index feb75a0f08a..836656783af 100644
--- a/app-doc/doxygen/doxygen-1.9.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.1.ebuild
@@ -59,6 +59,7 @@ 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"
)
DOCS=( LANGUAGE.HOWTO README.md )
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 16ef846e3b6..4ab0c394c06 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -59,6 +59,7 @@ 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"
)
DOCS=( LANGUAGE.HOWTO README.md )
--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
new file mode 100644
index 00000000000..66e647cf53b
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch
@@ -0,0 +1,25 @@
+From 6ea1b4104fe2524c9c1f2cdd5f7de8c1a48f3f87 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+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
+ #
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/
@ 2020-12-10 19:14 Matthias Maier
0 siblings, 0 replies; 11+ messages in thread
From: Matthias Maier @ 2020-12-10 19:14 UTC (permalink / raw
To: gentoo-commits
commit: 9029f41ab66a980289f88eb31c7eb8cd15331416
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 19:13:12 2020 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 19:13:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9029f41a
app-doc/doxygen: add LLVM 10/11 compatibility patch
* apply in revision bump and mark as stable
Closes: https://bugs.gentoo.org/730170
Package-Manager: Portage-3.0.11, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-doc/doxygen/doxygen-1.8.17-r1.ebuild | 137 ++++++++++++++++++++++
app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch | 42 +++++++
2 files changed, 179 insertions(+)
diff --git a/app-doc/doxygen/doxygen-1.8.17-r1.ebuild b/app-doc/doxygen/doxygen-1.8.17-r1.ebuild
new file mode 100644
index 00000000000..20cd6cf9312
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.17-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-utils eutils flag-o-matic 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 ~riscv 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 qt5 sqlite userland_GNU"
+
+RDEPEND="app-text/ghostscript-gpl
+ dev-lang/perl
+ media-libs/libpng:0=
+ virtual/libiconv
+ clang? ( sys-devel/clang:= )
+ 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
+ )
+ doxysearch? ( dev-libs/xapian:= )
+ qt5? (
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
+ sqlite? ( dev-db/sqlite:3 )
+ "
+
+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.17-ensure_static_support_libraries.patch"
+ "${FILESDIR}/${PN}-1.8.17-llvm10.patch" #730170
+)
+
+DOCS=( LANGUAGE.HOWTO README.md )
+
+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.17-llvm10.patch b/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch
new file mode 100644
index 00000000000..2b2ca0ef733
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch
@@ -0,0 +1,42 @@
+diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
+index ae52cab..04b9293 100644
+--- a/addon/doxyapp/CMakeLists.txt
++++ b/addon/doxyapp/CMakeLists.txt
+@@ -14,7 +14,7 @@ doxyapp.cpp
+ )
+
+ if (use_libclang)
+- set(CLANG_LIBS libclang clangTooling ${llvm_libs})
++ set(CLANG_LIBS libclang clang-cpp ${llvm_libs})
+ endif()
+
+ target_link_libraries(doxyapp
+diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
+index 2387f1b..c880c3d 100644
+--- a/addon/doxyparse/CMakeLists.txt
++++ b/addon/doxyparse/CMakeLists.txt
+@@ -14,7 +14,7 @@ doxyparse.cpp
+ )
+
+ if (use_libclang)
+- set(CLANG_LIBS libclang clangTooling ${llvm_libs})
++ set(CLANG_LIBS libclang clang-cpp ${llvm_libs})
+ endif()
+
+ target_link_libraries(doxyparse
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3f4767c..d6891a6 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -310,9 +310,9 @@ if (use_libclang)
+ endif()
+ include_directories(${LLVM_INCLUDE_DIRS})
+ add_definitions(${LLVM_DEFINITIONS})
+- llvm_map_components_to_libnames(llvm_libs support core option)
++ llvm_map_components_to_libnames(llvm_libs support)
+ target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS})
+- set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs})
++ set(CLANG_LIBS libclang clang-cpp ${llvm_libs})
+ endif()
+
+ target_link_libraries(doxygen
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/
@ 2020-03-01 18:36 Matthias Maier
0 siblings, 0 replies; 11+ messages in thread
From: Matthias Maier @ 2020-03-01 18:36 UTC (permalink / raw
To: gentoo-commits
commit: d84802e00808aff69876f646e892f354b54a9b38
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 1 17:59:38 2020 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Mar 1 18:35:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d84802e0
app-doc/doxygen: version bump to 1.8.17
Closes: https://bugs.gentoo.org/706230
Bug: https://bugs.gentoo.org/709316
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-doc/doxygen/Manifest | 1 +
app-doc/doxygen/doxygen-1.8.17.ebuild | 138 +++++++++++++++++++++
...en-1.8.17-ensure_static_support_libraries.patch | 27 ++++
3 files changed, 166 insertions(+)
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 0467e383742..617e2dfa6b3 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/app-doc/doxygen/doxygen-1.8.17.ebuild b/app-doc/doxygen/doxygen-1.8.17.ebuild
new file mode 100644
index 00000000000..d75181643d4
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.17.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-utils eutils python-any-r1
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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-4.0.0:= )
+ 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.17-ensure_static_support_libraries.patch"
+)
+
+DOCS=( LANGUAGE.HOWTO README.md )
+
+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.17-ensure_static_support_libraries.patch b/app-doc/doxygen/files/doxygen-1.8.17-ensure_static_support_libraries.patch
new file mode 100644
index 00000000000..285ea16ac96
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.17-ensure_static_support_libraries.patch
@@ -0,0 +1,27 @@
+From d7b0a0ef152312b9242cbbe7405ee49310e7909e Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@43-1.org>
+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
+
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/
@ 2019-12-12 19:46 Matthias Maier
0 siblings, 0 replies; 11+ messages in thread
From: Matthias Maier @ 2019-12-12 19:46 UTC (permalink / raw
To: gentoo-commits
commit: 3f549b1fb85e0973964b99245fbe4fc5d0d32cd1
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 19:25:52 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 19:46:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f549b1f
app-doc/doxygen: drop old versions
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-doc/doxygen/Manifest | 1 -
app-doc/doxygen/doxygen-1.8.14-r1.ebuild | 135 ----------------------
app-doc/doxygen/doxygen-1.8.14-r2.ebuild | 136 -----------------------
app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch | 25 -----
4 files changed, 297 deletions(-)
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 40932be8260..0467e383742 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,3 +1,2 @@
-DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c
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
diff --git a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
deleted file mode 100644
index de853a4a2b3..00000000000
--- a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils eutils python-any-r1
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
- SRC_URI=""
-else
- SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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="https://www.stack.nl/~dimitri/doxygen/"
-
-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-4.0.0:= )
- 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.12-link_with_pthread.patch"
- "${FILESDIR}/${PN}-1.8.14-llvm7.patch" #666692
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-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.14-r2.ebuild b/app-doc/doxygen/doxygen-1.8.14-r2.ebuild
deleted file mode 100644
index f374b46eae5..00000000000
--- a/app-doc/doxygen/doxygen-1.8.14-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils eutils python-any-r1
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
- SRC_URI=""
-else
- SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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="https://www.stack.nl/~dimitri/doxygen/"
-
-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-4.0.0:= )
- 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.12-link_with_pthread.patch"
- "${FILESDIR}/${PN}-1.8.14-llvm7.patch" #666692
- "${FILESDIR}/${PN}-1.8.14-xml-c++.patch" #doxygen/doxygen#6892
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-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/files/doxygen-1.8.14-llvm7.patch b/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch
deleted file mode 100644
index 86e6d799941..00000000000
--- a/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 5c55efae..1ad32b2e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -262,7 +262,7 @@ if (use_libclang)
- add_definitions(${LLVM_DEFINITIONS})
- llvm_map_components_to_libnames(llvm_libs support core option)
- target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS})
-- set(CLANG_LIBS libclang clangTooling ${llvm_libs})
-+ set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs})
- endif()
-
- target_link_libraries(doxygen
-diff --git a/src/clangparser.cpp b/src/clangparser.cpp
-index 77151d6e..2ea15ee2 100644
---- a/src/clangparser.cpp
-+++ b/src/clangparser.cpp
-@@ -4,6 +4,7 @@
-
- #if USE_LIBCLANG
- #include <clang-c/Index.h>
-+#include "clang/Tooling/CompilationDatabase.h"
- #include "clang/Tooling/Tooling.h"
- #include <qfileinfo.h>
- #include <stdlib.h>
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/
@ 2019-12-12 19:23 Matthias Maier
0 siblings, 0 replies; 11+ messages in thread
From: Matthias Maier @ 2019-12-12 19:23 UTC (permalink / raw
To: gentoo-commits
commit: 7e46810c2d4eaeaba6e7ce1d2d888e0b2e9fae68
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 19:05:15 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 19:13:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e46810c
app-doc/doxygen: try to fix ghostscript compatibility
Bug: https://bugs.gentoo.org/695710
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-doc/doxygen/doxygen-1.8.16.ebuild | 1 +
...oxygen-1.8.16-ghostscript-compatilibility.patch | 39 ++++++++++++++++++++++
2 files changed, 40 insertions(+)
diff --git a/app-doc/doxygen/doxygen-1.8.16.ebuild b/app-doc/doxygen/doxygen-1.8.16.ebuild
index 33dcae69729..7b7f2f933b7 100644
--- a/app-doc/doxygen/doxygen-1.8.16.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.16.ebuild
@@ -62,6 +62,7 @@ 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
)
DOCS=( LANGUAGE.HOWTO README.md )
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
new file mode 100644
index 00000000000..55445fa19dc
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch
@@ -0,0 +1,39 @@
+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
+
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/
@ 2019-10-28 16:20 Matthias Maier
0 siblings, 0 replies; 11+ messages in thread
From: Matthias Maier @ 2019-10-28 16:20 UTC (permalink / raw
To: gentoo-commits
commit: 426fa3198e709658eb01bcd29cb91e5bf5544bd8
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 28 16:18:14 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 16:20:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=426fa319
app-doc/doxygen: version bump to 1.8.16
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-doc/doxygen/Manifest | 1 +
app-doc/doxygen/doxygen-1.8.16.ebuild | 135 +++++++++++++++++++++
.../files/doxygen-1.8.16-link_with_pthread.patch | 16 +++
3 files changed, 152 insertions(+)
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 00101540bde..40932be8260 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,2 +1,3 @@
DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c
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
diff --git a/app-doc/doxygen/doxygen-1.8.16.ebuild b/app-doc/doxygen/doxygen-1.8.16.ebuild
new file mode 100644
index 00000000000..33dcae69729
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.16.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-utils eutils 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 ~sh ~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="https://www.stack.nl/~dimitri/doxygen/"
+
+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-4.0.0:= )
+ 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
+)
+
+DOCS=( LANGUAGE.HOWTO README.md )
+
+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/files/doxygen-1.8.16-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.16-link_with_pthread.patch
new file mode 100644
index 00000000000..c3c49e6b5e7
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.16-link_with_pthread.patch
@@ -0,0 +1,16 @@
+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)
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/
@ 2019-06-30 18:44 Matthias Maier
0 siblings, 0 replies; 11+ messages in thread
From: Matthias Maier @ 2019-06-30 18:44 UTC (permalink / raw
To: gentoo-commits
commit: 6e116e8341410a10ba4de4e147649b45d4af204a
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 18:37:17 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 18:44:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e116e83
app-doc/doxygen: version bump to 1.8.15
Thanks to Sven Eden for patches!
Closes: https://bugs.gentoo.org/682486
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-doc/doxygen/Manifest | 1 +
app-doc/doxygen/doxygen-1.8.15.ebuild | 134 +++++++++++++++++++++
.../files/doxygen-1.8.15-link_with_pthread.patch | 32 +++++
app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch | 11 ++
4 files changed, 178 insertions(+)
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 1131255da45..00101540bde 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1 +1,2 @@
DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c
+DIST doxygen-1.8.15.src.tar.gz 5097791 BLAKE2B 08903bf06666911df0810ea0a7b86066e7682833b03ae5660094112c5c6506f072c5818185ce8166d09328e62092461acdb4516b58fe9369119f5f6bdd64331a SHA512 a5512e78be66c1591d8ec7e284d5d25c92a97218c79e6fed3c538c723a8dfef4ff7085970bf271a6b639e907157cd4df9fb55d3c975f8d3302fb1012a4d92079
diff --git a/app-doc/doxygen/doxygen-1.8.15.ebuild b/app-doc/doxygen/doxygen-1.8.15.ebuild
new file mode 100644
index 00000000000..d609aec89e6
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.15.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit cmake-utils eutils 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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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="https://www.stack.nl/~dimitri/doxygen/"
+
+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-4.0.0:= )
+ 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 )
+
+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/files/doxygen-1.8.15-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch
new file mode 100644
index 00000000000..54c0a96e5e1
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch
@@ -0,0 +1,32 @@
+--- 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.15-llvm7.patch b/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch
new file mode 100644
index 00000000000..861c79a6b0d
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch
@@ -0,0 +1,11 @@
+--- a/src/CMakeLists.txt 2019-04-04 06:51:41.509647160 +0200
++++ b/src/CMakeLists.txt 2019-04-04 06:52:08.413646804 +0200
+@@ -263,7 +263,7 @@
+ add_definitions(${LLVM_DEFINITIONS})
+ llvm_map_components_to_libnames(llvm_libs support core option)
+ target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS})
+- set(CLANG_LIBS libclang clangTooling ${llvm_libs})
++ set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs})
+ endif()
+
+ target_link_libraries(doxygen
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/
@ 2017-02-25 21:31 Matthias Maier
0 siblings, 0 replies; 11+ messages in thread
From: Matthias Maier @ 2017-02-25 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 62735abec6e795a7d794a3cf072a789863bea0b1
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 21:25:46 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 21:31:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62735abe
app-doc/doxygen: drop old versions 1.8.10*, 1.8.11*
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-doc/doxygen/Manifest | 2 -
app-doc/doxygen/doxygen-1.8.10-r1.ebuild | 188 ---------------------
app-doc/doxygen/doxygen-1.8.11-r2.ebuild | 154 -----------------
.../files/doxygen-1.8.10-link_with_pthread.patch | 32 ----
.../files/doxygen-1.8.11-link_with_pthread.patch | 32 ----
5 files changed, 408 deletions(-)
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 4687c213eb..7d07d4b5d0 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,5 +1,3 @@
-DIST doxygen-1.8.10.src.tar.gz 4818276 SHA256 cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93 SHA512 a7f29b5f7b9f55b7e5382b7b7dc7212247a27869bc265433c0ee51480645b3f5f0732d1f5aefd54952204c8a1c98b96ec1ecc22c1ff7a072db5b2356b5981074 WHIRLPOOL 5607e1da5cf8e653ec895a7601a3a6585790a555207928bde6d154ab06173c68e088a61c1963da8d8cdc1a571b66eeaa102acc2a2e4291e0be87634d8e554962
-DIST doxygen-1.8.11.src.tar.gz 4834291 SHA256 65d08b46e48bd97186aef562dc366681045b119e00f83c5b61d05d37ea154049 SHA512 44f3f9d2715c4cfe628b988809a6264681c43634dfa830f604b6cc853fa6679eca112cc9c01cee5b019f7f01f0a0acdf4f7d3aaec0848783399d17904caf1a3e WHIRLPOOL 240c84bd02ea3ab747e59bb8db434e40e743ed24cbb8ca78b8846d3bb4f7672497106fd620c14851c06d80e474301811978def5d85db5b01df97b40a4ec74813
DIST doxygen-1.8.12.src.tar.gz 4880613 SHA256 792d4091cbdf228549ff2033dd71ff7ea5029c6b436317cc5ec866e71302df6c SHA512 12fb5f19d0de382c7510b7c517d7c781a1e6e11720c7d9ecfd81d29d5ed030984e8d55ffcc25cc52703020e880edad341136e2795a2a36a842fc275b31ae203d WHIRLPOOL 4bd12f16ce9dba73f5bf836032d8ce25d5be7e6b3cbe3c11ce7c662a8059fa30ef2f75c008fb2050fd4eb99d80ba134d068b452dfd577a651291dba5315c0726
DIST doxygen-1.8.13.src.tar.gz 4893912 SHA256 af667887bd7a87dc0dbf9ac8d86c96b552dfb8ca9c790ed1cbffaa6131573f6b SHA512 85da5bd28ad9f33a8e50fa92796817d31e59c024127cb647cb967e4321dd51378feaacdf099d578b7e6020fd646a3c63e99c77420e49e3894fc18ca89ba3e0a2 WHIRLPOOL fb26f85c22ae2197b52bb7fb4a46ee840c3af700bedfce41d3fed84e5ac62408abcfc3e2a147a8e15c290f7bbc2e4cf3efabbe490ea1a78504680b9b299fa93f
DIST doxywizard.png 4231 SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209 SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5 WHIRLPOOL bb0c13b382c4069ca310ff53a03b36499a2bf6e0e8c0647efc032530f429f483b5d6f2925b7e996d4f84c8f2b77eb883533f4b7abc88745a2cfa596d3dd4f3fb
diff --git a/app-doc/doxygen/doxygen-1.8.10-r1.ebuild b/app-doc/doxygen/doxygen-1.8.10-r1.ebuild
deleted file mode 100644
index 0331058dae..0000000000
--- a/app-doc/doxygen/doxygen-1.8.10-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-CMAKE_MAKEFILE_GENERATOR="emake" # bug #591386
-inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1 qt4-r2
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://github.com/doxygen/doxygen.git"
- SRC_URI=""
- KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-else
- SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-fi
-SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt4 sqlite userland_GNU"
-
-#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional
-LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk
-nl nb pl pt ro ru sl sk sr sv tr uk vi af)
-for X in "${LANGS[@]}" ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND="app-text/ghostscript-gpl
- dev-lang/perl
- media-libs/libpng
- virtual/libiconv
- clang? ( sys-devel/clang )
- dot? (
- media-gfx/graphviz
- media-libs/freetype
- )
- doxysearch? ( =dev-libs/xapian-1.2* )
- latex? ( app-text/texlive[extra] )
- qt4? ( dev-qt/qtgui:4 )
- sqlite? ( dev-db/sqlite:3 )
- "
-
-REQUIRED_USE="doc? ( latex )"
-
-DEPEND="sys-apps/sed
- 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"
-EPATCH_SUFFIX="patch"
-
-get_langs() {
- # using only user set linguas also fixes #263641
- my_linguas=()
- for lingua in ${LINGUAS}; do
- if has ${lingua} "${LANGS[@]}"; then
- case ${lingua} in
- hy) lingua=am ;;
- pt_BR) lingua=br ;;
- zh*) lingua=cn ;;
- cs) lingua=cz ;;
- da) lingua=dk ;;
- el*) lingua=gr ;;
- ja*) lingua=jp ;;
- ko) lingua=kr ;;
- nb) lingua=no ;;
- sl) lingua=si ;;
- tr*) lingua=tr ;;
- uk) lingua=ua ;;
- af) lingua=za ;;
- esac
- has ${lingua} "${my_linguas[@]}" ||
- my_linguas+=(${lingua})
- fi
- done
- f_langs="${my_linguas[@]}"
- echo ${f_langs// /;}
-}
-
-pkg_setup() {
- use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Ensure we link to -liconv
- if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
- for pro in */*.pro.in */*/*.pro.in; do
- echo "unix:LIBS += -liconv" >> "${pro}"
- 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
-
- epatch "${FILESDIR}"/${PN}-1.8.9.1-empty-line-sigsegv.patch #454348
- epatch "${FILESDIR}"/${P}-fix_flex_check.patch #567018
-
- epatch "${FILESDIR}"/${P}-link_with_pthread.patch
-
- # fix pdf doc
- sed -i.orig -e "s:g_kowal:g kowal:" \
- doc/maintainers.txt || die
-
- if is-flagq "-O3" ; then
- echo
- ewarn "Compiling with -O3 is known to produce incorrectly"
- ewarn "optimized code which breaks doxygen."
- echo
- elog "Continuing with -O2 instead ..."
- echo
- replace-flags "-O3" "-O2"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DDOC_INSTALL_DIR="share/doc/${P}"
- -DLANG_CODES="$(get_langs)"
- $(cmake-utils_use clang use_libclang)
- $(cmake-utils_use doc build_doc)
- $(cmake-utils_use doxysearch build_search)
- $(cmake-utils_use qt4 build_wizard)
- $(cmake-utils_use sqlite use_sqlite3)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- # generate html and pdf documents. errors here are not considered
- # fatal, hence the ewarn message.
-
- 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} \
- || ewarn "disabling dot failed"
- fi
- cd "${BUILD_DIR}" && emake docs
- fi
-}
-
-src_install() {
- if use qt4; then
- doicon "${DISTDIR}/doxywizard.png"
- make_desktop_entry doxywizard "DoxyWizard ${PV}" \
- "/usr/share/pixmaps/doxywizard.png" \
- "Development"
- fi
-
- dodoc LANGUAGE.HOWTO README.md
-
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-
- elog
- elog "For examples and other goodies, see the source tarball. For some"
- elog "example output, run doxygen on the doxygen source using the"
- elog "Doxyfile provided in the top-level source dir."
- elog
- elog "Disabling the dot USE flag will remove the GraphViz dependency,"
- elog "along with Doxygen's ability to generate diagrams in the docs."
- elog "See the Doxygen homepage for additional helper tools to parse"
- elog "more languages."
- elog
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/app-doc/doxygen/doxygen-1.8.11-r2.ebuild b/app-doc/doxygen/doxygen-1.8.11-r2.ebuild
deleted file mode 100644
index 91a59172d8..0000000000
--- a/app-doc/doxygen/doxygen-1.8.11-r2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-CMAKE_MAKEFILE_GENERATOR="emake" # bug #591386
-inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://github.com/doxygen/doxygen.git"
- SRC_URI=""
- KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-else
- SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
- KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-fi
-SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
-
-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 )
- dot? (
- media-gfx/graphviz
- media-libs/freetype
- )
- doxysearch? ( =dev-libs/xapian-1.2* )
- latex? ( app-text/texlive[extra] )
- qt5? (
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- sqlite? ( dev-db/sqlite:3 )
- "
-
-REQUIRED_USE="doc? ( latex )"
-
-DEPEND="sys-apps/sed
- 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"
-EPATCH_SUFFIX="patch"
-
-pkg_setup() {
- use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Ensure we link to -liconv
- if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
- for pro in */*.pro.in */*/*.pro.in; do
- echo "unix:LIBS += -liconv" >> "${pro}"
- 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
-
- epatch "${FILESDIR}"/${PN}-1.8.9.1-empty-line-sigsegv.patch #454348
-
- epatch "${FILESDIR}"/${P}-link_with_pthread.patch
-
- # fix pdf doc
- sed -i.orig -e "s:g_kowal:g kowal:" \
- doc/maintainers.txt || die
-
- if is-flagq "-O3" ; then
- echo
- ewarn "Compiling with -O3 is known to produce incorrectly"
- ewarn "optimized code which breaks doxygen."
- echo
- elog "Continuing with -O2 instead ..."
- echo
- replace-flags "-O3" "-O2"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DDOC_INSTALL_DIR="share/doc/${P}"
- $(cmake-utils_use clang use_libclang)
- $(cmake-utils_use doc build_doc)
- $(cmake-utils_use doxysearch build_search)
- $(cmake-utils_use qt5 build_wizard)
- $(cmake-utils_use sqlite use_sqlite3)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- # generate html and pdf documents. errors here are not considered
- # fatal, hence the ewarn message.
-
- 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} \
- || ewarn "disabling dot failed"
- fi
- cd "${BUILD_DIR}" && emake docs
- fi
-}
-
-src_install() {
- if use qt5; then
- doicon "${DISTDIR}/doxywizard.png"
- make_desktop_entry doxywizard "DoxyWizard ${PV}" \
- "/usr/share/pixmaps/doxywizard.png" \
- "Development"
- fi
-
- dodoc LANGUAGE.HOWTO README.md
-
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-
- elog
- elog "For examples and other goodies, see the source tarball. For some"
- elog "example output, run doxygen on the doxygen source using the"
- elog "Doxyfile provided in the top-level source dir."
- elog
- elog "Disabling the dot USE flag will remove the GraphViz dependency,"
- elog "along with Doxygen's ability to generate diagrams in the docs."
- elog "See the Doxygen homepage for additional helper tools to parse"
- elog "more languages."
- elog
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/app-doc/doxygen/files/doxygen-1.8.10-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.10-link_with_pthread.patch
deleted file mode 100644
index a2ce3453c5..0000000000
--- a/app-doc/doxygen/files/doxygen-1.8.10-link_with_pthread.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
-index 055aac3..b66bde7 100644
---- a/addon/doxywizard/CMakeLists.txt
-+++ b/addon/doxywizard/CMakeLists.txt
-@@ -73,6 +73,7 @@ ${doxywizard_RESOURCES_RCC}
- )
- target_link_libraries(doxywizard
- ${QT_LIBRARIES}
-+pthread
- )
-
- install(TARGETS doxywizard DESTINATION bin)
-diff --git a/addon/doxysearch/CMakeLists.txt b/addon/doxysearch/CMakeLists.txt
-index 33e01c1..165fc3e 100644
---- a/addon/doxysearch/CMakeLists.txt
-+++ b/addon/doxysearch/CMakeLists.txt
-@@ -20,6 +20,7 @@ target_link_libraries(doxyindexer
- ${ZLIB_LIBRARIES}
- ${WIN_EXTRA_LIBS}
- qtools
-+ pthread
- )
-
- add_executable(doxysearch.cgi
-@@ -29,6 +30,7 @@ target_link_libraries(doxysearch.cgi
- ${XAPIAN_LIBRARIES}
- ${ZLIB_LIBRARIES}
- ${WIN_EXTRA_LIBS}
-+ pthread
- )
-
- install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin)
diff --git a/app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch
deleted file mode 100644
index cdc630c4d4..0000000000
--- a/app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/addon/doxysearch/CMakeLists.txt b/addon/doxysearch/CMakeLists.txt
-index 33e01c1..165fc3e 100644
---- a/addon/doxysearch/CMakeLists.txt
-+++ b/addon/doxysearch/CMakeLists.txt
-@@ -20,6 +20,7 @@ target_link_libraries(doxyindexer
- ${ZLIB_LIBRARIES}
- ${WIN_EXTRA_LIBS}
- qtools
-+ pthread
- )
-
- add_executable(doxysearch.cgi
-@@ -29,6 +30,7 @@ target_link_libraries(doxysearch.cgi
- ${XAPIAN_LIBRARIES}
- ${ZLIB_LIBRARIES}
- ${WIN_EXTRA_LIBS}
-+ pthread
- )
-
- install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin)
-diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
-index bf2eda8..8eb2a1c 100644
---- a/addon/doxywizard/CMakeLists.txt
-+++ b/addon/doxywizard/CMakeLists.txt
-@@ -109,6 +109,7 @@ ${doxywizard_RESOURCES_RCC}
- qt_use_modules(doxywizard Core Gui Widgets Xml)
- target_link_libraries(doxywizard
- ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY}
-+pthread
- )
-
- install(TARGETS doxywizard DESTINATION bin)
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-05-27 3:07 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-14 20:40 [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/ Matthias Maier
-- strict thread matches above, loose matches on Subject: below --
2023-05-27 3:06 Sam James
2022-11-10 6:10 Sam James
2021-09-15 22:03 James Le Cuirot
2020-12-10 19:14 Matthias Maier
2020-03-01 18:36 Matthias Maier
2019-12-12 19:46 Matthias Maier
2019-12-12 19:23 Matthias Maier
2019-10-28 16:20 Matthias Maier
2019-06-30 18:44 Matthias Maier
2017-02-25 21:31 Matthias Maier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox