SOURCES (qt-copy): qt-locale-charmap.patch, qt-support-cflags-with...

[adgor]

Author: adgor                        Date: Sun Apr  9 11:31:22 2006 GMT
Module: SOURCES                       Tag: qt-copy
---- Log message:
- Updated for 3.3.6 (060409 snap)

---- Files affected:
SOURCES:
   qt-locale-charmap.patch (1.1 -> 1.1.4.1) , qt-support-cflags-with-commas.patch (1.1 -> 1.1.4.1) 

---- Diffs:

================================================================
Index: SOURCES/qt-locale-charmap.patch
diff -u SOURCES/qt-locale-charmap.patch:1.1 SOURCES/qt-locale-charmap.patch:1.1.4.1
--- SOURCES/qt-locale-charmap.patch:1.1	Tue Sep 14 15:59:14 2004
+++ SOURCES/qt-locale-charmap.patch	Sun Apr  9 13:31:17 2006
@@ -1,12 +1,12 @@
---- qt-x11-free-3.3.3/src/codecs/qtextcodec.cpp.orig	2004-09-14 11:56:04.232606504 +0200
-+++ qt-x11-free-3.3.3/src/codecs/qtextcodec.cpp	2004-09-14 11:57:08.596821656 +0200
-@@ -2696,7 +2696,9 @@
+--- qt-copy/src/codecs/qtextcodec.cpp.orig	2006-04-09 12:52:26.000000000 +0200
++++ qt-copy/src/codecs/qtextcodec.cpp	2006-04-09 13:21:27.000000000 +0200
+@@ -2784,7 +2784,9 @@
  #else
  
- #if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)
+ #if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF) && !defined(Q_OS_MAC)
 +    char *oldLocale = setlocale(LC_CTYPE, "");
      char *charset = nl_langinfo (CODESET);
 +    setlocale(LC_CTYPE, oldLocale);
      if ( charset )
-       localeMapper = QTextCodec::codecForName( charset );
+         localeMapper = QTextCodec::codecForName( charset );
  #endif

================================================================
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.1.4.1
--- SOURCES/qt-support-cflags-with-commas.patch:1.1	Wed Apr 13 11:18:54 2005
+++ SOURCES/qt-support-cflags-with-commas.patch	Sun Apr  9 13:31:17 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-copy/configure.orig	2006-04-09 13:23:21.000000000 +0200
++++ qt-copy/configure	2006-04-09 13:26:51.000000000 +0200
+@@ -2641,7 +2641,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-locale-charmap.patch?r1=1.1&r2=1.1.4.1&f=u
    http://cvs.pld-linux.org/SOURCES/qt-support-cflags-with-commas.patch?r1=1.1&r2=1.1.4.1&f=u