doxygen, bump version (#7227)

This commit is contained in:
Schrijvers Luc
2022-09-25 07:23:17 +02:00
committed by GitHub
parent b6ae6333c0
commit d28bb6276f
3 changed files with 27 additions and 51 deletions

View File

@@ -20,7 +20,7 @@ COPYRIGHT="1997-2017 Dimitri van Heesch"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://github.com/doxygen/doxygen/archive/Release_${portVersion//./_}.tar.gz"
CHECKSUM_SHA256="75b18117f88ca1930ab74c05f6712690a26dd4fdcfc9d7d5324be43160645fb4"
CHECKSUM_SHA256="1c5c9cd4445f694e43f089c17529caae6fe889b732fb0b145211025a1fcda1bb"
SOURCE_DIR="doxygen-Release_${portVersion//./_}"
PATCHES="doxygen-$portVersion.patchset"
@@ -57,14 +57,15 @@ BUILD_PREREQUIRES="
cmd:ld$secondaryArchSuffix
cmd:make
cmd:perl
cmd:python
cmd:python3
cmd:sed
"
BUILD()
{
# doesn't use GNUInstallDirs so we can't use $cmakeDirArgs
cmake . -DCMAKE_INSTALL_PREFIX=$prefix
cmake . -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$prefix
make $jobArgs
}

View File

@@ -1,48 +0,0 @@
From 57704cfa685880843a7fcf9250870396fd50a2fa Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Tue, 21 Jul 2015 18:48:26 -0400
Subject: Fixes to build on Haiku.
diff --git a/qtools/qglobal.h b/qtools/qglobal.h
index c3f7594..ef3e98c 100644
--- a/qtools/qglobal.h
+++ b/qtools/qglobal.h
@@ -134,6 +134,8 @@
#define _OS_CYGWIN_
#elif defined(__BEOS__)
#define _OS_BEOS_
+#elif defined(__HAIKU__)
+#define _OS_HAIKU_
#elif defined(__MINT__)
#define _OS_MINT_
#else
diff --git a/qtools/qthread_unix.cpp b/qtools/qthread_unix.cpp
index 5871605..247dca2 100644
--- a/qtools/qthread_unix.cpp
+++ b/qtools/qthread_unix.cpp
@@ -136,7 +136,7 @@ void QThread::start()
pthread_attr_t attr;
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_DETACHED);
-#ifndef __ANDROID__
+#if !defined(__ANDROID__) && !defined(__HAIKU__)
pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED);
#endif
if (d->stackSize>0)
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 00826d6..be8f076 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -10322,7 +10322,7 @@ void readConfiguration(int argc, char **argv)
Config::init();
if (optind+4<argc || QFileInfo("Doxyfile").exists())
{
- QCString df = optind+4<argc ? argv[optind+4] : QCString("Doxyfile");
+ QCString df = optind+4<argc ? (QCString)argv[optind+4] : QCString("Doxyfile");
if (!Config::parse(df))
{
err("error opening or reading configuration file %s!\n",argv[optind+4]);
--
2.16.2

View File

@@ -0,0 +1,23 @@
From d319553824b566ab3c6be99e8c8475f9fbdddd30 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 24 Sep 2022 10:37:12 +0200
Subject: filesystem.hpp, fix detection for Haiku, define GHC_NO_DIRENT_D_TYPE
diff --git a/filesystem/filesystem.hpp b/filesystem/filesystem.hpp
index fc8d987..f734e4c 100644
--- a/filesystem/filesystem.hpp
+++ b/filesystem/filesystem.hpp
@@ -80,6 +80,9 @@
#elif defined(__QNX__)
#define GHC_OS_QNX
#define GHC_NO_DIRENT_D_TYPE
+#elif defined(__HAIKU__)
+#define GHC_OS_HAIKU
+#define GHC_NO_DIRENT_D_TYPE
#else
#error "Operating system currently not supported!"
#endif
--
2.36.1