SOURCES: qt-support-cflags-with-commas.patch - up from AC-branch t...

[arekm]

Author: arekm                        Date: Mon Apr  3 18:36:06 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up from AC-branch to HEAD

---- Files affected:
SOURCES:
   qt-support-cflags-with-commas.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/qt-support-cflags-with-commas.patch
diff -u SOURCES/qt-support-cflags-with-commas.patch:1.1 SOURCES/qt-support-cflags-with-commas.patch:1.2
--- SOURCES/qt-support-cflags-with-commas.patch:1.1	Wed Apr 13 11:18:54 2005
+++ SOURCES/qt-support-cflags-with-commas.patch	Mon Apr  3 20:36:01 2006
@@ -1,11 +1,11 @@
---- qt-x11-free-3.3.4/configure.orig	2005-04-13 11:12:50.000000000 +0200
-+++ qt-x11-free-3.3.4/configure	2005-04-13 11:14:31.000000000 +0200
-@@ -2588,7 +2588,7 @@
+--- qt-x11-free-3.3.6/configure~	2006-03-26 20:04:34.000000000 +0200
++++ qt-x11-free-3.3.6/configure	2006-03-26 20:04:04.000000000 +0200
+@@ -2641,7 +2638,7 @@
  	[ -z "$QMAKE_DATA_DIR" ] && QMAKE_DATA_DIR="${QT_INSTALL_PREFIX}"
          echo >>$mkfile
  	sed -e "s, at SOURCE_PATH@,$relpath,g" -e "s, at BUILD_PATH@,$outpath,g" \
 -	    -e "s, at QMAKE_CFLAGS@,$EXTRA_CFLAGS,g" -e "s, at QMAKE_LFLAGS@,$EXTRA_LFLAGS,g" \
 +	    -e "s:@QMAKE_CFLAGS@:$EXTRA_CFLAGS:g" -e "s, at QMAKE_LFLAGS@,$EXTRA_LFLAGS,g" \
+             -e "s, at QMAKE_CXXFLAGS@,$EXTRA_CXXFLAGS,g" \
  	    -e "s, at QT_INSTALL_BINS@,\$(INSTALL_ROOT)$QMAKE_BIN_DIR,g" \
  	    -e "s, at QT_INSTALL_DATA@,\$(INSTALL_ROOT)$QMAKE_DATA_DIR,g" \
- 	    -e "s, at QMAKE_QTOBJS@,$EXTRA_SOURCES,g" -e "s, at QMAKESPEC@,$QMAKESPEC,g" $in_mkfile >>$mkfile
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/qt-support-cflags-with-commas.patch?r1=1.1&r2=1.2&f=u