From 3d16a30ad8aa33a681548e2255f9dc1c5aade92b Mon Sep 17 00:00:00 2001 From: miqlas Date: Sun, 25 Dec 2016 19:59:26 +0100 Subject: [PATCH] Doxygen: bump version (#954) * Doxygen: bump version * Update doxygen-1.8.12.recipe --- ...en-1.8.10.recipe => doxygen-1.8.12.recipe} | 20 ++-- app-doc/doxygen/patches/doxygen-1.8.10.patch | 69 ------------ app-doc/doxygen/patches/doxygen-1.8.12.patch | 103 ++++++++++++++++++ 3 files changed, 112 insertions(+), 80 deletions(-) rename app-doc/doxygen/{doxygen-1.8.10.recipe => doxygen-1.8.12.recipe} (74%) delete mode 100644 app-doc/doxygen/patches/doxygen-1.8.10.patch create mode 100644 app-doc/doxygen/patches/doxygen-1.8.12.patch diff --git a/app-doc/doxygen/doxygen-1.8.10.recipe b/app-doc/doxygen/doxygen-1.8.12.recipe similarity index 74% rename from app-doc/doxygen/doxygen-1.8.10.recipe rename to app-doc/doxygen/doxygen-1.8.12.recipe index 86b7f5f79..af6d11a3d 100644 --- a/app-doc/doxygen/doxygen-1.8.10.recipe +++ b/app-doc/doxygen/doxygen-1.8.12.recipe @@ -1,9 +1,8 @@ SUMMARY="Generate documentation from source code" -DESCRIPTION=" -Doxygen is the de facto standard tool for generating documentation from \ -annotated C++ sources, but it also supports other popular programming \ -languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba and \ -Microsoft flavors), Fortran, VHDL, Tcl, and to some extent D. +DESCRIPTION="Doxygen is the de facto standard tool for generating \ +documentation from annotated C++ sources, but it also supports other popular \ +programming languages such as C, Objective-C, C#, PHP, Java, Python, IDL \ +(Corba and Microsoft flavors), Fortran, VHDL, Tcl, and to some extent D. Doxygen can: * generate an on-line documentation browser (in HTML) and/or an \ off-line reference manual (in LaTeX) from a set of documented source \ @@ -16,21 +15,20 @@ very useful to quickly find your way in large source distributions. \ Doxygen can also visualize the relations between the various elements \ by means of include dependency graphs, inheritance diagrams, and \ collaboration diagrams, which are all generated automatically." -HOMEPAGE="http://www.doxygen.org" -COPYRIGHT="1997-2015 Dimitri van Heesch" +HOMEPAGE="http://www.doxygen.org/" +COPYRIGHT="1997-2016 Dimitri van Heesch" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-$portVersion.src.tar.gz" -CHECKSUM_SHA256="cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93" +CHECKSUM_SHA256="792d4091cbdf228549ff2033dd71ff7ea5029c6b436317cc5ec866e71302df6c" PATCHES="doxygen-$portVersion.patch" -ARCHITECTURES="!x86_gcc2 x86 ?x86_64" +ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" doxygen$secondaryArchSuffix = $portVersion compat >= 1.8 cmd:doxygen = $portVersion compat >= 1.8 - cmd:doxytag = $portVersion compat >= 1.8 " REQUIRES=" haiku$secondaryArchSuffix diff --git a/app-doc/doxygen/patches/doxygen-1.8.10.patch b/app-doc/doxygen/patches/doxygen-1.8.10.patch deleted file mode 100644 index 1bfda9d69..000000000 --- a/app-doc/doxygen/patches/doxygen-1.8.10.patch +++ /dev/null @@ -1,69 +0,0 @@ -From a824ee4bf0a5f9914232352282507bee339b0331 Mon Sep 17 00:00:00 2001 -From: Augustin Cavalier -Date: Tue, 21 Jul 2015 18:48:26 -0400 -Subject: [PATCH] Fixes to build on Haiku. - ---- - qtools/qglobal.h | 6 ++++-- - qtools/qthread_unix.cpp | 2 +- - src/doxygen.cpp | 2 +- - 3 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/qtools/qglobal.h b/qtools/qglobal.h -index c3f7594..997fd92 100644 ---- a/qtools/qglobal.h -+++ b/qtools/qglobal.h -@@ -1,5 +1,5 @@ - /**************************************************************************** --** -+** - ** - ** Global type declarations and definitions - ** -@@ -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 -@@ -276,7 +278,7 @@ - #define _CC_V2002 - #else - #define _CC_V1998 --#endif -+#endif - #endif - - #ifndef Q_PACKED -diff --git a/qtools/qthread_unix.cpp b/qtools/qthread_unix.cpp -index b536583..ab4c8fc 100644 ---- a/qtools/qthread_unix.cpp -+++ b/qtools/qthread_unix.cpp -@@ -132,7 +132,7 @@ void QThread::start() - pthread_attr_t attr; - pthread_attr_init(&attr); - pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_DETACHED); -- pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); -+ //pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); - if (d->stackSize>0) - { - #if defined(_POSIX_THREAD_ATTR_STACKSIZE) && (_POSIX_THREAD_ATTR_STACKSIZE-0>0) -diff --git a/src/doxygen.cpp b/src/doxygen.cpp -index 647b5c8..ca66123 100644 ---- a/src/doxygen.cpp -+++ b/src/doxygen.cpp -@@ -10277,7 +10277,7 @@ void readConfiguration(int argc, char **argv) - { - if (optind+4parse(df)) - { - err("error opening or reading configuration file %s!\n",argv[optind+4]); --- -2.2.2 - diff --git a/app-doc/doxygen/patches/doxygen-1.8.12.patch b/app-doc/doxygen/patches/doxygen-1.8.12.patch new file mode 100644 index 000000000..7a1e0e838 --- /dev/null +++ b/app-doc/doxygen/patches/doxygen-1.8.12.patch @@ -0,0 +1,103 @@ +From 57704cfa685880843a7fcf9250870396fd50a2fa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sat, 24 Dec 2016 21:38:44 +0100 +Subject: [PATCH] [PATCH] Fixes to build on Haiku, originally from + waddlesplash. + +--- + qtools/qglobal.h | 6 ++++-- + qtools/qthread_unix.cpp | 12 ++++++------ + src/doxygen.cpp | 2 +- + 3 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/qtools/qglobal.h b/qtools/qglobal.h +index c3f7594..997fd92 100644 +--- a/qtools/qglobal.h ++++ b/qtools/qglobal.h +@@ -1,5 +1,5 @@ + /**************************************************************************** +-** ++** + ** + ** Global type declarations and definitions + ** +@@ -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 +@@ -276,7 +278,7 @@ + #define _CC_V2002 + #else + #define _CC_V1998 +-#endif ++#endif + #endif + + #ifndef Q_PACKED +diff --git a/qtools/qthread_unix.cpp b/qtools/qthread_unix.cpp +index b536583..a1bbaa6 100644 +--- a/qtools/qthread_unix.cpp ++++ b/qtools/qthread_unix.cpp +@@ -132,7 +132,7 @@ void QThread::start() + pthread_attr_t attr; + pthread_attr_init(&attr); + pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_DETACHED); +- pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); ++// pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); + if (d->stackSize>0) + { + #if defined(_POSIX_THREAD_ATTR_STACKSIZE) && (_POSIX_THREAD_ATTR_STACKSIZE-0>0) +@@ -199,12 +199,12 @@ int QThread::idealThreadCount() + #elif defined(_OS_HPUX_) + // HP-UX + struct pst_dynamic psd; +- if (pstat_getdynamic(&psd, sizeof(psd), 1, 0) == -1) ++ if (pstat_getdynamic(&psd, sizeof(psd), 1, 0) == -1) + { + perror("pstat_getdynamic"); + cores = -1; +- } +- else ++ } ++ else + { + cores = (int)psd.psd_proc_cnt; + } +@@ -215,7 +215,7 @@ int QThread::idealThreadCount() + mib[0] = CTL_HW; + mib[1] = HW_NCPU; + +- if (sysctl(mib, 2, &cores, &len, NULL, 0) != 0) ++ if (sysctl(mib, 2, &cores, &len, NULL, 0) != 0) + { + perror("sysctl"); + cores = -1; +@@ -227,6 +227,6 @@ int QThread::idealThreadCount() + // the rest: Linux, Solaris, AIX, Tru64 + cores = (int)sysconf(_SC_NPROCESSORS_ONLN); + #endif +- return cores; ++ return cores; + } + +diff --git a/src/doxygen.cpp b/src/doxygen.cpp +index d649ce5..0327db4 100644 +--- a/src/doxygen.cpp ++++ b/src/doxygen.cpp +@@ -10315,7 +10315,7 @@ void readConfiguration(int argc, char **argv) + Config::init(); + if (optind+4