doxygen-1.8.6-config.patch 2.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879
  1. diff -up doxygen-1.8.6/addon/doxywizard/Makefile.in.config doxygen-1.8.6/addon/doxywizard/Makefile.in
  2. --- doxygen-1.8.6/addon/doxywizard/Makefile.in.config 2013-12-26 12:17:57.281368574 -0700
  3. +++ doxygen-1.8.6/addon/doxywizard/Makefile.in 2013-12-26 12:20:44.673513404 -0700
  4. @@ -10,7 +10,6 @@
  5. # See the GNU General Public License for more details.
  6. #
  7. -QMAKE=$(QTDIR)/bin/qmake $(MKSPECS)
  8. INCBUFSIZE=$(PYTHON) ../../src/increasebuffer.py
  9. all: Makefile.doxywizard
  10. diff -up doxygen-1.8.6/configure.config doxygen-1.8.6/configure
  11. --- doxygen-1.8.6/configure.config 2013-12-24 09:14:46.000000000 -0700
  12. +++ doxygen-1.8.6/configure 2013-12-26 12:20:20.542636493 -0700
  13. @@ -326,9 +326,10 @@ if test "$f_wizard" = YES; then
  14. if test -z "$QTDIR"; then
  15. echo " QTDIR environment variable not set!"
  16. printf " Checking for Qt..."
  17. - for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
  18. + for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
  19. if test -x "$d/bin/qmake"; then
  20. QTDIR=$d
  21. + QMAKE=$d/bin/qmake
  22. break 2
  23. fi
  24. done
  25. @@ -704,6 +705,8 @@ INSTTOOL = $f_insttool
  26. DOXYDOCS = ..
  27. DOCDIR = $f_docdir
  28. QTDIR = $QTDIR
  29. +QMAKE = $QMAKE
  30. +MAN1DIR = share/man/man1
  31. EOF
  32. if test "$f_dot" != NO; then
  33. diff -up doxygen-1.8.6/Makefile.in.config doxygen-1.8.6/Makefile.in
  34. --- doxygen-1.8.6/Makefile.in.config 2013-12-26 12:17:57.283368564 -0700
  35. +++ doxygen-1.8.6/Makefile.in 2013-12-26 12:19:17.796956667 -0700
  36. @@ -78,8 +78,6 @@ realclean: clean
  37. DATE=$(shell date "+%B %Y")
  38. -MAN1DIR = man/man1
  39. -
  40. install: doxywizard_install doxysearch_install
  41. $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin
  42. $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)$(INSTALL)/bin
  43. diff -up doxygen-1.8.6/tmake/lib/linux-g++/tmake.conf.config doxygen-1.8.6/tmake/lib/linux-g++/tmake.conf
  44. --- doxygen-1.8.6/tmake/lib/linux-g++/tmake.conf.config 2013-11-02 08:18:53.000000000 -0600
  45. +++ doxygen-1.8.6/tmake/lib/linux-g++/tmake.conf 2013-12-26 12:18:38.268158455 -0700
  46. @@ -11,7 +11,7 @@ TMAKE_CC = gcc
  47. TMAKE_CFLAGS = -pipe -fsigned-char
  48. TMAKE_CFLAGS_WARN_ON = -Wall -W
  49. TMAKE_CFLAGS_WARN_OFF =
  50. -TMAKE_CFLAGS_RELEASE = -O2
  51. +TMAKE_CFLAGS_RELEASE = $(RPM_OPT_FLAGS)
  52. TMAKE_CFLAGS_DEBUG = -g
  53. TMAKE_CFLAGS_SHLIB = -fPIC
  54. TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
  55. @@ -27,12 +27,12 @@ TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YAC
  56. TMAKE_INCDIR =
  57. TMAKE_LIBDIR =
  58. -TMAKE_INCDIR_X11 = /usr/X11R6/include
  59. -TMAKE_LIBDIR_X11 = /usr/X11R6/lib
  60. -TMAKE_INCDIR_QT = $(QTDIR)/include
  61. -TMAKE_LIBDIR_QT = $(QTDIR)/lib
  62. -TMAKE_INCDIR_OPENGL = /usr/X11R6/include
  63. -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
  64. +TMAKE_INCDIR_X11 =
  65. +TMAKE_LIBDIR_X11 =
  66. +TMAKE_INCDIR_QT =
  67. +TMAKE_LIBDIR_QT =
  68. +TMAKE_INCDIR_OPENGL =
  69. +TMAKE_LIBDIR_OPENGL =
  70. TMAKE_LINK = g++
  71. TMAKE_LINK_SHLIB = g++