From 013bd54b745d7aa11bbc9301d503b08047198b37 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 5 Oct 2024 17:36:43 +0200 Subject: [PATCH] doxygen, drop old gcc2 version (#11193) --- app-doc/doxygen/doxygen-1.12.0.recipe | 7 +- app-doc/doxygen/doxygen-1.7.6.1.recipe | 68 ------ app-doc/doxygen/patches/doxygen-1.7.6.1.patch | 216 ------------------ 3 files changed, 1 insertion(+), 290 deletions(-) delete mode 100644 app-doc/doxygen/doxygen-1.7.6.1.recipe delete mode 100644 app-doc/doxygen/patches/doxygen-1.7.6.1.patch diff --git a/app-doc/doxygen/doxygen-1.12.0.recipe b/app-doc/doxygen/doxygen-1.12.0.recipe index 55edb447d..c881233c0 100644 --- a/app-doc/doxygen/doxygen-1.12.0.recipe +++ b/app-doc/doxygen/doxygen-1.12.0.recipe @@ -18,7 +18,7 @@ collaboration diagrams, which are all generated automatically." HOMEPAGE="http://www.doxygen.org/" COPYRIGHT="1997-2024 Dimitri van Heesch" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/doxygen/doxygen/archive/Release_${portVersion//./_}.tar.gz" CHECKSUM_SHA256="5ca35e1258020df5fe8b21c3656aed156c317def4a81b7fe52f452edc9f35768" SOURCE_DIR="doxygen-Release_${portVersion//./_}" @@ -37,11 +37,6 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libiconv$secondaryArchSuffix " -if [ -n "$secondaryArchSuffix" ]; then -CONFLICTS=" - doxygen - " -fi BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel diff --git a/app-doc/doxygen/doxygen-1.7.6.1.recipe b/app-doc/doxygen/doxygen-1.7.6.1.recipe deleted file mode 100644 index 0459fe7dc..000000000 --- a/app-doc/doxygen/doxygen-1.7.6.1.recipe +++ /dev/null @@ -1,68 +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: - * 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" -REVISION="1" -SOURCE_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-$portVersion.src.tar.gz" -CHECKSUM_SHA256="0e60e794fb172d3fa4a9a9535f0b8e0eeb04e8366153f6b417569af0bcd61fcd" -PATCHES="doxygen-$portVersion.patch" - -ARCHITECTURES="?all x86_gcc2" - -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.7.6.1.patch b/app-doc/doxygen/patches/doxygen-1.7.6.1.patch deleted file mode 100644 index 61ffcac7f..000000000 --- a/app-doc/doxygen/patches/doxygen-1.7.6.1.patch +++ /dev/null @@ -1,216 +0,0 @@ -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 -