From a7a207154cb520c30d1adeadd85a4ccbc14400d6 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 10 Jan 2015 14:46:07 -0500 Subject: [PATCH] doxygen: 1.7.6.1, delete old recipes. --- app-doc/doxygen/doxygen-1.6.3.recipe | 70 ------ app-doc/doxygen/doxygen-1.7.4.recipe | 42 ---- app-doc/doxygen/doxygen-1.7.6.1.recipe | 66 ++++++ .../doxygen/patches/doxygen-1.6.3.patchset | 177 -------------- app-doc/doxygen/patches/doxygen-1.7.4.patch | 158 ------------- app-doc/doxygen/patches/doxygen-1.7.6.1.patch | 216 ++++++++++++++++++ 6 files changed, 282 insertions(+), 447 deletions(-) delete mode 100644 app-doc/doxygen/doxygen-1.6.3.recipe delete mode 100644 app-doc/doxygen/doxygen-1.7.4.recipe create mode 100644 app-doc/doxygen/doxygen-1.7.6.1.recipe delete mode 100644 app-doc/doxygen/patches/doxygen-1.6.3.patchset delete mode 100644 app-doc/doxygen/patches/doxygen-1.7.4.patch create mode 100644 app-doc/doxygen/patches/doxygen-1.7.6.1.patch diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe deleted file mode 100644 index 785467d1e..000000000 --- a/app-doc/doxygen/doxygen-1.6.3.recipe +++ /dev/null @@ -1,70 +0,0 @@ -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. -Doxygen can help you in three ways: -1. It can generate an on-line documentation browser (in HTML) and/or an \ -off-line reference manual (in $\mbox{\LaTeX}$) from a set of documented source \ -files. There is also support for generating output in RTF (MS-Word), \ -PostScript, hyperlinked PDF, compressed HTML, and Unix man pages. The \ -documentation is extracted directly from the sources, which makes it much \ -easier to keep the documentation consistent with the source code. -2. You can configure doxygen to extract the code structure from undocumented \ -source files. This is 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. -3. You can also use doxygen for creating normal documentation (as I did for \ -the doxygen user manual and web-site). -" -HOMEPAGE="http://www.doxygen.org" -COPYRIGHT="1997-2010 Dimitri van Heesch" -LICENSE="GNU GPL v2" -SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.3.src.tar.gz" -CHECKSUM_SHA256="a3a6524b5fc1da084fd0e081507c99240abaffff85f76ef7b15c9fb3ae248492" -REVISION="4" -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PATCHES="doxygen-1.6.3.patchset" - -PROVIDES=" - doxygen = $portVersion compat >= 1.6 - cmd:doxygen = $portVersion compat >= 1.6 - cmd:doxytag = $portVersion compat >= 1.6 - " -REQUIRES=" - haiku - lib:libiconv - " -BUILD_REQUIRES=" - devel:libiconv - " -BUILD_PREREQUIRES=" - haiku_devel - cmd:bison - cmd:flex - cmd:gcc - cmd:ld - cmd:make - cmd:perl - cmd:sed - " - - -PATCH() -{ - sed -i "s,MAN1DIR = man/man1,MAN1DIR = $relativeManDir/man1," Makefile.in -} - -BUILD() -{ - ./configure --prefix $prefix --docdir $docDir - make $jobArgs -} - -INSTALL() -{ - make install -} diff --git a/app-doc/doxygen/doxygen-1.7.4.recipe b/app-doc/doxygen/doxygen-1.7.4.recipe deleted file mode 100644 index f7b4d4df7..000000000 --- a/app-doc/doxygen/doxygen-1.7.4.recipe +++ /dev/null @@ -1,42 +0,0 @@ -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. -Doxygen can help you in three ways: -1. It can generate an on-line documentation browser (in HTML) and/or an \ -off-line reference manual (in $\mbox{\LaTeX}$) from a set of documented source \ -files. There is also support for generating output in RTF (MS-Word), \ -PostScript, hyperlinked PDF, compressed HTML, and Unix man pages. The \ -documentation is extracted directly from the sources, which makes it much \ -easier to keep the documentation consistent with the source code. -2. You can configure doxygen to extract the code structure from undocumented \ -source files. This is 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. -3. You can also use doxygen for creating normal documentation (as I did for \ -the doxygen user manual and web-site). -" -HOMEPAGE="http://www.doxygen.org" -SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.7.4.src.tar.gz" -CHECKSUM_MD5="ff908759ff7cd9464424b04ae6c68e48" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd doxygen-1.7.4 - sed -i 's/MAN1DIR = man\/man1/MAN1DIR = documentation\/man\/man1/' Makefile.in - ./configure --prefix `finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd doxygen-1.7.4 - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1997-2011 Dimitri van Heesch" diff --git a/app-doc/doxygen/doxygen-1.7.6.1.recipe b/app-doc/doxygen/doxygen-1.7.6.1.recipe new file mode 100644 index 000000000..49a3b86d0 --- /dev/null +++ b/app-doc/doxygen/doxygen-1.7.6.1.recipe @@ -0,0 +1,66 @@ +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. +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 \ +files. There is also support for generating output in RTF (MS-Word), \ +PostScript, hyperlinked PDF, compressed HTML, and Unix man pages. The \ +documentation is extracted directly from the sources, which makes it much \ +easier to keep the documentation consistent with the source code. + * extract the code structure from undocumented source files. This is \ +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-2011 Dimitri van Heesch" +LICENSE="GNU GPL v2" +SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-$portVersion.src.tar.gz" +CHECKSUM_SHA256="0e60e794fb172d3fa4a9a9535f0b8e0eeb04e8366153f6b417569af0bcd61fcd" +PATCHES="doxygen-$portVersion.patch" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + doxygen = $portVersion compat >= 1.7 + cmd:doxygen = $portVersion compat >= 1.7 + cmd:doxytag = $portVersion compat >= 1.7 + " +REQUIRES=" + haiku + lib:libiconv + " +BUILD_REQUIRES=" + devel:libiconv + " +BUILD_PREREQUIRES=" + haiku_devel + cmd:bison + cmd:flex + cmd:gcc + cmd:ld + cmd:make + cmd:perl + cmd:sed + " + +PATCH() +{ + sed -i "s,MAN1DIR = man/man1,MAN1DIR = $relativeManDir/man1," Makefile.in +} + +BUILD() +{ + # not an autotools configure + ./configure --prefix $prefix --docdir $docDir + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/app-doc/doxygen/patches/doxygen-1.6.3.patchset b/app-doc/doxygen/patches/doxygen-1.6.3.patchset deleted file mode 100644 index 68b9cf3e8..000000000 --- a/app-doc/doxygen/patches/doxygen-1.6.3.patchset +++ /dev/null @@ -1,177 +0,0 @@ -From 9612cfcd716d5924547e90229bd6e3cb51c950e9 Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Wed, 21 Aug 2013 12:02:33 +0200 -Subject: add support for Haiku - - -diff --git a/Makefile.in b/Makefile.in -index 781d359..9cd43eb 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2,7 +2,7 @@ - # cd qtools ; $(MAKE) - # cd src ; $(MAKE) - --DESTDIR = -+#DESTDIR = - - clean: FORCE - cd examples ; $(MAKE) clean -diff --git a/PLATFORMS b/PLATFORMS -index c358a1d..18c4ed5 100644 ---- a/PLATFORMS -+++ b/PLATFORMS -@@ -4,6 +4,7 @@ beos-g++ - dgux-g++ - freebsd-g++ - gnu-g++ -+haiku-g++ - hpux-acc - hpux-cc - hpux-g++ -diff --git a/configure b/configure -index c0db1c6..d631e47 100755 ---- a/configure -+++ b/configure -@@ -180,6 +180,9 @@ if test -z "$f_platform"; then - f_insttool=/usr/bin/install - fi - ;; -+ Haiku:*) -+ f_platform=haiku-g++ -+ ;; - HP-UX:*) - f_platform=hpux-g++ - if test "$f_insttool" = NO; then -diff --git a/qtools/qglobal.h b/qtools/qglobal.h -index 700cb80..259446d 100644 ---- a/qtools/qglobal.h -+++ b/qtools/qglobal.h -@@ -150,6 +150,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/src/doxygen.pro.in b/src/doxygen.pro.in -index cc93820..c8a8d50 100644 ---- a/src/doxygen.pro.in -+++ b/src/doxygen.pro.in -@@ -19,6 +19,7 @@ CONFIG = console warn_on $extraopts - HEADERS = doxygen.h - SOURCES = main.cpp - unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -+haiku-g++:LIBS += -L/boot/common/lib -liconv - win32:INCLUDEPATH += . - win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 - win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib -diff --git a/tmake/lib/haiku-g++/app.t b/tmake/lib/haiku-g++/app.t -new file mode 100644 -index 0000000..867725e ---- /dev/null -+++ b/tmake/lib/haiku-g++/app.t -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/app.t"); -diff --git a/tmake/lib/haiku-g++/lib.t b/tmake/lib/haiku-g++/lib.t -new file mode 100644 -index 0000000..2523b2f ---- /dev/null -+++ b/tmake/lib/haiku-g++/lib.t -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/lib.t"); -diff --git a/tmake/lib/haiku-g++/subdirs.t b/tmake/lib/haiku-g++/subdirs.t -new file mode 100644 -index 0000000..5e888af ---- /dev/null -+++ b/tmake/lib/haiku-g++/subdirs.t -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/subdirs.t"); -diff --git a/tmake/lib/haiku-g++/tmake.conf b/tmake/lib/haiku-g++/tmake.conf -new file mode 100644 -index 0000000..23a2738 ---- /dev/null -+++ b/tmake/lib/haiku-g++/tmake.conf -@@ -0,0 +1,51 @@ -+# -+# -+# -+# tmake configuration for haiku-g++ -+# -+ -+TEMPLATE = app -+CONFIG = qt warn_on release -+ -+TMAKE_CC = gcc -+TMAKE_CFLAGS = -+TMAKE_CFLAGS_WARN_ON = -Wall -W -+TMAKE_CFLAGS_WARN_OFF = -+TMAKE_CFLAGS_RELEASE = -+TMAKE_CFLAGS_DEBUG = -g -+TMAKE_CFLAGS_SHLIB = -fPIC -+TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -+ -+TMAKE_CXX = g++ -+TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -+TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -+TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -+TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -+TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -+TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -+TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC -+ -+TMAKE_INCDIR = -+TMAKE_LIBDIR = -+TMAKE_INCDIR_QT = $(QTDIR)/include -+TMAKE_LIBDIR_QT = $(QTDIR)/lib -+ -+TMAKE_LINK = g++ -+TMAKE_LINK_SHLIB = g++ -+TMAKE_LFLAGS = -Wl,-rpath=/lib:$(QTDIR)/lib -+TMAKE_LFLAGS_RELEASE = -+TMAKE_LFLAGS_DEBUG = -+TMAKE_LFLAGS_SHLIB = -shared -+TMAKE_LFLAGS_SONAME = -Wl,-soname, -+ -+TMAKE_LIBS = -+TMAKE_LIBS_QT = -lqt -+TMAKE_LIBS_QT_MT = -lqt-mt -+ -+TMAKE_MOC = moc -+ -+TMAKE_AR = ar cqs -+TMAKE_RANLIB = -+ -+TMAKE_TAR = tar -cf -+TMAKE_GZIP = gzip -9f --- -1.8.3.4 - - -From 2e7199416501ace72e5ab2a548cc07ab25ef910e Mon Sep 17 00:00:00 2001 -From: Ingo Weinhold -Date: Wed, 21 Aug 2013 12:21:09 +0200 -Subject: qvaluestack.h: fix gcc 4 build - - -diff --git a/qtools/qvaluestack.h b/qtools/qvaluestack.h -index 3fb61fd..7438fcb 100644 ---- a/qtools/qvaluestack.h -+++ b/qtools/qvaluestack.h -@@ -49,7 +49,7 @@ class Q_EXPORT QValueStack : public QValueList - public: - QValueStack() {} - ~QValueStack() {} -- void push( const T& d ) { append(d); } -+ void push( const T& d ) { this->append(d); } - T pop() - { - T elem( this->last() ); --- -1.8.3.4 - diff --git a/app-doc/doxygen/patches/doxygen-1.7.4.patch b/app-doc/doxygen/patches/doxygen-1.7.4.patch deleted file mode 100644 index d51095cc2..000000000 --- a/app-doc/doxygen/patches/doxygen-1.7.4.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff -up doxygen-1.7.4/Makefile.in.orig doxygen-1.7.4/Makefile.in ---- doxygen-1.7.4/Makefile.in.orig 2009-08-20 13:41:13.056098816 -0600 -+++ doxygen-1.7.4/Makefile.in 2011-05-14 12:14:04.776208384 -0600 -@@ -2,7 +2,7 @@ - # cd qtools ; $(MAKE) - # cd src ; $(MAKE) - --DESTDIR = -+#DESTDIR = - - clean: FORCE - cd examples ; $(MAKE) clean -diff -up doxygen-1.7.4/PLATFORMS.orig doxygen-1.7.4/PLATFORMS ---- doxygen-1.7.4/PLATFORMS.orig 2007-11-24 09:12:35.056360960 -0700 -+++ doxygen-1.7.4/PLATFORMS 2011-05-14 12:14:04.777519104 -0600 -@@ -4,6 +4,7 @@ beos-g++ - dgux-g++ - freebsd-g++ - gnu-g++ -+haiku-g++ - hpux-acc - hpux-cc - hpux-g++ -diff -up doxygen-1.7.4/configure.orig doxygen-1.7.4/configure ---- doxygen-1.7.4/configure.orig 2011-03-28 07:12:47.055050240 -0600 -+++ doxygen-1.7.4/configure 2011-05-14 12:14:04.783548416 -0600 -@@ -180,6 +180,9 @@ if test -z "$f_platform"; then - f_insttool=/usr/bin/install - fi - ;; -+ Haiku:*) -+ f_platform=haiku-g++ -+ ;; - HP-UX:*) - f_platform=hpux-g++ - if test "$f_insttool" = NO; then -diff -up doxygen-1.7.4/qtools/qglobal.h.orig doxygen-1.7.4/qtools/qglobal.h ---- doxygen-1.7.4/qtools/qglobal.h.orig 2010-06-09 03:49:13.006553600 -0600 -+++ doxygen-1.7.4/qtools/qglobal.h 2011-05-14 12:14:04.784859136 -0600 -@@ -150,6 +150,8 @@ - #define _OS_CYGWIN_ - #elif defined(__BEOS__) - #define _OS_BEOS_ -+#elif defined(__HAIKU__) -+#define _OS_HAIKU_ - #elif defined(__MINT__) - #define _OS_MINT_ - #else -diff -up doxygen-1.7.4/qtools/qthread_unix.cpp.orig doxygen-1.7.4/qtools/qthread_unix.cpp ---- doxygen-1.7.4/qtools/qthread_unix.cpp.orig 2010-05-15 09:48:47.012058624 -0600 -+++ doxygen-1.7.4/qtools/qthread_unix.cpp 2011-05-14 12:14:04.785645568 -0600 -@@ -123,7 +123,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 -up doxygen-1.7.4/src/doxygen.cpp.orig doxygen-1.7.4/src/doxygen.cpp ---- doxygen-1.7.4/src/doxygen.cpp.orig 2011-03-22 15:56:58.029360128 -0600 -+++ doxygen-1.7.4/src/doxygen.cpp 2011-05-14 12:14:04.802684928 -0600 -@@ -9465,7 +9465,7 @@ void readConfiguration(int argc, char ** - { - if (optind+4parse(df)) - { - err("error opening or reading configuration file %s!\n",argv[optind+4]); -diff -up doxygen-1.7.4/src/doxygen.pro.in.orig doxygen-1.7.4/src/doxygen.pro.in ---- doxygen-1.7.4/src/doxygen.pro.in.orig 2011-01-03 13:14:46.046661632 -0700 -+++ doxygen-1.7.4/src/doxygen.pro.in 2011-05-14 12:15:50.176947200 -0600 -@@ -18,7 +18,8 @@ TEMPLATE = app.t - CONFIG = console warn_on $extraopts - HEADERS = doxygen.h - SOURCES = main.cpp --unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread -+unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -+haiku-g++:LIBS += -L/boot/common/lib -liconv - win32:INCLUDEPATH += . - win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread - win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib -diff -up doxygen-1.7.4/tmake/lib/haiku-g++/app.t.orig doxygen-1.7.4/tmake/lib/haiku-g++/app.t ---- doxygen-1.7.4/tmake/lib/haiku-g++/app.t.orig 2011-05-14 12:14:04.823132160 -0600 -+++ doxygen-1.7.4/tmake/lib/haiku-g++/app.t 2011-05-14 12:14:04.818937856 -0600 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/app.t"); -diff -up doxygen-1.7.4/tmake/lib/haiku-g++/lib.t.orig doxygen-1.7.4/tmake/lib/haiku-g++/lib.t ---- doxygen-1.7.4/tmake/lib/haiku-g++/lib.t.orig 2011-05-14 12:14:04.828375040 -0600 -+++ doxygen-1.7.4/tmake/lib/haiku-g++/lib.t 2011-05-14 12:14:04.827326464 -0600 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/lib.t"); -diff -up doxygen-1.7.4/tmake/lib/haiku-g++/subdirs.t.orig doxygen-1.7.4/tmake/lib/haiku-g++/subdirs.t ---- doxygen-1.7.4/tmake/lib/haiku-g++/subdirs.t.orig 2011-05-14 12:14:04.830210048 -0600 -+++ doxygen-1.7.4/tmake/lib/haiku-g++/subdirs.t 2011-05-14 12:14:04.828899328 -0600 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/subdirs.t"); -diff -up doxygen-1.7.4/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.7.4/tmake/lib/haiku-g++/tmake.conf ---- doxygen-1.7.4/tmake/lib/haiku-g++/tmake.conf.orig 2011-05-14 12:14:04.832045056 -0600 -+++ doxygen-1.7.4/tmake/lib/haiku-g++/tmake.conf 2011-05-14 12:14:04.830734336 -0600 -@@ -0,0 +1,51 @@ -+# -+# -+# -+# tmake configuration for haiku-g++ -+# -+ -+TEMPLATE = app -+CONFIG = qt warn_on release -+ -+TMAKE_CC = gcc -+TMAKE_CFLAGS = -+TMAKE_CFLAGS_WARN_ON = -Wall -W -+TMAKE_CFLAGS_WARN_OFF = -+TMAKE_CFLAGS_RELEASE = -+TMAKE_CFLAGS_DEBUG = -g -+TMAKE_CFLAGS_SHLIB = -fPIC -+TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -+ -+TMAKE_CXX = g++ -+TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -+TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -+TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -+TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -+TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -+TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -+TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC -+ -+TMAKE_INCDIR = -+TMAKE_LIBDIR = -+TMAKE_INCDIR_QT = $(QTDIR)/include -+TMAKE_LIBDIR_QT = $(QTDIR)/lib -+ -+TMAKE_LINK = g++ -+TMAKE_LINK_SHLIB = g++ -+TMAKE_LFLAGS = -Wl,-rpath=/lib:$(QTDIR)/lib -+TMAKE_LFLAGS_RELEASE = -+TMAKE_LFLAGS_DEBUG = -+TMAKE_LFLAGS_SHLIB = -shared -+TMAKE_LFLAGS_SONAME = -Wl,-soname, -+ -+TMAKE_LIBS = -+TMAKE_LIBS_QT = -lqt -+TMAKE_LIBS_QT_MT = -lqt-mt -+ -+TMAKE_MOC = moc -+ -+TMAKE_AR = ar cqs -+TMAKE_RANLIB = -+ -+TMAKE_TAR = tar -cf -+TMAKE_GZIP = gzip -9f diff --git a/app-doc/doxygen/patches/doxygen-1.7.6.1.patch b/app-doc/doxygen/patches/doxygen-1.7.6.1.patch new file mode 100644 index 000000000..61ffcac7f --- /dev/null +++ b/app-doc/doxygen/patches/doxygen-1.7.6.1.patch @@ -0,0 +1,216 @@ +From 9309a5412ccb754634cca91ce1f43fd30ed4e0ce Mon Sep 17 00:00:00 2001 +From: Augustin Cavalier +Date: Sat, 10 Jan 2015 20:13:41 -0500 +Subject: [PATCH] Modifications so Doxygen works on Haiku. + +--- + PLATFORMS | 1 + + configure | 3 +++ + qtools/qglobal.h | 6 +++-- + qtools/qthread_unix.cpp | 2 +- + src/doxygen.cpp | 2 +- + src/doxygen.pro.in | 11 ++++----- + tmake/lib/haiku-g++/app.t | 2 ++ + tmake/lib/haiku-g++/lib.t | 2 ++ + tmake/lib/haiku-g++/subdirs.t | 2 ++ + tmake/lib/haiku-g++/tmake.conf | 51 ++++++++++++++++++++++++++++++++++++++++++ + 10 files changed, 73 insertions(+), 9 deletions(-) + create mode 100644 tmake/lib/haiku-g++/app.t + create mode 100644 tmake/lib/haiku-g++/lib.t + create mode 100644 tmake/lib/haiku-g++/subdirs.t + create mode 100644 tmake/lib/haiku-g++/tmake.conf + +diff --git a/PLATFORMS b/PLATFORMS +index c358a1d..18c4ed5 100644 +--- a/PLATFORMS ++++ b/PLATFORMS +@@ -4,6 +4,7 @@ beos-g++ + dgux-g++ + freebsd-g++ + gnu-g++ ++haiku-g++ + hpux-acc + hpux-cc + hpux-g++ +diff --git a/configure b/configure +index 07b0ef0..a4625e2 100755 +--- a/configure ++++ b/configure +@@ -180,6 +180,9 @@ if test -z "$f_platform"; then + f_insttool=/usr/bin/install + fi + ;; ++ Haiku:*) ++ f_platform=haiku-g++ ++ ;; + HP-UX:*) + f_platform=hpux-g++ + if test "$f_insttool" = NO; then +diff --git a/qtools/qglobal.h b/qtools/qglobal.h +index 352d985..20601e3 100644 +--- a/qtools/qglobal.h ++++ b/qtools/qglobal.h +@@ -1,5 +1,5 @@ + /**************************************************************************** +-** ++** + ** + ** Global type declarations and definitions + ** +@@ -153,6 +153,8 @@ + #define _OS_CYGWIN_ + #elif defined(__BEOS__) + #define _OS_BEOS_ ++#elif defined(__HAIKU__) ++#define _OS_HAIKU_ + #elif defined(__MINT__) + #define _OS_MINT_ + #else +@@ -295,7 +297,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 5a7b788..0d4fd6e 100644 +--- a/qtools/qthread_unix.cpp ++++ b/qtools/qthread_unix.cpp +@@ -124,7 +124,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 b790410..117e639 100644 +--- a/src/doxygen.cpp ++++ b/src/doxygen.cpp +@@ -9566,7 +9566,7 @@ void readConfiguration(int argc, char **argv) + { + if (optind+4parse(df)) + { + err("error opening or reading configuration file %s!\n",argv[optind+4]); +diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in +index afdf242..bb64792 100644 +--- a/src/doxygen.pro.in ++++ b/src/doxygen.pro.in +@@ -4,8 +4,8 @@ + # Copyright (C) 1997-2011 by Dimitri van Heesch. + # + # Permission to use, copy, modify, and distribute this software and its +-# documentation under the terms of the GNU General Public License is hereby +-# granted. No representations are made about the suitability of this software ++# documentation under the terms of the GNU General Public License is hereby ++# granted. No representations are made about the suitability of this software + # for any purpose. It is provided "as is" without express or implied warranty. + # See the GNU General Public License for more details. + # +@@ -16,9 +16,10 @@ + + TEMPLATE = app.t + CONFIG = console warn_on $extraopts +-HEADERS = doxygen.h +-SOURCES = main.cpp +-unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread ++HEADERS = doxygen.h ++SOURCES = main.cpp ++unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 ++haiku-g++:LIBS += -liconv + win32:INCLUDEPATH += . + win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread + win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib +diff --git a/tmake/lib/haiku-g++/app.t b/tmake/lib/haiku-g++/app.t +new file mode 100644 +index 0000000..867725e +--- /dev/null ++++ b/tmake/lib/haiku-g++/app.t +@@ -0,0 +1,2 @@ ++#! Use the common Unix template ++#$ IncludeTemplate("../unix/app.t"); +diff --git a/tmake/lib/haiku-g++/lib.t b/tmake/lib/haiku-g++/lib.t +new file mode 100644 +index 0000000..2523b2f +--- /dev/null ++++ b/tmake/lib/haiku-g++/lib.t +@@ -0,0 +1,2 @@ ++#! Use the common Unix template ++#$ IncludeTemplate("../unix/lib.t"); +diff --git a/tmake/lib/haiku-g++/subdirs.t b/tmake/lib/haiku-g++/subdirs.t +new file mode 100644 +index 0000000..5e888af +--- /dev/null ++++ b/tmake/lib/haiku-g++/subdirs.t +@@ -0,0 +1,2 @@ ++#! Use the common Unix template ++#$ IncludeTemplate("../unix/subdirs.t"); +diff --git a/tmake/lib/haiku-g++/tmake.conf b/tmake/lib/haiku-g++/tmake.conf +new file mode 100644 +index 0000000..3b8c103 +--- /dev/null ++++ b/tmake/lib/haiku-g++/tmake.conf +@@ -0,0 +1,51 @@ ++# ++# ++# ++# tmake configuration for haiku-g++ ++# ++ ++TEMPLATE = app ++CONFIG = qt warn_on release ++ ++TMAKE_CC = gcc ++TMAKE_CFLAGS = ++TMAKE_CFLAGS_WARN_ON = -Wall -W ++TMAKE_CFLAGS_WARN_OFF = ++TMAKE_CFLAGS_RELEASE = ++TMAKE_CFLAGS_DEBUG = -g ++TMAKE_CFLAGS_SHLIB = -fPIC ++TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses ++ ++TMAKE_CXX = g++ ++TMAKE_CXXFLAGS = $$TMAKE_CFLAGS ++TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON ++TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF ++TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE ++TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG ++TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB ++TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC ++ ++TMAKE_INCDIR = ++TMAKE_LIBDIR = ++TMAKE_INCDIR_QT = $(QTDIR)/include ++TMAKE_LIBDIR_QT = $(QTDIR)/lib ++ ++TMAKE_LINK = g++ ++TMAKE_LINK_SHLIB = g++ ++TMAKE_LFLAGS = -Wl,-rpath=/lib:$(QTDIR)/lib ++TMAKE_LFLAGS_RELEASE = ++TMAKE_LFLAGS_DEBUG = ++TMAKE_LFLAGS_SHLIB = -shared ++TMAKE_LFLAGS_SONAME = -Wl,-soname, ++ ++TMAKE_LIBS = ++TMAKE_LIBS_QT = -lqt ++TMAKE_LIBS_QT_MT = -lqt-mt ++ ++TMAKE_MOC = moc ++ ++TMAKE_AR = ar cqs ++TMAKE_RANLIB = ++ ++TMAKE_TAR = tar -cf ++TMAKE_GZIP = gzip -9f +-- +1.8.3.4 +