summaryrefslogtreecommitdiff
path: root/user/doxygen
diff options
context:
space:
mode:
Diffstat (limited to 'user/doxygen')
-rw-r--r--user/doxygen/APKBUILD14
-rw-r--r--user/doxygen/doxygen-1.8.14-install.patch21
-rw-r--r--user/doxygen/time64.patch19
3 files changed, 26 insertions, 28 deletions
diff --git a/user/doxygen/APKBUILD b/user/doxygen/APKBUILD
index 881e6156d..69a89354f 100644
--- a/user/doxygen/APKBUILD
+++ b/user/doxygen/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer:
pkgname=doxygen
-pkgver=1.8.16
+pkgver=1.8.20
_pkgver=${pkgver%.*.*}_${pkgver#*.}
_pkgver=${_pkgver%.*}_${pkgver#*.*.}
pkgrel=0
@@ -12,7 +12,7 @@ depends=""
makedepends="bison cmake coreutils flex perl python3"
checkdepends="libxml2-utils"
source="https://github.com/doxygen/doxygen/archive/Release_$_pkgver.tar.gz
- doxygen-1.8.14-install.patch
+ time64.patch
"
builddir="$srcdir/doxygen-Release_$_pkgver"
@@ -21,8 +21,8 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-Dbuild_xmlparser=ON \
- -DMAN_INSTALL_DIR=/usr/share/man/man1 \
- -DDOC_INSTALL_DIR=/usr/share/doc/doxygen
+ -DMAN_INSTALL_DIR=share/man/man1 \
+ -DDOC_INSTALL_DIR=share/doc/doxygen
make
}
@@ -30,12 +30,12 @@ build() {
check() {
# Remove test that use bibtex
rm -f ./testing/012_cite.dox
- make test
+ CTEST_OUTPUT_ON_FAILURE=true make test
}
package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="546ceaae949cf5cc8162309bc804dad7a00b970c14a2dd66d27111e03f2fbebfec299ddc559f8c915ed00776217d2c439843806d2b6c15b58cf29f490979bd8f Release_1_8_16.tar.gz
-725a29a6f21ffc8ec6ca8ed6d746a69cc78060e97704c7fe909abee603ba0a99f27dc3b80c414afd886d0ee81d9948b13f29c43f7db2e00aae8c0c3a32aa9ec1 doxygen-1.8.14-install.patch"
+sha512sums="25509cec8904b10431cf3d29f6e6bbdad49fbf3a763606b30c92c111f294ac0311aa13d53007d71ff1f55fcae6903e2ce8f80d1a6b4832fa43f6a9166184e005 Release_1_8_20.tar.gz
+92d82c0799d7cdbb6fb37069514d7c6dbadb0c3d88409803e88180bcfcf4be9a2f346c035cd49de8f7496eed2ffd1519d96a1ec3c22db21c2dfdc4e437dada50 time64.patch"
diff --git a/user/doxygen/doxygen-1.8.14-install.patch b/user/doxygen/doxygen-1.8.14-install.patch
deleted file mode 100644
index 71448b8b4..000000000
--- a/user/doxygen/doxygen-1.8.14-install.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- doxygen-1.8.14/doc/CMakeLists.txt.config 2017-12-31 15:28:32.351163123 +0100
-+++ doxygen-1.8.14/doc/CMakeLists.txt 2017-12-31 15:29:11.490119182 +0100
-@@ -168,15 +168,15 @@ install(FILES
- "${PROJECT_BINARY_DIR}/man/doxywizard.1"
- "${PROJECT_BINARY_DIR}/man/doxysearch.1"
- "${PROJECT_BINARY_DIR}/man/doxyindexer.1"
-- DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
-+ DESTINATION "${MAN_INSTALL_DIR}"
- )
-
- install(FILES
- "${PROJECT_BINARY_DIR}/latex/doxygen_manual.pdf"
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+ DESTINATION "${DOC_INSTALL_DIR}"
- )
-
- install(DIRECTORY
- "${PROJECT_BINARY_DIR}/html"
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+ DESTINATION "${DOC_INSTALL_DIR}"
- )
diff --git a/user/doxygen/time64.patch b/user/doxygen/time64.patch
new file mode 100644
index 000000000..ee06d6e03
--- /dev/null
+++ b/user/doxygen/time64.patch
@@ -0,0 +1,19 @@
+--- doxygen-Release_1_8_16/qtools/qdatetime.cpp.old 2019-08-08 13:36:52.000000000 +0000
++++ doxygen-Release_1_8_16/qtools/qdatetime.cpp 2020-01-19 19:14:24.204239898 +0000
+@@ -35,7 +35,6 @@
+ **
+ **********************************************************************/
+
+-#define gettimeofday __hide_gettimeofday
+ #include "qdatetime.h"
+ #include "qdatastream.h"
+ #include <stdio.h>
+@@ -55,8 +54,6 @@
+ #elif defined(_OS_UNIX_) || defined(_OS_MAC_)
+ #include <sys/time.h>
+ #include <unistd.h>
+-#undef gettimeofday
+-extern "C" int gettimeofday( struct timeval *, struct timezone * );
+ #endif
+
+ static const uint FIRST_DAY = 2361222; // Julian day for 1752/09/14