1 |
commit: 6e116e8341410a10ba4de4e147649b45d4af204a |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 30 18:37:17 2019 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 30 18:44:39 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e116e83 |
7 |
|
8 |
app-doc/doxygen: version bump to 1.8.15 |
9 |
|
10 |
Thanks to Sven Eden for patches! |
11 |
|
12 |
Closes: https://bugs.gentoo.org/682486 |
13 |
Package-Manager: Portage-2.3.67, Repoman-2.3.16 |
14 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
15 |
|
16 |
app-doc/doxygen/Manifest | 1 + |
17 |
app-doc/doxygen/doxygen-1.8.15.ebuild | 134 +++++++++++++++++++++ |
18 |
.../files/doxygen-1.8.15-link_with_pthread.patch | 32 +++++ |
19 |
app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch | 11 ++ |
20 |
4 files changed, 178 insertions(+) |
21 |
|
22 |
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest |
23 |
index 1131255da45..00101540bde 100644 |
24 |
--- a/app-doc/doxygen/Manifest |
25 |
+++ b/app-doc/doxygen/Manifest |
26 |
@@ -1 +1,2 @@ |
27 |
DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c |
28 |
+DIST doxygen-1.8.15.src.tar.gz 5097791 BLAKE2B 08903bf06666911df0810ea0a7b86066e7682833b03ae5660094112c5c6506f072c5818185ce8166d09328e62092461acdb4516b58fe9369119f5f6bdd64331a SHA512 a5512e78be66c1591d8ec7e284d5d25c92a97218c79e6fed3c538c723a8dfef4ff7085970bf271a6b639e907157cd4df9fb55d3c975f8d3302fb1012a4d92079 |
29 |
|
30 |
diff --git a/app-doc/doxygen/doxygen-1.8.15.ebuild b/app-doc/doxygen/doxygen-1.8.15.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..d609aec89e6 |
33 |
--- /dev/null |
34 |
+++ b/app-doc/doxygen/doxygen-1.8.15.ebuild |
35 |
@@ -0,0 +1,134 @@ |
36 |
+# Copyright 1999-2019 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=6 |
40 |
+PYTHON_COMPAT=( python{2_7,3_5,3_6} ) |
41 |
+ |
42 |
+inherit cmake-utils eutils python-any-r1 |
43 |
+if [[ ${PV} = *9999* ]]; then |
44 |
+ inherit git-r3 |
45 |
+ EGIT_REPO_URI="https://github.com/doxygen/doxygen.git" |
46 |
+ SRC_URI="" |
47 |
+else |
48 |
+ SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz" |
49 |
+ 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" |
50 |
+fi |
51 |
+ |
52 |
+DESCRIPTION="Documentation system for most programming languages" |
53 |
+HOMEPAGE="https://www.stack.nl/~dimitri/doxygen/" |
54 |
+ |
55 |
+LICENSE="GPL-2" |
56 |
+SLOT="0" |
57 |
+IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU" |
58 |
+ |
59 |
+RDEPEND="app-text/ghostscript-gpl |
60 |
+ dev-lang/perl |
61 |
+ media-libs/libpng:0= |
62 |
+ virtual/libiconv |
63 |
+ clang? ( >=sys-devel/clang-4.0.0:= ) |
64 |
+ dot? ( |
65 |
+ media-gfx/graphviz |
66 |
+ media-libs/freetype |
67 |
+ ) |
68 |
+ doxysearch? ( dev-libs/xapian:= ) |
69 |
+ latex? ( |
70 |
+ dev-texlive/texlive-bibtexextra |
71 |
+ dev-texlive/texlive-fontsextra |
72 |
+ dev-texlive/texlive-fontutils |
73 |
+ dev-texlive/texlive-latex |
74 |
+ dev-texlive/texlive-latexextra |
75 |
+ ) |
76 |
+ qt5? ( |
77 |
+ dev-qt/qtgui:5 |
78 |
+ dev-qt/qtwidgets:5 |
79 |
+ dev-qt/qtxml:5 |
80 |
+ ) |
81 |
+ sqlite? ( dev-db/sqlite:3 ) |
82 |
+ " |
83 |
+ |
84 |
+REQUIRED_USE="doc? ( latex )" |
85 |
+ |
86 |
+DEPEND="sys-devel/flex |
87 |
+ sys-devel/bison |
88 |
+ doc? ( ${PYTHON_DEPS} ) |
89 |
+ ${RDEPEND}" |
90 |
+ |
91 |
+# src_test() defaults to make -C testing but there is no such directory (bug #504448) |
92 |
+RESTRICT="test" |
93 |
+ |
94 |
+PATCHES=( |
95 |
+ "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348 |
96 |
+ "${FILESDIR}/${PN}-1.8.15-link_with_pthread.patch" |
97 |
+ "${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692 |
98 |
+ "${FILESDIR}/${PN}-1.8.14-xml-c++.patch" #doxygen/doxygen#6892 |
99 |
+) |
100 |
+ |
101 |
+DOCS=( LANGUAGE.HOWTO README.md ) |
102 |
+ |
103 |
+pkg_setup() { |
104 |
+ use doc && python-any-r1_pkg_setup |
105 |
+} |
106 |
+ |
107 |
+src_prepare() { |
108 |
+ cmake-utils_src_prepare |
109 |
+ |
110 |
+ # Ensure we link to -liconv |
111 |
+ if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then |
112 |
+ local pro |
113 |
+ for pro in */*.pro.in */*/*.pro.in; do |
114 |
+ echo "unix:LIBS += -liconv" >> "${pro}" || die |
115 |
+ done |
116 |
+ fi |
117 |
+ |
118 |
+ # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 |
119 |
+ sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die |
120 |
+ |
121 |
+ # fix pdf doc |
122 |
+ sed -i.orig -e "s:g_kowal:g kowal:" \ |
123 |
+ doc/maintainers.txt || die |
124 |
+ |
125 |
+ if is-flagq "-O3" ; then |
126 |
+ ewarn |
127 |
+ ewarn "Compiling with -O3 is known to produce incorrectly" |
128 |
+ ewarn "optimized code which breaks doxygen." |
129 |
+ ewarn |
130 |
+ elog |
131 |
+ elog "Continuing with -O2 instead ..." |
132 |
+ elog |
133 |
+ replace-flags "-O3" "-O2" |
134 |
+ fi |
135 |
+} |
136 |
+ |
137 |
+src_configure() { |
138 |
+ local mycmakeargs=( |
139 |
+ -Duse_libclang=$(usex clang) |
140 |
+ -Dbuild_doc=$(usex doc) |
141 |
+ -Dbuild_search=$(usex doxysearch) |
142 |
+ -Dbuild_wizard=$(usex qt5) |
143 |
+ -Duse_sqlite3=$(usex sqlite) |
144 |
+ ) |
145 |
+ use doc && mycmakeargs+=( |
146 |
+ -DDOC_INSTALL_DIR="share/doc/${P}" |
147 |
+ ) |
148 |
+ |
149 |
+ cmake-utils_src_configure |
150 |
+} |
151 |
+ |
152 |
+src_compile() { |
153 |
+ cmake-utils_src_compile |
154 |
+ |
155 |
+ if use doc; then |
156 |
+ export VARTEXFONTS="${T}/fonts" # bug #564944 |
157 |
+ |
158 |
+ if ! use dot; then |
159 |
+ sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ |
160 |
+ {Doxyfile,doc/Doxyfile} \ |
161 |
+ || die "disabling dot failed" |
162 |
+ fi |
163 |
+ cmake-utils_src_make -C "${BUILD_DIR}" docs |
164 |
+ fi |
165 |
+} |
166 |
+ |
167 |
+src_install() { |
168 |
+ cmake-utils_src_install |
169 |
+} |
170 |
|
171 |
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 |
172 |
new file mode 100644 |
173 |
index 00000000000..54c0a96e5e1 |
174 |
--- /dev/null |
175 |
+++ b/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch |
176 |
@@ -0,0 +1,32 @@ |
177 |
+--- a/addon/doxysearch/CMakeLists.txt 2019-04-03 18:43:47.995610511 +0200 |
178 |
++++ b/addon/doxysearch/CMakeLists.txt 2019-04-03 18:45:27.730609191 +0200 |
179 |
+@@ -18,6 +18,7 @@ |
180 |
+ ${ZLIB_LIBRARIES} |
181 |
+ ${WIN_EXTRA_LIBS} |
182 |
+ qtools |
183 |
++ pthread |
184 |
+ ) |
185 |
+ |
186 |
+ add_executable(doxysearch.cgi |
187 |
+@@ -27,6 +28,7 @@ |
188 |
+ ${XAPIAN_LIBRARIES} |
189 |
+ ${ZLIB_LIBRARIES} |
190 |
+ ${WIN_EXTRA_LIBS} |
191 |
++ pthread |
192 |
+ ) |
193 |
+ |
194 |
+ install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin) |
195 |
+--- a/addon/doxywizard/CMakeLists.txt 2019-04-03 18:43:59.139610364 +0200 |
196 |
++++ b/addon/doxywizard/CMakeLists.txt 2019-04-03 18:45:14.151609371 +0200 |
197 |
+@@ -102,9 +102,9 @@ |
198 |
+ ) |
199 |
+ |
200 |
+ if(Qt5Core_FOUND) |
201 |
+- target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml) |
202 |
++ target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml pthread) |
203 |
+ else() |
204 |
+- target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY}) |
205 |
++ target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} pthread) |
206 |
+ endif() |
207 |
+ |
208 |
+ install(TARGETS doxywizard DESTINATION bin) |
209 |
|
210 |
diff --git a/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch b/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch |
211 |
new file mode 100644 |
212 |
index 00000000000..861c79a6b0d |
213 |
--- /dev/null |
214 |
+++ b/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch |
215 |
@@ -0,0 +1,11 @@ |
216 |
+--- a/src/CMakeLists.txt 2019-04-04 06:51:41.509647160 +0200 |
217 |
++++ b/src/CMakeLists.txt 2019-04-04 06:52:08.413646804 +0200 |
218 |
+@@ -263,7 +263,7 @@ |
219 |
+ add_definitions(${LLVM_DEFINITIONS}) |
220 |
+ llvm_map_components_to_libnames(llvm_libs support core option) |
221 |
+ target_compile_definitions(doxygen PRIVATE ${LLVM_DEFINITIONS}) |
222 |
+- set(CLANG_LIBS libclang clangTooling ${llvm_libs}) |
223 |
++ set(CLANG_LIBS libclang clangTooling clangBasic clangLex ${llvm_libs}) |
224 |
+ endif() |
225 |
+ |
226 |
+ target_link_libraries(doxygen |