[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

[Arkadiusz Miskiewicz]

 patches/dev300/apply              |    3 +++
 patches/dev300/qt-moc-detect.diff |   22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)

New commits:
commit b4f0f02bea9efab8a9e65f514b9b2d0e14c07565
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Feb 2 08:02:08 2010 +0100

    Look for moc in QT4DIR first. Don't add trailing space to the path.
    
    When looking for moc from qt4 look at QT4DIR first and then PATH.
    Don't add trailing space when looking for qt3/qt4 moc since here
    colon is a separator and space is then considered to be part of path.
    
     * patches/dev300/apply
     * patches/dev300/qt-moc-detect.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8929293..ab2b9a6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2168,6 +2168,9 @@ kde4_vcl_fixes2.diff
 # Fix the KDE3 backend build, when KDE4 is installed
 kde4-and-kde3-shell-build.diff, jholesov
 
+# Fix qt/qt4 moc detection
+qt-moc-detect.diff
+
 [ KDE4Experimental ]
 # Not yet ported to co-exist with the KDE3 stuff
 kde4-kab.diff
diff --git a/patches/dev300/qt-moc-detect.diff b/patches/dev300/qt-moc-detect.diff
new file mode 100644
index 0000000..eee414a
--- /dev/null
+++ b/patches/dev300/qt-moc-detect.diff
@@ -0,0 +1,22 @@
+--- configure.in~	2010-02-01 22:04:43.000000000 +0100
++++ configure.in	2010-02-01 22:07:21.307930913 +0100
+@@ -6443,7 +6443,7 @@
+    fi
+ 
+    dnl Check for Meta Object Compiler
+-   AC_PATH_PROG( MOC4, moc, no, [$PATH:$QT4DIR/bin] )
++   AC_PATH_PROG( MOC4, moc, no, [$QT4DIR/bin:$PATH])
+    if test "$MOC4" = "no" ; then
+       AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
+ the root of your Qt installation by exporting QT4DIR before running "configure".])
+--- configure.in~	2010-02-01 22:18:09.000000000 +0100
++++ configure.in	2010-02-01 22:26:37.520314610 +0100
+@@ -6336,7 +6336,7 @@
+     fi
+ 
+     dnl Check for Meta Object Compiler
+-    AC_PATH_PROG( MOC, moc, no, [$QTDIR/bin:$PATH] )
++    AC_PATH_PROG( MOC, moc, no, [$QTDIR/bin:$PATH])
+     if test "$MOC" = "no" ; then
+         AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
+ the root of your Qt installation by exporting QTDIR before running "configure".])