* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/
@ 2015-12-10 23:47 Matthias Maier
0 siblings, 0 replies; 14+ messages in thread
From: Matthias Maier @ 2015-12-10 23:47 UTC (permalink / raw
To: gentoo-commits
commit: 01e26b007b888ff0b0931f41531319de2a8fbb8f
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 23:25:08 2015 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 23:47:18 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e26b00
app-doc/doxygen: fix version check for sys-devel/flex-2.6.0
Apply a patch to fix doxygen's build system to successfully detect
flex-2.6.0 as sufficiently modern version. The build system accidentally
only compared the minor version number...
Upstream: https://github.com/doxygen/doxygen/pull/413
Gentoo-Bug: 567018
Package-Manager: portage-2.2.26
app-doc/doxygen/doxygen-1.8.10-r1.ebuild | 2 +-
.../files/doxygen-1.8.10-fix_flex_check.patch | 96 ++++++++++++++++++++++
2 files changed, 97 insertions(+), 1 deletion(-)
diff --git a/app-doc/doxygen/doxygen-1.8.10-r1.ebuild b/app-doc/doxygen/doxygen-1.8.10-r1.ebuild
index 4682421..54a13b3 100644
--- a/app-doc/doxygen/doxygen-1.8.10-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.10-r1.ebuild
@@ -101,8 +101,8 @@ 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
- # prefix search tools patch, plus OSX fixes
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
diff --git a/app-doc/doxygen/files/doxygen-1.8.10-fix_flex_check.patch b/app-doc/doxygen/files/doxygen-1.8.10-fix_flex_check.patch
new file mode 100644
index 0000000..24a3b64
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.10-fix_flex_check.patch
@@ -0,0 +1,96 @@
+From 5fcb13572417a3b4a05217e9023c683864f35643 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Thu, 19 Nov 2015 12:00:54 +0100
+Subject: [PATCH] Support flex-2.6.0
+
+The version checks only considered YY_FLEX_SUBMINOR_VERSION and did not
+take YY_FLEX_MINOR_VERSION into account, which made them fail with
+flex-2.6.0.
+
+diff --git a/src/code.l b/src/code.l
+index 3323580..25719af 100644
+--- a/src/code.l
++++ b/src/code.l
+@@ -3700,7 +3700,7 @@ void codeFreeScanner()
+ extern "C" { // some bogus code to keep the compiler happy
+ void codeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_SUBMINOR_VERSION<33
++#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
+ #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
+ #endif
+
+diff --git a/src/commentscan.l b/src/commentscan.l
+index cf892a0..2629857 100644
+--- a/src/commentscan.l
++++ b/src/commentscan.l
+@@ -1128,7 +1128,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
+ // but we need to know the position in the input buffer where this
+ // rule matched.
+ // for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
+-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
++#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
+ inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
+ #else
+ inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
+@@ -1190,7 +1190,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
+ g_memberGroupHeader.resize(0);
+ parseMore=TRUE;
+ needNewEntry = TRUE;
+-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
++#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
+ inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
+ #else
+ inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);
+diff --git a/src/fortrancode.l b/src/fortrancode.l
+index fb91a83..352912b 100644
+--- a/src/fortrancode.l
++++ b/src/fortrancode.l
+@@ -1306,7 +1306,7 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
+ extern "C" { // some bogus code to keep the compiler happy
+ void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_SUBMINOR_VERSION<33
++#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
+ #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
+ #else
+ extern "C" { // some bogus code to keep the compiler happy
+diff --git a/src/pycode.l b/src/pycode.l
+index 3c41a69..f58f7c1 100644
+--- a/src/pycode.l
++++ b/src/pycode.l
+@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/,
+ extern "C" { // some bogus code to keep the compiler happy
+ void pycodeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_SUBMINOR_VERSION<33
++#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
+ #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
+ #endif
+
+diff --git a/src/vhdlcode.l b/src/vhdlcode.l
+index 369ae48..6957048 100644
+--- a/src/vhdlcode.l
++++ b/src/vhdlcode.l
+@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner()
+ extern "C" { // some bogus code to keep the compiler happy
+ void vhdlcodeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_SUBMINOR_VERSION<33
++#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
+ #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
+ #endif
+
+diff --git a/src/xmlcode.l b/src/xmlcode.l
+index 15b5d7e..2bef4a0 100644
+--- a/src/xmlcode.l
++++ b/src/xmlcode.l
+@@ -407,7 +407,7 @@ void resetXmlCodeParserState()
+ extern "C" { // some bogus code to keep the compiler happy
+ void xmlcodeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_SUBMINOR_VERSION<33
++#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
+ #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
+ #endif
+
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/
@ 2016-02-28 3:57 Matthias Maier
0 siblings, 0 replies; 14+ messages in thread
From: Matthias Maier @ 2016-02-28 3:57 UTC (permalink / raw
To: gentoo-commits
commit: 697f3bfe5db06f0d251ac88dd4f67e92b1373b6c
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 03:57:04 2016 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 03:57:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=697f3bfe
app-doc/doxygen: bump to 1.8.11, fix lingua support (bug #566510), EAPI 5, qt5
- Version bump to newly released 1.8.11.
- Change EAPI to 5.
- Switch Qt support (for doxywizard) to Qt5.
- Fix LINGUAS support
- Update live ebuild
Gentoo-Bugs: 566510
Package-Manager: portage-2.2.26
app-doc/doxygen/Manifest | 1 +
.../{doxygen-9999.ebuild => doxygen-1.8.11.ebuild} | 21 +++++++-------
app-doc/doxygen/doxygen-9999.ebuild | 20 +++++++-------
.../files/doxygen-1.8.11-link_with_pthread.patch | 32 ++++++++++++++++++++++
4 files changed, 54 insertions(+), 20 deletions(-)
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index c193ff5..0216bc8 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,2 +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 doxywizard.png 4231 SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209 SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5 WHIRLPOOL bb0c13b382c4069ca310ff53a03b36499a2bf6e0e8c0647efc032530f429f483b5d6f2925b7e996d4f84c8f2b77eb883533f4b7abc88745a2cfa596d3dd4f3fb
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-1.8.11.ebuild
similarity index 90%
copy from app-doc/doxygen/doxygen-9999.ebuild
copy to app-doc/doxygen/doxygen-1.8.11.ebuild
index 22f3267..fefba30 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.11.ebuild
@@ -5,16 +5,15 @@
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1 qt4-r2
+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=""
+ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
else
- SRC_URI="https://github.com/doxygen/doxygen/archive/Release_${PV//\./_}.tar.gz -> ${P}.tar.gz"
+ 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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
- S="${WORKDIR}/${PN}-Release_${PV//\./_}"
fi
SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
@@ -23,7 +22,7 @@ HOMEPAGE="http://www.doxygen.org/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt4 sqlite userland_GNU"
+IUSE="clang debug doc dot doxysearch latex qt5 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
@@ -43,7 +42,10 @@ RDEPEND="app-text/ghostscript-gpl
)
doxysearch? ( =dev-libs/xapian-1.2* )
latex? ( app-text/texlive[extra] )
- qt4? ( dev-qt/qtgui:4 )
+ qt5? (
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
sqlite? ( dev-db/sqlite:3 )
"
@@ -83,7 +85,7 @@ get_langs() {
my_linguas+=(${lingua})
fi
done
- f_langs="${my_linguas[@]}"
+ f_langs="${my_linguas[@]^^}"
echo ${f_langs// /;}
}
@@ -102,7 +104,6 @@ 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
- # prefix search tools patch, plus OSX fixes
epatch "${FILESDIR}"/${PN}-1.8.9.1-empty-line-sigsegv.patch #454348
epatch "${FILESDIR}"/${P}-link_with_pthread.patch
@@ -129,7 +130,7 @@ src_configure() {
$(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 qt5 build_wizard)
$(cmake-utils_use sqlite use_sqlite3)
)
@@ -153,7 +154,7 @@ src_compile() {
}
src_install() {
- if use qt4; then
+ if use qt5; then
doicon "${DISTDIR}/doxywizard.png"
make_desktop_entry doxywizard "DoxyWizard ${PV}" \
"/usr/share/pixmaps/doxywizard.png" \
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 22f3267..6be87bc 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -5,7 +5,7 @@
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1 qt4-r2
+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"
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.doxygen.org/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt4 sqlite userland_GNU"
+IUSE="clang debug doc dot doxysearch latex qt5 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
@@ -43,7 +43,10 @@ RDEPEND="app-text/ghostscript-gpl
)
doxysearch? ( =dev-libs/xapian-1.2* )
latex? ( app-text/texlive[extra] )
- qt4? ( dev-qt/qtgui:4 )
+ qt5? (
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
sqlite? ( dev-db/sqlite:3 )
"
@@ -83,7 +86,7 @@ get_langs() {
my_linguas+=(${lingua})
fi
done
- f_langs="${my_linguas[@]}"
+ f_langs="${my_linguas[@]^^}"
echo ${f_langs// /;}
}
@@ -102,10 +105,7 @@ 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
- # prefix search tools patch, plus OSX fixes
- epatch "${FILESDIR}"/${PN}-1.8.9.1-empty-line-sigsegv.patch #454348
-
- epatch "${FILESDIR}"/${P}-link_with_pthread.patch
+ epatch "${FILESDIR}"/${PN}-1.8.11-link_with_pthread.patch
# fix pdf doc
sed -i.orig -e "s:g_kowal:g kowal:" \
@@ -129,7 +129,7 @@ src_configure() {
$(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 qt5 build_wizard)
$(cmake-utils_use sqlite use_sqlite3)
)
@@ -153,7 +153,7 @@ src_compile() {
}
src_install() {
- if use qt4; then
+ if use qt5; then
doicon "${DISTDIR}/doxywizard.png"
make_desktop_entry doxywizard "DoxyWizard ${PV}" \
"/usr/share/pixmaps/doxywizard.png" \
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
new file mode 100644
index 0000000..cdc630c
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.11-link_with_pthread.patch
@@ -0,0 +1,32 @@
+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] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/
@ 2016-09-16 5:12 Matthias Maier
0 siblings, 0 replies; 14+ messages in thread
From: Matthias Maier @ 2016-09-16 5:12 UTC (permalink / raw
To: gentoo-commits
commit: 6828678d3c36dc12db7d57cac9396cf7bc138a31
Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
AuthorDate: Sat Sep 10 18:40:19 2016 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 05:12:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6828678d
app-doc/doxygen: Version bump
Move to EAPI 6
Replace dodoc with DOCS
Replace epatch with PATCHES
Drop python 3.3 support
Package-Manager: portage-2.2.28
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-doc/doxygen/Manifest | 3 +-
app-doc/doxygen/doxygen-1.8.12.ebuild | 151 +++++++++++++++++++++
.../files/doxygen-1.8.12-link_with_pthread.patch | 32 +++++
3 files changed, 185 insertions(+), 1 deletion(-)
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 0216bc8..eea7588 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,3 +1,4 @@
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 doxywizard.png 4231 SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209 SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5 WHIRLPOOL bb0c13b382c4069ca310ff53a03b36499a2bf6e0e8c0647efc032530f429f483b5d6f2925b7e996d4f84c8f2b77eb883533f4b7abc88745a2cfa596d3dd4f3fb
+DIST doxygen-1.8.12.src.tar.gz 4880613 SHA256 792d4091cbdf228549ff2033dd71ff7ea5029c6b436317cc5ec866e71302df6c SHA512 12fb5f19d0de382c7510b7c517d7c781a1e6e11720c7d9ecfd81d29d5ed030984e8d55ffcc25cc52703020e880edad341136e2795a2a36a842fc275b31ae203d WHIRLPOOL 4bd12f16ce9dba73f5bf836032d8ce25d5be7e6b3cbe3c11ce7c662a8059fa30ef2f75c008fb2050fd4eb99d80ba134d068b452dfd577a651291dba5315c0726
+DIST doxywizard.png 4231 SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209 WHIRLPOOL bb0c13b382c4069ca310ff53a03b36499a2bf6e0e8c0647efc032530f429f483b5d6f2925b7e996d4f84c8f2b77eb883533f4b7abc88745a2cfa596d3dd4f3fb
diff --git a/app-doc/doxygen/doxygen-1.8.12.ebuild b/app-doc/doxygen/doxygen-1.8.12.ebuild
new file mode 100644
index 00000000..53c926c
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.12.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+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=""
+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 ~x86-freebsd ~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-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}/${P}-link_with_pthread.patch"
+)
+
+DOCS=( LANGUAGE.HOWTO README.md )
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # 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
+ 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}"
+ -Duse_libclang=$(usex clang)
+ -Dbuild_doc=$(usex doc)
+ -Dbuild_search=$(usex doxysearch)
+ -Dbuild_wizard=$(usex qt5)
+ -Duse_sqlite3=$(usex sqlite)
+ )
+
+ 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
+ emake -C "${BUILD_DIR}" docs
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use qt5; then
+ doicon "${DISTDIR}/doxywizard.png"
+ make_desktop_entry doxywizard "DoxyWizard ${PV}" \
+ "/usr/share/pixmaps/doxywizard.png" \
+ "Development"
+ fi
+}
+
+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.12-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.12-link_with_pthread.patch
new file mode 100644
index 00000000..cdc630c
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.12-link_with_pthread.patch
@@ -0,0 +1,32 @@
+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] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/
@ 2017-02-04 13:52 David Seifert
0 siblings, 0 replies; 14+ messages in thread
From: David Seifert @ 2017-02-04 13:52 UTC (permalink / raw
To: gentoo-commits
commit: 6e7bb684c34f9fcc3a60ab0ea9435df2cd302614
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 4 13:50:26 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 13:52:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e7bb684
app-doc/doxygen: Avoid dereferencing NULL pointer
Gentoo-bug: 607160
* Thank you to Jiri Netolicky for finding the
upstream issue and the commit that fixed it.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
...ygen-1.8.13.ebuild => doxygen-1.8.13-r1.ebuild} | 10 +++++----
.../files/doxygen-1.8.13-NULL-dereference.patch | 24 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/app-doc/doxygen/doxygen-1.8.13.ebuild b/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
similarity index 97%
rename from app-doc/doxygen/doxygen-1.8.13.ebuild
rename to app-doc/doxygen/doxygen-1.8.13-r1.ebuild
index ce44a9d..8b07058 100644
--- a/app-doc/doxygen/doxygen-1.8.13.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
@@ -55,6 +55,7 @@ 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.13-NULL-dereference.patch"
)
DOCS=( LANGUAGE.HOWTO README.md )
@@ -64,7 +65,7 @@ pkg_setup() {
}
src_prepare() {
- default
+ cmake-utils_src_prepare
# Ensure we link to -liconv
if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
@@ -82,12 +83,13 @@ src_prepare() {
doc/maintainers.txt || die
if is-flagq "-O3" ; then
- echo
+ ewarn
ewarn "Compiling with -O3 is known to produce incorrectly"
ewarn "optimized code which breaks doxygen."
- echo
+ ewarn
+ elog
elog "Continuing with -O2 instead ..."
- echo
+ elog
replace-flags "-O3" "-O2"
fi
}
diff --git a/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch b/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch
new file mode 100644
index 00000000..8d72e8f
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch
@@ -0,0 +1,24 @@
+From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001
+From: albert-github <albert.tests@gmail.com>
+Date: Wed, 4 Jan 2017 12:24:55 +0100
+Subject: [PATCH] Bug 776791 - [1.8.13 Regression] Segfault building the
+ breathe docs
+
+Protected against NULL pointer of variable al
+---
+ src/xmlgen.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
+index fe95c7a..70e198a 100644
+--- a/src/xmlgen.cpp
++++ b/src/xmlgen.cpp
+@@ -620,7 +620,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
+ if (md->isInline()) t << "yes"; else t << "no";
+ t << "\"";
+
+- if (al->refQualifier!=RefQualifierNone)
++ if (al!=0 && al->refQualifier!=RefQualifierNone)
+ {
+ t << " refqual=\"";
+ if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue";
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/
@ 2018-10-02 2:14 Matthias Maier
0 siblings, 0 replies; 14+ messages in thread
From: Matthias Maier @ 2018-10-02 2:14 UTC (permalink / raw
To: gentoo-commits
commit: 4126e1d5bc12eddbbafaab0e2fb6530526170500
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 2 02:10:59 2018 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Oct 2 02:13:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4126e1d5
app-doc/doxygen: apply llvm patches, fix subslot
- apply llvm patches, thanks to Stephen Newell for the patch.
- add missing subslot operator
Closes: https://bugs.gentoo.org/666692
Closes: https://bugs.gentoo.org/657556
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-doc/doxygen/doxygen-1.8.14-r1.ebuild | 5 +++--
app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch | 25 ++++++++++++++++++++++++
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
index 4c7544e0532..dce8fc8f3c8 100644
--- a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -30,7 +30,7 @@ RDEPEND="app-text/ghostscript-gpl
media-gfx/graphviz
media-libs/freetype
)
- doxysearch? ( dev-libs/xapian )
+ doxysearch? ( dev-libs/xapian:= )
latex? (
dev-texlive/texlive-bibtexextra
dev-texlive/texlive-fontsextra
@@ -59,6 +59,7 @@ 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 )
diff --git a/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch b/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch
new file mode 100644
index 00000000000..86e6d799941
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.14-llvm7.patch
@@ -0,0 +1,25 @@
+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] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/
@ 2018-10-02 2:14 Matthias Maier
0 siblings, 0 replies; 14+ messages in thread
From: Matthias Maier @ 2018-10-02 2:14 UTC (permalink / raw
To: gentoo-commits
commit: 43dbe32c9aad84c53a9303bb2148606ce5181a1f
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 2 02:05:56 2018 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Oct 2 02:13:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43dbe32c
app-doc/doxygen: drop old version 1.8.13
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-doc/doxygen/Manifest | 2 -
app-doc/doxygen/doxygen-1.8.13-r1.ebuild | 151 ---------------------
.../files/doxygen-1.8.13-NULL-dereference.patch | 24 ----
3 files changed, 177 deletions(-)
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index c91844ad8f9..1131255da45 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,3 +1 @@
-DIST doxygen-1.8.13.src.tar.gz 4893912 BLAKE2B 3eb7eb6e7d122f681a9af8caf8a33789d323d52a5c205a3c44a7953eec78f4b227062da3e71c09de443aa6ac5c780937218c3a8c9ddf06d3eb23200a33b7406f SHA512 85da5bd28ad9f33a8e50fa92796817d31e59c024127cb647cb967e4321dd51378feaacdf099d578b7e6020fd646a3c63e99c77420e49e3894fc18ca89ba3e0a2
DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c
-DIST doxywizard.png 4231 BLAKE2B c71e30fee273c7410bc6b65e171a864066e088d474785f5e24b5500806af1217a6e12e93c5b81a488e2d216bfa59aeed332a092515dbbf8b640d8f7320dda50a SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5
diff --git a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild b/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
deleted file mode 100644
index 98099291889..00000000000
--- a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit cmake-utils eutils flag-o-matic python-any-r1 xdg-utils
-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-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="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:= )
- 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-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.13-NULL-dereference.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=(
- -DDOC_INSTALL_DIR="share/doc/${P}"
- -Duse_libclang=$(usex clang)
- -Dbuild_doc=$(usex doc)
- -Dbuild_search=$(usex doxysearch)
- -Dbuild_wizard=$(usex qt5)
- -Duse_sqlite3=$(usex sqlite)
- )
-
- 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
-
- if use qt5; then
- doicon "${DISTDIR}/doxywizard.png"
- make_desktop_entry doxywizard "DoxyWizard ${PV}" \
- "/usr/share/pixmaps/doxywizard.png" \
- "Development"
- fi
-}
-
-pkg_postinst() {
- xdg_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() {
- xdg_desktop_database_update
-}
diff --git a/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch b/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch
deleted file mode 100644
index 8d72e8ff6e0..00000000000
--- a/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Wed, 4 Jan 2017 12:24:55 +0100
-Subject: [PATCH] Bug 776791 - [1.8.13 Regression] Segfault building the
- breathe docs
-
-Protected against NULL pointer of variable al
----
- src/xmlgen.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
-index fe95c7a..70e198a 100644
---- a/src/xmlgen.cpp
-+++ b/src/xmlgen.cpp
-@@ -620,7 +620,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
- if (md->isInline()) t << "yes"; else t << "no";
- t << "\"";
-
-- if (al->refQualifier!=RefQualifierNone)
-+ if (al!=0 && al->refQualifier!=RefQualifierNone)
- {
- t << " refqual=\"";
- if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue";
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/
@ 2019-03-19 17:28 Christoph Junghans
0 siblings, 0 replies; 14+ messages in thread
From: Christoph Junghans @ 2019-03-19 17:28 UTC (permalink / raw
To: gentoo-commits
commit: 0048986412d8739500a884685acd44f241494423
Author: Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 17:27:30 2019 +0000
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 17:28:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00489864
app-doc/doxygen: add xml-c++ patch
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Christoph Junghans <junghans <AT> gentoo.org>
app-doc/doxygen/doxygen-1.8.14-r2.ebuild | 134 +++++++++++++++++++++
app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch | 25 ++++
2 files changed, 159 insertions(+)
diff --git a/app-doc/doxygen/doxygen-1.8.14-r2.ebuild b/app-doc/doxygen/doxygen-1.8.14-r2.ebuild
new file mode 100644
index 00000000000..d963510d4e4
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.14-r2.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_4,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="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-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.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-xml-c++.patch b/app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch
new file mode 100644
index 00000000000..8680d19dd46
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch
@@ -0,0 +1,25 @@
+From f217b5c36b39a294b920437ff66055ee1a3fa5b7 Mon Sep 17 00:00:00 2001
+From: albert-github <albert.tests@gmail.com>
+Date: Tue, 19 Mar 2019 10:42:24 +0100
+Subject: [PATCH] issue #6892 xml not well-formed (invalid token) for c++
+
+the `declname` and `defname` should also be converted (compare as well the routine `generateXMLForMember`)
+---
+ src/xmlgen.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
+index 420a653fc..568e48886 100644
+--- a/src/xmlgen.cpp
++++ b/src/xmlgen.cpp
+@@ -360,8 +360,8 @@ static void writeTemplateArgumentList(ArgumentList *al,
+ }
+ if (!a->name.isEmpty())
+ {
+- t << indentStr << " <declname>" << a->name << "</declname>" << endl;
+- t << indentStr << " <defname>" << a->name << "</defname>" << endl;
++ t << indentStr << " <declname>" << convertToXML(a->name) << "</declname>" << endl;
++ t << indentStr << " <defname>" << convertToXML(a->name) << "</defname>" << endl;
+ }
+ if (!a->defval.isEmpty())
+ {
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/
@ 2019-12-12 19:46 Matthias Maier
0 siblings, 0 replies; 14+ messages in thread
From: Matthias Maier @ 2019-12-12 19:46 UTC (permalink / raw
To: gentoo-commits
commit: 800629cda982acb00750586ba4eb769c37b6a81c
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 19:37:36 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 19:46:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=800629cd
app-doc/doxygen: 1.8.16: fix external tag file issue
Closes: https://bugs.gentoo.org/701930
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 +
...en-1.8.16-fix-external-tag-files-with-TOC.patch | 50 ++++++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/app-doc/doxygen/doxygen-1.8.16.ebuild b/app-doc/doxygen/doxygen-1.8.16.ebuild
index 98f6fa74904..e37985247ca 100644
--- a/app-doc/doxygen/doxygen-1.8.16.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.16.ebuild
@@ -64,6 +64,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
"${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692
"${FILESDIR}/${PN}-1.8.16-ghostscript-compatilibility.patch" #695710
+ "${FILESDIR}/${PN}-1.8.16-fix-external-tag-files-with-TOC.patch" #701930
)
DOCS=( LANGUAGE.HOWTO README.md )
diff --git a/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch b/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch
new file mode 100644
index 00000000000..cc0704b440f
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch
@@ -0,0 +1,50 @@
+From 4a72a9b07e805b4ba27560e8e921bcee0002ef4c Mon Sep 17 00:00:00 2001
+From: albert-github <albert.tests@gmail.com>
+Date: Mon, 9 Sep 2019 13:28:28 +0200
+Subject: [PATCH] issue #7248: Including external tag files with TOC produces a
+ broken index.qhp
+
+Ignore automatically generated anchor names when importing a tag file.
+
+Upstream: https://github.com/doxygen/doxygen/pull/7250
+---
+ src/tagreader.cpp | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/src/tagreader.cpp b/src/tagreader.cpp
+index 56dbe7df9..d79d9b5c5 100644
+--- a/src/tagreader.cpp
++++ b/src/tagreader.cpp
+@@ -494,6 +494,23 @@ class TagFileParser : public QXmlDefaultHandler
+
+ void endDocAnchor()
+ {
++ // Check whether or not the tag is automatically generate, in that case ignore the tag.
++ switch(m_state)
++ {
++ case InClass:
++ case InFile:
++ case InNamespace:
++ case InGroup:
++ case InPage:
++ case InMember:
++ case InPackage:
++ case InDir:
++ if (QString(m_curString).startsWith("autotoc_md")) return;
++ break;
++ default:
++ warn("Unexpected tag 'docanchor' found");
++ return;
++ }
+ switch(m_state)
+ {
+ case InClass: m_curClass->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
+@@ -504,7 +521,7 @@ class TagFileParser : public QXmlDefaultHandler
+ case InMember: m_curMember->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
+ case InPackage: m_curPackage->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
+ case InDir: m_curDir->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
+- default: warn("Unexpected tag 'docanchor' found"); break;
++ default: warn("Unexpected tag 'docanchor' found"); break; // Not really necessary anymore
+ }
+ }
+
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/
@ 2020-09-30 5:48 Andreas Sturmlechner
0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2020-09-30 5:48 UTC (permalink / raw
To: gentoo-commits
commit: 8546dc42964239baa014711e0cfcb880a420a3d5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 26 21:55:54 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 30 05:48:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8546dc42
app-doc/doxygen: Drop 1.8.15 and 1.8.16-r1
Closes: https://bugs.gentoo.org/721400
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-doc/doxygen/Manifest | 2 -
app-doc/doxygen/doxygen-1.8.15.ebuild | 139 --------------------
app-doc/doxygen/doxygen-1.8.16-r1.ebuild | 140 ---------------------
app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch | 25 ----
.../files/doxygen-1.8.15-link_with_pthread.patch | 32 -----
...en-1.8.16-fix-external-tag-files-with-TOC.patch | 50 --------
...oxygen-1.8.16-ghostscript-compatilibility.patch | 39 ------
7 files changed, 427 deletions(-)
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 617e2dfa6b3..9fcd0fe810f 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,3 +1 @@
-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.15.ebuild b/app-doc/doxygen/doxygen-1.8.15.ebuild
deleted file mode 100644
index a2b7e8c0836..00000000000
--- a/app-doc/doxygen/doxygen-1.8.15.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils eutils llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
- SRC_URI=""
-else
- SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
- dev-lang/perl
- media-libs/libpng:0=
- virtual/libiconv
- clang? ( <sys-devel/clang-10:= )
- dot? (
- media-gfx/graphviz
- media-libs/freetype
- )
- doxysearch? ( dev-libs/xapian:= )
- latex? (
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- qt5? (
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
- sqlite? ( dev-db/sqlite:3 )
- "
-
-REQUIRED_USE="doc? ( latex )"
-
-DEPEND="sys-devel/flex
- sys-devel/bison
- doc? ( ${PYTHON_DEPS} )
- ${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
- "${FILESDIR}/${PN}-1.8.15-link_with_pthread.patch"
- "${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692
- "${FILESDIR}/${PN}-1.8.14-xml-c++.patch" #doxygen/doxygen#6892
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-LLVM_MAX_SLOT=9
-
-pkg_setup() {
- use clang && llvm_pkg_setup
- use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # Ensure we link to -liconv
- if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
- local pro
- for pro in */*.pro.in */*/*.pro.in; do
- echo "unix:LIBS += -liconv" >> "${pro}" || die
- done
- fi
-
- # Call dot with -Teps instead of -Tps for EPS generation - bug #282150
- sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
- # fix pdf doc
- sed -i.orig -e "s:g_kowal:g kowal:" \
- doc/maintainers.txt || die
-
- if is-flagq "-O3" ; then
- ewarn
- ewarn "Compiling with -O3 is known to produce incorrectly"
- ewarn "optimized code which breaks doxygen."
- ewarn
- elog
- elog "Continuing with -O2 instead ..."
- elog
- replace-flags "-O3" "-O2"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -Duse_libclang=$(usex clang)
- -Dbuild_doc=$(usex doc)
- -Dbuild_search=$(usex doxysearch)
- -Dbuild_wizard=$(usex qt5)
- -Duse_sqlite3=$(usex sqlite)
- )
- use doc && mycmakeargs+=(
- -DDOC_INSTALL_DIR="share/doc/${P}"
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use doc; then
- export VARTEXFONTS="${T}/fonts" # bug #564944
-
- if ! use dot; then
- sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \
- {Doxyfile,doc/Doxyfile} \
- || die "disabling dot failed"
- fi
- cmake-utils_src_make -C "${BUILD_DIR}" docs
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-}
diff --git a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
deleted file mode 100644
index 5ad7097b6d4..00000000000
--- a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils eutils llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
- SRC_URI=""
-else
- SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
- dev-lang/perl
- media-libs/libpng:0=
- virtual/libiconv
- clang? ( <sys-devel/clang-10:= )
- dot? (
- media-gfx/graphviz
- media-libs/freetype
- )
- doxysearch? ( dev-libs/xapian:= )
- latex? (
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- qt5? (
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
- sqlite? ( dev-db/sqlite:3 )
- "
-
-REQUIRED_USE="doc? ( latex )"
-
-DEPEND="sys-devel/flex
- sys-devel/bison
- doc? ( ${PYTHON_DEPS} )
- ${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
- "${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
- "${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692
- "${FILESDIR}/${PN}-1.8.16-ghostscript-compatilibility.patch" #695710
- "${FILESDIR}/${PN}-1.8.16-fix-external-tag-files-with-TOC.patch" #701930
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-LLVM_MAX_SLOT=9
-
-pkg_setup() {
- use clang && llvm_pkg_setup
- use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # Ensure we link to -liconv
- if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
- local pro
- for pro in */*.pro.in */*/*.pro.in; do
- echo "unix:LIBS += -liconv" >> "${pro}" || die
- done
- fi
-
- # Call dot with -Teps instead of -Tps for EPS generation - bug #282150
- sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
- # fix pdf doc
- sed -i.orig -e "s:g_kowal:g kowal:" \
- doc/maintainers.txt || die
-
- if is-flagq "-O3" ; then
- ewarn
- ewarn "Compiling with -O3 is known to produce incorrectly"
- ewarn "optimized code which breaks doxygen."
- ewarn
- elog
- elog "Continuing with -O2 instead ..."
- elog
- replace-flags "-O3" "-O2"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -Duse_libclang=$(usex clang)
- -Dbuild_doc=$(usex doc)
- -Dbuild_search=$(usex doxysearch)
- -Dbuild_wizard=$(usex qt5)
- -Duse_sqlite3=$(usex sqlite)
- -DGIT_EXECUTABLE="false"
- )
- use doc && mycmakeargs+=(
- -DDOC_INSTALL_DIR="share/doc/${P}"
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use doc; then
- export VARTEXFONTS="${T}/fonts" # bug #564944
-
- if ! use dot; then
- sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \
- {Doxyfile,doc/Doxyfile} \
- || die "disabling dot failed"
- fi
- cmake-utils_src_make -C "${BUILD_DIR}" docs
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-}
diff --git a/app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch b/app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch
deleted file mode 100644
index 8680d19dd46..00000000000
--- a/app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f217b5c36b39a294b920437ff66055ee1a3fa5b7 Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Tue, 19 Mar 2019 10:42:24 +0100
-Subject: [PATCH] issue #6892 xml not well-formed (invalid token) for c++
-
-the `declname` and `defname` should also be converted (compare as well the routine `generateXMLForMember`)
----
- src/xmlgen.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
-index 420a653fc..568e48886 100644
---- a/src/xmlgen.cpp
-+++ b/src/xmlgen.cpp
-@@ -360,8 +360,8 @@ static void writeTemplateArgumentList(ArgumentList *al,
- }
- if (!a->name.isEmpty())
- {
-- t << indentStr << " <declname>" << a->name << "</declname>" << endl;
-- t << indentStr << " <defname>" << a->name << "</defname>" << endl;
-+ t << indentStr << " <declname>" << convertToXML(a->name) << "</declname>" << endl;
-+ t << indentStr << " <defname>" << convertToXML(a->name) << "</defname>" << endl;
- }
- if (!a->defval.isEmpty())
- {
diff --git a/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch
deleted file mode 100644
index 54c0a96e5e1..00000000000
--- a/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/addon/doxysearch/CMakeLists.txt 2019-04-03 18:43:47.995610511 +0200
-+++ b/addon/doxysearch/CMakeLists.txt 2019-04-03 18:45:27.730609191 +0200
-@@ -18,6 +18,7 @@
- ${ZLIB_LIBRARIES}
- ${WIN_EXTRA_LIBS}
- qtools
-+ pthread
- )
-
- add_executable(doxysearch.cgi
-@@ -27,6 +28,7 @@
- ${XAPIAN_LIBRARIES}
- ${ZLIB_LIBRARIES}
- ${WIN_EXTRA_LIBS}
-+ pthread
- )
-
- install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin)
---- a/addon/doxywizard/CMakeLists.txt 2019-04-03 18:43:59.139610364 +0200
-+++ b/addon/doxywizard/CMakeLists.txt 2019-04-03 18:45:14.151609371 +0200
-@@ -102,9 +102,9 @@
- )
-
- if(Qt5Core_FOUND)
-- target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml)
-+ target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml pthread)
- else()
-- target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
-+ target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} pthread)
- endif()
-
- install(TARGETS doxywizard DESTINATION bin)
diff --git a/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch b/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch
deleted file mode 100644
index cc0704b440f..00000000000
--- a/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4a72a9b07e805b4ba27560e8e921bcee0002ef4c Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Mon, 9 Sep 2019 13:28:28 +0200
-Subject: [PATCH] issue #7248: Including external tag files with TOC produces a
- broken index.qhp
-
-Ignore automatically generated anchor names when importing a tag file.
-
-Upstream: https://github.com/doxygen/doxygen/pull/7250
----
- src/tagreader.cpp | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/src/tagreader.cpp b/src/tagreader.cpp
-index 56dbe7df9..d79d9b5c5 100644
---- a/src/tagreader.cpp
-+++ b/src/tagreader.cpp
-@@ -494,6 +494,23 @@ class TagFileParser : public QXmlDefaultHandler
-
- void endDocAnchor()
- {
-+ // Check whether or not the tag is automatically generate, in that case ignore the tag.
-+ switch(m_state)
-+ {
-+ case InClass:
-+ case InFile:
-+ case InNamespace:
-+ case InGroup:
-+ case InPage:
-+ case InMember:
-+ case InPackage:
-+ case InDir:
-+ if (QString(m_curString).startsWith("autotoc_md")) return;
-+ break;
-+ default:
-+ warn("Unexpected tag 'docanchor' found");
-+ return;
-+ }
- switch(m_state)
- {
- case InClass: m_curClass->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
-@@ -504,7 +521,7 @@ class TagFileParser : public QXmlDefaultHandler
- case InMember: m_curMember->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
- case InPackage: m_curPackage->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
- case InDir: m_curDir->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
-- default: warn("Unexpected tag 'docanchor' found"); break;
-+ default: warn("Unexpected tag 'docanchor' found"); break; // Not really necessary anymore
- }
- }
-
diff --git a/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch b/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch
deleted file mode 100644
index 55445fa19dc..00000000000
--- a/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f08e87623368134c6541af12995b811ef9aff069 Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Tue, 12 Nov 2019 11:42:22 +0100
-Subject: [PATCH] issue #7290 error: Problem running ghostscript gs -q -g562x56
- -r384x384x -sDEVICE=ppmraw -sOutputFile=_form0.pnm -dNOPAUSE -dBATCH --
- _form0.ps. Check your installation!
-
-@maehr had a talk with Robin Watts and Ken Sharp at IRC and there seem to be basically 3 different problems:
-* `-r%dx%d` (the dimension for `r` shouldn't be `-r384x384x`, but `-r384x384`),
-* misuse / unnecessary use of `--` and
-* since 9.50 the command needs more control access (that might be worked around by either whitelisting the file via `--permit-file-read=_form0.eps` (only works from 9.50 and upwards) or generally accepting any file with `-dNOSAFER` (works since quite some time). The second option is considered to be unsafe if we would process any file, but in this case we process self produced / controlled files. I don't know if doxygen has any threat model that it assumes. ).
-
-> Ken Sharp: Yeah the %dx is wrong, as Robin says its sheer luck that works
-the -- isn't needed and is what's causing the first problem
-and file control is the new bugbear
-
-The suggestions have been implemented and test / docs works now with old and new version.
----
- src/formula.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/formula.cpp b/src/formula.cpp
-index 534f56ac..3d8e6ce1 100644
---- a/src/formula.cpp
-+++ b/src/formula.cpp
-@@ -193,8 +193,8 @@ void FormulaList::generateBitmaps(const char *path)
- // used.
-
- char gsArgs[4096];
-- sprintf(gsArgs,"-q -g%dx%d -r%dx%dx -sDEVICE=ppmraw "
-- "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -- %s.ps",
-+ sprintf(gsArgs,"-q -g%dx%d -r%dx%d -sDEVICE=ppmraw "
-+ "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -dNOSAFER %s.ps",
- gx,gy,(int)(scaleFactor*72),(int)(scaleFactor*72),
- formBase.data(),formBase.data()
- );
---
-2.24.1
-
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/
@ 2021-01-14 18:58 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2021-01-14 18:58 UTC (permalink / raw
To: gentoo-commits
commit: b89f80cd9c20607ada13ec091a32cef4b44d29f3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 18:42:37 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 18:50:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b89f80cd
app-doc/doxygen: bump to 1.9.1
* USE=doc now generates fine with the
added dependency of dev-texlive/texlive-plaingeneric
for listofitems.
* Add a patch to ignore files we can't decode
when generating docs. Ideally those files
shouldn't exist anyway when we're generating docs,
or be ignored earlier, but this works.
Closes: https://bugs.gentoo.org/688658
Closes: https://bugs.gentoo.org/749630
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-doc/doxygen/Manifest | 1 +
app-doc/doxygen/doxygen-1.9.1.ebuild | 135 +++++++++++++++++++++
.../files/doxygen-1.9.1-ignore-bad-encoding.patch | 23 ++++
3 files changed, 159 insertions(+)
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 0f360533449..4903673007f 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,2 +1,3 @@
DIST doxygen-1.8.17.src.tar.gz 5138888 BLAKE2B 79d7d64fe2104f3fc802e9ee8f5fcd13ed4f0e23fe3e8d8013d1724d917d5f4e7d8c2df672e253aa2c8d67e839a6169632ebd87bc281b8ee70d217f486e402f7 SHA512 2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75
DIST doxygen-1.8.20.src.tar.gz 5132703 BLAKE2B 2a9e6df833c64d7052331b52647943f7eaad8214d66962970ad55628cc2ab26883655908588bee2d4872bb2d6d85f8d18cbb03e7dabe0280f337ab53d8538ec9 SHA512 65d104d25061ee59199c74c0328f59fbeaf14f0dade755187ebd43f59008adfef243d4da448b71ae04dc325b848f9bdd109eb20e6f6092f3ed19862426d060cf
+DIST doxygen-1.9.1.src.tar.gz 5117435 BLAKE2B 28c1a1cb8390e17e2b399cea765f837782ee268a999606eef4031a5f65943c793c97bdbd2e2a25a39358ecac5df2c7a62aa4cca72753a924e4e718c512b8a9c7 SHA512 637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed
diff --git a/app-doc/doxygen/doxygen-1.9.1.ebuild b/app-doc/doxygen/doxygen-1.9.1.ebuild
new file mode 100644
index 00000000000..949ef011d17
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.9.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+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"
+ 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 ~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"
+
+BDEPEND="sys-devel/bison
+ sys-devel/flex
+ doc? ( ${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"
+)
+
+DOCS=( LANGUAGE.HOWTO README.md )
+
+pkg_setup() {
+ use clang && llvm_pkg_setup
+ use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_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_src_configure
+}
+
+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_src_compile docs
+ fi
+
+ cmake_src_compile
+}
+
+src_install() {
+ cmake_src_install
+}
diff --git a/app-doc/doxygen/files/doxygen-1.9.1-ignore-bad-encoding.patch b/app-doc/doxygen/files/doxygen-1.9.1-ignore-bad-encoding.patch
new file mode 100644
index 00000000000..5dd7578f24e
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.9.1-ignore-bad-encoding.patch
@@ -0,0 +1,23 @@
+Hack to avoid "UnicodeDecodeError: 'utf-8' codec can't decode byte 0xb0 in position 45: invalid start byte"
+in src/._xmlgen.cpp which is binary. This doesn't seem like it should be present at the time the docs
+are generated, but this is simpler for now.
+--- a/doc/translator.py
++++ b/doc/translator.py
+@@ -1454,10 +1454,13 @@ class TrManager:
+
+ # Read content of the file as one string.
+ assert os.path.isfile(fname)
+- f = xopen(fname)
+- cont = f.read()
+- cont = ''.join(cont.split('\n')) # otherwise the 'match' function won't work.
+- f.close()
++ try:
++ with xopen(fname) as f:
++ cont = f.read()
++ cont = ''.join(cont.split('\n')) # otherwise the 'match' function won't work.
++ except UnicodeDecodeError:
++ print("Skipping {0} because of decoding errors".format(fname))
++ return
+
+ # Remove the items for identifiers that were found in the file.
+ while lst_in:
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/
@ 2021-10-28 8:16 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2021-10-28 8:16 UTC (permalink / raw
To: gentoo-commits
commit: 3662ee1a29b6c18c14d3a8cdc6349f8d4e96bac6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 28 08:15:41 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 28 08:16:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3662ee1a
app-doc/doxygen: add 1.9.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-doc/doxygen/Manifest | 1 +
.../{doxygen-9999.ebuild => doxygen-1.9.2.ebuild} | 11 ++++----
app-doc/doxygen/doxygen-9999.ebuild | 10 ++++----
.../doxygen/files/doxygen-1.9.2-xml-static.patch | 29 ++++++++++++++++++++++
4 files changed, 41 insertions(+), 10 deletions(-)
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 4903673007f..0db5dc860c4 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,3 +1,4 @@
DIST doxygen-1.8.17.src.tar.gz 5138888 BLAKE2B 79d7d64fe2104f3fc802e9ee8f5fcd13ed4f0e23fe3e8d8013d1724d917d5f4e7d8c2df672e253aa2c8d67e839a6169632ebd87bc281b8ee70d217f486e402f7 SHA512 2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75
DIST doxygen-1.8.20.src.tar.gz 5132703 BLAKE2B 2a9e6df833c64d7052331b52647943f7eaad8214d66962970ad55628cc2ab26883655908588bee2d4872bb2d6d85f8d18cbb03e7dabe0280f337ab53d8538ec9 SHA512 65d104d25061ee59199c74c0328f59fbeaf14f0dade755187ebd43f59008adfef243d4da448b71ae04dc325b848f9bdd109eb20e6f6092f3ed19862426d060cf
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
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-1.9.2.ebuild
similarity index 90%
copy from app-doc/doxygen/doxygen-9999.ebuild
copy to app-doc/doxygen/doxygen-1.9.2.ebuild
index 4ab0c394c06..2c63853d732 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ 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"
@@ -55,11 +55,11 @@ RDEPEND="app-text/ghostscript-gpl
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}/${P}-xml-static.patch"
)
DOCS=( LANGUAGE.HOWTO README.md )
@@ -117,6 +117,8 @@ src_configure() {
}
src_compile() {
+ cmake_src_compile
+
if use doc; then
export VARTEXFONTS="${T}/fonts" # bug #564944
@@ -126,10 +128,9 @@ src_compile() {
|| die "disabling dot failed"
fi
- cmake_src_compile docs
+ # -j1 for bug #770070
+ cmake_src_compile docs -j1
fi
-
- cmake_src_compile
}
src_install() {
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 4ab0c394c06..e7cf3ed8012 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ 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"
@@ -55,7 +55,6 @@ RDEPEND="app-text/ghostscript-gpl
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"
@@ -117,6 +116,8 @@ src_configure() {
}
src_compile() {
+ cmake_src_compile
+
if use doc; then
export VARTEXFONTS="${T}/fonts" # bug #564944
@@ -126,10 +127,9 @@ src_compile() {
|| die "disabling dot failed"
fi
- cmake_src_compile docs
+ # -j1 for bug #770070
+ cmake_src_compile docs -j1
fi
-
- cmake_src_compile
}
src_install() {
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
new file mode 100644
index 00000000000..a106d6eb5a9
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.9.2-xml-static.patch
@@ -0,0 +1,29 @@
+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] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/
@ 2021-12-01 21:14 Andreas Sturmlechner
0 siblings, 0 replies; 14+ messages in thread
From: Andreas Sturmlechner @ 2021-12-01 21:14 UTC (permalink / raw
To: gentoo-commits
commit: 39dd36d816f126a54e048d28e3ab07343225dabc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 29 15:11:21 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 1 21:13:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39dd36d8
app-doc/doxygen: Drop 1.8.17-r1 and 1.8.20
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-doc/doxygen/Manifest | 2 -
app-doc/doxygen/doxygen-1.8.17-r1.ebuild | 137 ----------------------
app-doc/doxygen/doxygen-1.8.20.ebuild | 135 ---------------------
app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch | 11 --
app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch | 42 -------
5 files changed, 327 deletions(-)
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 0db5dc860c44..1ba9c1d618bc 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,4 +1,2 @@
-DIST doxygen-1.8.17.src.tar.gz 5138888 BLAKE2B 79d7d64fe2104f3fc802e9ee8f5fcd13ed4f0e23fe3e8d8013d1724d917d5f4e7d8c2df672e253aa2c8d67e839a6169632ebd87bc281b8ee70d217f486e402f7 SHA512 2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75
-DIST doxygen-1.8.20.src.tar.gz 5132703 BLAKE2B 2a9e6df833c64d7052331b52647943f7eaad8214d66962970ad55628cc2ab26883655908588bee2d4872bb2d6d85f8d18cbb03e7dabe0280f337ab53d8538ec9 SHA512 65d104d25061ee59199c74c0328f59fbeaf14f0dade755187ebd43f59008adfef243d4da448b71ae04dc325b848f9bdd109eb20e6f6092f3ed19862426d060cf
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
diff --git a/app-doc/doxygen/doxygen-1.8.17-r1.ebuild b/app-doc/doxygen/doxygen-1.8.17-r1.ebuild
deleted file mode 100644
index eb4af7f0b654..000000000000
--- a/app-doc/doxygen/doxygen-1.8.17-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils 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 ~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 userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
- dev-lang/perl
- media-libs/libpng:0=
- virtual/libiconv
- clang? ( >=sys-devel/clang-10:= )
- dot? (
- media-gfx/graphviz
- media-libs/freetype
- )
- 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/doxygen-1.8.20.ebuild b/app-doc/doxygen/doxygen-1.8.20.ebuild
deleted file mode 100644
index 75f3e53ee1da..000000000000
--- a/app-doc/doxygen/doxygen-1.8.20.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils 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 ~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 userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
- dev-lang/perl
- media-libs/libpng:0=
- virtual/libiconv
- clang? ( >=sys-devel/clang-10:= )
- dot? (
- media-gfx/graphviz
- media-libs/freetype
- )
- 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.17-ensure_static_support_libraries.patch"
-)
-
-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.15-llvm7.patch b/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch
deleted file mode 100644
index 861c79a6b0d9..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.15-llvm7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
diff --git a/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch b/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch
deleted file mode 100644
index 2b2ca0ef733f..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.17-llvm10.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/
@ 2022-05-14 20:04 Matthias Maier
0 siblings, 0 replies; 14+ messages in thread
From: Matthias Maier @ 2022-05-14 20:04 UTC (permalink / raw
To: gentoo-commits
commit: 9665b57a9eba60f67c1daa3b585d40eef4785efc
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 20:01:28 2022 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat May 14 20:04:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9665b57a
app-doc/doxygen: add 1.9.4
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-doc/doxygen/Manifest | 1 +
app-doc/doxygen/doxygen-1.9.4.ebuild | 128 +++++++++++++++++++++
.../files/doxygen-1.9.4-link_with_pthread.patch | 24 ++++
3 files changed, 153 insertions(+)
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 1b9bdbad9421..6daf172c6864 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,3 +1,4 @@
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
diff --git a/app-doc/doxygen/doxygen-1.9.4.ebuild b/app-doc/doxygen/doxygen-1.9.4.ebuild
new file mode 100644
index 000000000000..dde798573c04
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.9.4.ebuild
@@ -0,0 +1,128 @@
+# 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.9.4-link_with_pthread.patch"
+ "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.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.9.4-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.9.4-link_with_pthread.patch
new file mode 100644
index 000000000000..66093eb7deb9
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.9.4-link_with_pthread.patch
@@ -0,0 +1,24 @@
+diff --git a/addon/doxywizard/.CMakeLists.txt.swp b/addon/doxywizard/.CMakeLists.txt.swp
+deleted file mode 100644
+index fc379d2..0000000
+Binary files a/addon/doxywizard/.CMakeLists.txt.swp and /dev/null differ
+diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
+index bb0e0eb..b6135bd 100644
+--- a/addon/doxywizard/CMakeLists.txt
++++ b/addon/doxywizard/CMakeLists.txt
+@@ -132,12 +132,12 @@ apply_editbin(doxywizard windows)
+ endif()
+
+ 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()
+ if(Qt6Core_FOUND)
+- target_link_libraries(doxywizard Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Xml doxygen_version)
++ target_link_libraries(doxywizard Qt6::Core Qt6::Gui Qt6::Widgets Qt6::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()
+ endif()
+
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/
@ 2022-05-15 21:01 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2022-05-15 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 8081b6274bfa519e00d7d4692b39d3e1dde220e0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 20:56:06 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 15 21:00:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8081b627
app-doc/doxygen: fix build with GCC 12
Closes: https://bugs.gentoo.org/844229
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-doc/doxygen/doxygen-1.9.4.ebuild | 1 +
.../doxygen/files/doxygen-1.9.4-gcc12-include.patch | 19 +++++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/app-doc/doxygen/doxygen-1.9.4.ebuild b/app-doc/doxygen/doxygen-1.9.4.ebuild
index 925f54421fa8..43bcc5ceeb3c 100644
--- a/app-doc/doxygen/doxygen-1.9.4.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.4.ebuild
@@ -59,6 +59,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}/${P}-gcc12-include.patch"
)
DOCS=( LANGUAGE.HOWTO README.md )
diff --git a/app-doc/doxygen/files/doxygen-1.9.4-gcc12-include.patch b/app-doc/doxygen/files/doxygen-1.9.4-gcc12-include.patch
new file mode 100644
index 000000000000..44505e4bed40
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.9.4-gcc12-include.patch
@@ -0,0 +1,19 @@
+https://github.com/doxygen/doxygen/commit/5198966c8d5fec89116d025c74934ac03ea511fa
+https://bugs.gentoo.org/844229
+
+From: Dimitri van Heesch <doxygen@gmail.com>
+Date: Fri, 6 May 2022 09:55:16 +0200
+Subject: [PATCH] issue #9312: Build: cache.h:53:14: error: 'exchange' is not a
+ member of 'std'
+
+--- a/src/cache.h
++++ b/src/cache.h
+@@ -19,6 +19,7 @@
+ #include <list>
+ #include <unordered_map>
+ #include <mutex>
++#include <utility>
+ #include <ctype.h>
+
+ /*! Fixed size cache for value type V using keys of type K.
+
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2022-05-15 21:02 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-02 2:14 [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/, app-doc/doxygen/files/ Matthias Maier
-- strict thread matches above, loose matches on Subject: below --
2022-05-15 21:01 Sam James
2022-05-14 20:04 Matthias Maier
2021-12-01 21:14 Andreas Sturmlechner
2021-10-28 8:16 Sam James
2021-01-14 18:58 Sam James
2020-09-30 5:48 Andreas Sturmlechner
2019-12-12 19:46 Matthias Maier
2019-03-19 17:28 Christoph Junghans
2018-10-02 2:14 Matthias Maier
2017-02-04 13:52 David Seifert
2016-09-16 5:12 Matthias Maier
2016-02-28 3:57 Matthias Maier
2015-12-10 23:47 Matthias Maier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox