diff --git a/doxygen-1.8.4-config.patch b/doxygen-1.8.4-config.patch deleted file mode 100644 index 8c4c7ba..0000000 --- a/doxygen-1.8.4-config.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -up doxygen-1.8.4/addon/doxywizard/Makefile.in.config doxygen-1.8.4/addon/doxywizard/Makefile.in ---- doxygen-1.8.4/addon/doxywizard/Makefile.in.config 2013-01-05 16:35:52.000000000 +0100 -+++ doxygen-1.8.4/addon/doxywizard/Makefile.in 2013-05-21 12:22:49.689166894 +0200 -@@ -10,8 +10,6 @@ - # See the GNU General Public License for more details. - # - --QMAKE=qmake $(MKSPECS) -- - all: Makefile.doxywizard - $(MAKE) -f Makefile.doxywizard - -diff -up doxygen-1.8.4/configure.config doxygen-1.8.4/configure ---- doxygen-1.8.4/configure.config 2013-05-19 12:05:39.000000000 +0200 -+++ doxygen-1.8.4/configure 2013-05-21 12:25:43.570743493 +0200 -@@ -296,9 +296,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 - fi - done - else -@@ -606,6 +607,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.4/Makefile.in.config doxygen-1.8.4/Makefile.in ---- doxygen-1.8.4/Makefile.in.config 2013-04-25 21:38:39.000000000 +0200 -+++ doxygen-1.8.4/Makefile.in 2013-05-21 12:22:49.689166894 +0200 -@@ -53,8 +53,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.4/tmake/lib/linux-g++/tmake.conf.config doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf ---- doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf.config 2012-12-22 19:49:04.000000000 +0100 -+++ doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf 2013-05-21 12:22:49.689166894 +0200 -@@ -11,7 +11,7 @@ TMAKE_CC = gcc - TMAKE_CFLAGS = -pipe - TMAKE_CFLAGS_WARN_ON = -Wall -W - TMAKE_CFLAGS_WARN_OFF = --TMAKE_CFLAGS_RELEASE = -O2 -+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++