- updated to 1.8.6

[packages/doxygen.git] / doxygen-qt-dirs.patch

diff --git a/doxygen-qt-dirs.patch b/doxygen-qt-dirs.patch
index efa22ba290b2d6b5936901ce349837e2bd300834..cea7e7b13702608a62cf8a8941aac0c5d1148eaf 100644 (file)
--- a/doxygen-qt-dirs.patch
+++ b/doxygen-qt-dirs.patch
@@ -1,18 +1,6 @@
-diff -up doxygen-1.6.0/addon/doxywizard/Makefile.in.config doxygen-1.6.0/addon/doxywizard/Makefile.in
---- doxygen-1.6.0/addon/doxywizard/Makefile.in.config  2009-07-13 22:09:03.000000000 +0200
-+++ doxygen-1.6.0/addon/doxywizard/Makefile.in 2009-08-21 16:42:13.000000000 +0200
-@@ -10,8 +10,6 @@
- # See the GNU General Public License for more details.
- # 
- 
--QMAKE=qmake $(MKSPECS)
--
- all: Makefile.doxywizard  
-       $(MAKE) -f Makefile.doxywizard 
- 
---- doxygen-1.8.4/configure.orig       2013-05-19 12:05:39.000000000 +0200
-+++ doxygen-1.8.4/configure    2013-06-08 09:12:44.470080015 +0200
-@@ -296,9 +296,10 @@
+--- doxygen-1.8.6/configure.orig       2013-12-24 17:14:46.000000000 +0100
++++ doxygen-1.8.6/configure    2014-01-29 20:59:58.925766639 +0100
+@@ -326,7 +326,7 @@
    if test -z "$QTDIR"; then
      echo "  QTDIR environment variable not set!"
      printf "  Checking for Qt..."
@@ -20,15 +8,11 @@ diff -up doxygen-1.6.0/addon/doxywizard/Makefile.in.config doxygen-1.6.0/addon/d
 +    for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
        if test -x "$d/bin/qmake"; then
          QTDIR=$d
-+        QMAKE=$d/bin/qmake
-       fi
-     done
-   else
-@@ -606,6 +607,8 @@
+         break 2
+@@ -704,6 +704,7 @@
  DOXYDOCS  = ..
  DOCDIR    = $f_docdir
  QTDIR     = $QTDIR
-+QMAKE     = $QMAKE
 +MAN1DIR    = share/man/man1
  EOF