summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-01-19 22:33:46 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-01-19 22:33:46 +0000
commitc0cea500d5cb9e44c40c9f142b5cc006a132d32b (patch)
tree1016227f649c4b37968d4fe7089e89e97b5a1c5d
parentcec067d7103ff582a7e0f618791e820af750de99 (diff)
downloadpackages-c0cea500d5cb9e44c40c9f142b5cc006a132d32b.tar.gz
packages-c0cea500d5cb9e44c40c9f142b5cc006a132d32b.tar.bz2
packages-c0cea500d5cb9e44c40c9f142b5cc006a132d32b.tar.xz
packages-c0cea500d5cb9e44c40c9f142b5cc006a132d32b.zip
user/doxygen: Fix Qt 2.x code for time64 compatibility
-rw-r--r--user/doxygen/APKBUILD8
-rw-r--r--user/doxygen/time64.patch19
2 files changed, 24 insertions, 3 deletions
diff --git a/user/doxygen/APKBUILD b/user/doxygen/APKBUILD
index 881e6156d..eefc391ce 100644
--- a/user/doxygen/APKBUILD
+++ b/user/doxygen/APKBUILD
@@ -3,7 +3,7 @@ pkgname=doxygen
pkgver=1.8.16
_pkgver=${pkgver%.*.*}_${pkgver#*.}
_pkgver=${_pkgver%.*}_${pkgver#*.*.}
-pkgrel=0
+pkgrel=1
pkgdesc="A documentation system for C++, C, Java, IDL, and PHP"
url="http://www.doxygen.org/"
arch="all"
@@ -13,6 +13,7 @@ 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"
@@ -30,7 +31,7 @@ build() {
check() {
# Remove test that use bibtex
rm -f ./testing/012_cite.dox
- make test
+ CTEST_OUTPUT_ON_FAILURE=true make test
}
package() {
@@ -38,4 +39,5 @@ package() {
}
sha512sums="546ceaae949cf5cc8162309bc804dad7a00b970c14a2dd66d27111e03f2fbebfec299ddc559f8c915ed00776217d2c439843806d2b6c15b58cf29f490979bd8f Release_1_8_16.tar.gz
-725a29a6f21ffc8ec6ca8ed6d746a69cc78060e97704c7fe909abee603ba0a99f27dc3b80c414afd886d0ee81d9948b13f29c43f7db2e00aae8c0c3a32aa9ec1 doxygen-1.8.14-install.patch"
+725a29a6f21ffc8ec6ca8ed6d746a69cc78060e97704c7fe909abee603ba0a99f27dc3b80c414afd886d0ee81d9948b13f29c43f7db2e00aae8c0c3a32aa9ec1 doxygen-1.8.14-install.patch
+92d82c0799d7cdbb6fb37069514d7c6dbadb0c3d88409803e88180bcfcf4be9a2f346c035cd49de8f7496eed2ffd1519d96a1ec3c22db21c2dfdc4e437dada50 time64.patch"
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