diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe index 5e1ce9305..282f45c1e 100644 --- a/app-doc/doxygen/doxygen-1.6.3.recipe +++ b/app-doc/doxygen/doxygen-1.6.3.recipe @@ -11,10 +11,10 @@ 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_MD5="2d6ea20a9d850d94321cee78bab7bb87" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 x86" -PATCHES="doxygen-1.6.3.patch" +PATCHES="doxygen-1.6.3.patchset" PROVIDES=" doxygen = $portVersion compat >= 1.6 diff --git a/app-doc/doxygen/patches/doxygen-1.6.3.patch b/app-doc/doxygen/patches/doxygen-1.6.3.patchset similarity index 53% rename from app-doc/doxygen/patches/doxygen-1.6.3.patch rename to app-doc/doxygen/patches/doxygen-1.6.3.patchset index e087c2974..68b9cf3e8 100644 --- a/app-doc/doxygen/patches/doxygen-1.6.3.patch +++ b/app-doc/doxygen/patches/doxygen-1.6.3.patchset @@ -1,6 +1,13 @@ -diff -up doxygen-1.6.3/Makefile.in.orig doxygen-1.6.3/Makefile.in ---- doxygen-1.6.3/Makefile.in.orig 2010-03-18 22:18:10.189005824 -0600 -+++ doxygen-1.6.3/Makefile.in 2010-03-18 22:18:16.079953920 -0600 +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) @@ -10,9 +17,10 @@ diff -up doxygen-1.6.3/Makefile.in.orig doxygen-1.6.3/Makefile.in clean: FORCE cd examples ; $(MAKE) clean -diff -up doxygen-1.6.3/PLATFORMS.orig doxygen-1.6.3/PLATFORMS ---- doxygen-1.6.3/PLATFORMS.orig 2007-11-24 09:12:35.009437184 -0700 -+++ doxygen-1.6.3/PLATFORMS 2010-03-18 22:17:57.002097152 -0600 +diff --git a/PLATFORMS b/PLATFORMS +index c358a1d..18c4ed5 100644 +--- a/PLATFORMS ++++ b/PLATFORMS @@ -4,6 +4,7 @@ beos-g++ dgux-g++ freebsd-g++ @@ -21,9 +29,10 @@ diff -up doxygen-1.6.3/PLATFORMS.orig doxygen-1.6.3/PLATFORMS hpux-acc hpux-cc hpux-g++ -diff -up doxygen-1.6.3/configure.orig doxygen-1.6.3/configure ---- doxygen-1.6.3/configure.orig 2010-02-20 15:19:31.059244544 -0700 -+++ doxygen-1.6.3/configure 2010-03-18 22:17:57.024903680 -0600 +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 @@ -34,9 +43,10 @@ diff -up doxygen-1.6.3/configure.orig doxygen-1.6.3/configure HP-UX:*) f_platform=hpux-g++ if test "$f_insttool" = NO; then -diff -up doxygen-1.6.3/qtools/qglobal.h.orig doxygen-1.6.3/qtools/qglobal.h ---- doxygen-1.6.3/qtools/qglobal.h.orig 2009-10-25 09:44:29.014680064 -0600 -+++ doxygen-1.6.3/qtools/qglobal.h 2010-03-18 22:17:57.054001664 -0600 +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__) @@ -46,10 +56,11 @@ diff -up doxygen-1.6.3/qtools/qglobal.h.orig doxygen-1.6.3/qtools/qglobal.h #elif defined(__MINT__) #define _OS_MINT_ #else -diff -up doxygen-1.6.3/src/doxygen.pro.in.orig doxygen-1.6.3/src/doxygen.pro.in ---- doxygen-1.6.3/src/doxygen.pro.in.orig 2010-01-01 04:53:11.034078720 -0700 -+++ doxygen-1.6.3/src/doxygen.pro.in 2010-03-18 22:17:57.078381056 -0600 -@@ -19,6 +19,7 @@ CONFIG = console warn_on $extraopt +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 @@ -57,27 +68,35 @@ diff -up doxygen-1.6.3/src/doxygen.pro.in.orig doxygen-1.6.3/src/doxygen.pro.in 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 -up doxygen-1.6.3/tmake/lib/haiku-g++/app.t.orig doxygen-1.6.3/tmake/lib/haiku-g++/app.t ---- doxygen-1.6.3/tmake/lib/haiku-g++/app.t.orig 2010-03-18 22:17:57.103284736 -0600 -+++ doxygen-1.6.3/tmake/lib/haiku-g++/app.t 2010-03-18 22:17:57.105119744 -0600 +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 -up doxygen-1.6.3/tmake/lib/haiku-g++/lib.t.orig doxygen-1.6.3/tmake/lib/haiku-g++/lib.t ---- doxygen-1.6.3/tmake/lib/haiku-g++/lib.t.orig 2010-03-18 22:17:57.126615552 -0600 -+++ doxygen-1.6.3/tmake/lib/haiku-g++/lib.t 2010-03-18 22:17:57.128188416 -0600 +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 -up doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t.orig doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t ---- doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t.orig 2010-03-18 22:17:57.152043520 -0600 -+++ doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t 2010-03-18 22:17:57.153354240 -0600 +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 -up doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf ---- doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf.orig 2010-03-18 22:17:57.175112192 -0600 -+++ doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf 2010-03-18 22:17:57.176685056 -0600 +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 @@ +# +# @@ -130,3 +149,29 @@ diff -up doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.6.3/tmake/l + +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 +