diff --git a/.gitignore b/.gitignore index 8e90f47..ff567d8 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ doxygen-1.7.1.src.tar.gz /doxygen-1.8.7.src.tar.gz /doxygen-1.8.8.src.tar.gz /doxygen-1.8.9.1.src.tar.gz +/doxygen-1.8.10.src.tar.gz diff --git a/doxygen-1.8.10-install.patch b/doxygen-1.8.10-install.patch new file mode 100644 index 0000000..32bb9b3 --- /dev/null +++ b/doxygen-1.8.10-install.patch @@ -0,0 +1,24 @@ +diff -up doxygen-1.8.10/doc/CMakeLists.txt.than doxygen-1.8.10/doc/CMakeLists.txt +--- doxygen-1.8.10/doc/CMakeLists.txt.than 2015-08-28 11:46:15.675460840 +0200 ++++ doxygen-1.8.10/doc/CMakeLists.txt 2015-08-28 11:51:27.894592457 +0200 +@@ -88,17 +88,17 @@ install(FILES + "${PROJECT_BINARY_DIR}/man/doxywizard.1" + "${PROJECT_BINARY_DIR}/man/doxysearch.1" + "${PROJECT_BINARY_DIR}/man/doxyindexer.1" +- DESTINATION man/man1 ++ DESTINATION "${MAN_INSTALL_DIR}" + ) + + install(FILES + "${PROJECT_BINARY_DIR}/latex/doxygen_manual.pdf" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}" ++ DESTINATION "${DOC_INSTALL_DIR}" + ) + + install(DIRECTORY + "${PROJECT_BINARY_DIR}/html" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}" ++ DESTINATION "${DOC_INSTALL_DIR}" + ) + + endif() diff --git a/doxygen-1.8.9.1-config.patch b/doxygen-1.8.9.1-config.patch deleted file mode 100644 index 9309237..0000000 --- a/doxygen-1.8.9.1-config.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -up doxygen-1.8.9.1/addon/doxywizard/Makefile.in.config doxygen-1.8.9.1/addon/doxywizard/Makefile.in ---- doxygen-1.8.9.1/addon/doxywizard/Makefile.in.config 2014-10-19 16:39:17.000000000 +0200 -+++ doxygen-1.8.9.1/addon/doxywizard/Makefile.in 2015-01-21 16:27:20.207772693 +0100 -@@ -10,7 +10,6 @@ - # See the GNU General Public License for more details. - # - --QMAKE=$(QTDIR)/bin/qmake $(MKSPECS) - INCBUFSIZE=$(PYTHON) ../../src/increasebuffer.py - - all: Makefile.doxywizard -diff -up doxygen-1.8.9.1/configure.config doxygen-1.8.9.1/configure ---- doxygen-1.8.9.1/configure.config 2015-01-04 12:00:55.000000000 +0100 -+++ doxygen-1.8.9.1/configure 2015-01-21 16:27:20.207772693 +0100 -@@ -362,9 +362,10 @@ if test "$f_wizard" = YES; then - if test -z "$QTDIR"; then - echo " QTDIR environment variable not set!" - printf " Checking for Qt..." -- for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do -+ for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do - if test -x "$d/bin/qmake"; then - QTDIR=$d -+ QMAKE=$d/bin/qmake - break 2 - fi - done -@@ -771,6 +772,8 @@ INSTTOOL = $f_insttool - DOXYDOCS = .. - DOCDIR = $f_docdir - QTDIR = $QTDIR -+QMAKE = $QMAKE -+MAN1DIR = share/man/man1 - EOF - - if test "$f_dot" != NO; then -diff -up doxygen-1.8.9.1/Makefile.in.config doxygen-1.8.9.1/Makefile.in ---- doxygen-1.8.9.1/Makefile.in.config 2014-11-13 21:22:20.000000000 +0100 -+++ doxygen-1.8.9.1/Makefile.in 2015-01-21 16:27:20.208772683 +0100 -@@ -73,8 +73,6 @@ distclean: clean - - DATE=$(shell date "+%B %Y") - --MAN1DIR = man/man1 -- - install: doxywizard_install doxysearch_install - $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin - $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)$(INSTALL)/bin -diff -up doxygen-1.8.9.1/tmake/lib/linux-g++/tmake.conf.config doxygen-1.8.9.1/tmake/lib/linux-g++/tmake.conf ---- doxygen-1.8.9.1/tmake/lib/linux-g++/tmake.conf.config 2014-10-24 11:51:54.000000000 +0200 -+++ doxygen-1.8.9.1/tmake/lib/linux-g++/tmake.conf 2015-01-21 16:28:28.488140021 +0100 -@@ -11,7 +11,7 @@ TMAKE_CC = gcc - TMAKE_CFLAGS = -pipe -fsigned-char - TMAKE_CFLAGS_WARN_ON = -Wall -W - TMAKE_CFLAGS_WARN_OFF = --TMAKE_CFLAGS_RELEASE = -O3 -+TMAKE_CFLAGS_RELEASE = $(RPM_OPT_FLAGS) - TMAKE_CFLAGS_DEBUG = -g - TMAKE_CFLAGS_SHLIB = -fPIC - TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -@@ -27,12 +27,12 @@ TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YAC - - TMAKE_INCDIR = - TMAKE_LIBDIR = --TMAKE_INCDIR_X11 = /usr/X11R6/include --TMAKE_LIBDIR_X11 = /usr/X11R6/lib --TMAKE_INCDIR_QT = $(QTDIR)/include --TMAKE_LIBDIR_QT = $(QTDIR)/lib --TMAKE_INCDIR_OPENGL = /usr/X11R6/include --TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -+TMAKE_INCDIR_X11 = -+TMAKE_LIBDIR_X11 = -+TMAKE_INCDIR_QT = -+TMAKE_LIBDIR_QT = -+TMAKE_INCDIR_OPENGL = -+TMAKE_LIBDIR_OPENGL = - - TMAKE_LINK = g++ - TMAKE_LINK_SHLIB = g++ diff --git a/doxygen-1.8.9.1-html_timestamp_default_false.patch b/doxygen-1.8.9.1-html_timestamp_default_false.patch deleted file mode 100644 index 59f239d..0000000 --- a/doxygen-1.8.9.1-html_timestamp_default_false.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up doxygen-1.8.9.1/src/config.xml.html_timestamp_default_false doxygen-1.8.9.1/src/config.xml ---- doxygen-1.8.9.1/src/config.xml.html_timestamp_default_false 2014-12-25 13:43:29.000000000 +0100 -+++ doxygen-1.8.9.1/src/config.xml 2015-01-21 16:31:37.221391259 +0100 -@@ -1624,7 +1624,7 @@ to disable this feature. - - - -- --