SOURCES: qt4-tools.patch, qt4-buildsystem.patch, qt4-locale.patch, ...
pascalek
pascalek at pld-linux.org
Wed Oct 4 23:17:44 CEST 2006
Author: pascalek Date: Wed Oct 4 21:17:44 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- Updated to 4.2.0
---- Files affected:
SOURCES:
qt4-tools.patch (1.6 -> 1.7) , qt4-buildsystem.patch (1.5 -> 1.6) , qt4-locale.patch (1.8 -> 1.9) , qt4-sse.patch (1.1 -> 1.2) , qt4-antialias.patch (1.4 -> 1.5) , qt4-support-cflags-with-commas.patch (1.1 -> 1.2) , qt4-build-lib-static.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/qt4-tools.patch
diff -u SOURCES/qt4-tools.patch:1.6 SOURCES/qt4-tools.patch:1.7
--- SOURCES/qt4-tools.patch:1.6 Sun Jul 2 20:43:14 2006
+++ SOURCES/qt4-tools.patch Wed Oct 4 23:17:38 2006
@@ -2,79 +2,13 @@
+++ qt-copy/tools/tools.pro 2005-05-13 20:02:31.761482520 +0200
@@ -7,7 +7,7 @@
assistant \
- linguist \
porting \
-- qtestlib
-+ qtestlib qvfb
- !contains(QT_EDITION, Console):SUBDIRS += designer
- unix:!embedded:SUBDIRS += qtconfig
- win32:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt
---- qt-x11-opensource-src-4.1.4/tools/qvfb/qvfbhdr.h.orig 1970-01-01 01:00:00.000000000 +0100
-+++ qt-x11-opensource-src-4.1.4/tools/qvfb/qvfbhdr.h 2006-07-02 11:34:33.753478750 +0200
-@@ -0,0 +1,63 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 1992-2006 Trolltech AS. All rights reserved.
-+**
-+** This file is part of the QtGui module of the Qt Toolkit.
-+**
-+** This file may be used under the terms of the GNU General Public
-+** License version 2.0 as published by the Free Software Foundation
-+** and appearing in the file LICENSE.GPL included in the packaging of
-+** this file. Please review the following information to ensure GNU
-+** General Public Licensing requirements will be met:
-+** http://www.trolltech.com/products/qt/opensource.html
-+**
-+** If you are unsure which license is appropriate for your use, please
-+** review the following information:
-+** http://www.trolltech.com/products/qt/licensing.html or contact the
-+** sales department at sales at trolltech.com.
-+**
-+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-+**
-+****************************************************************************/
-+
-+#ifndef QVFBHDR_H
-+#define QVFBHDR_H
-+
-+#include <QtGui/qcolor.h>
-+#include <QtCore/qrect.h>
-+
-+QT_BEGIN_HEADER
-+
-+QT_MODULE(Gui)
-+
-+#define QT_VFB_MOUSE_PIPE "/tmp/.qtvfb_mouse-%1"
-+#define QT_VFB_KEYBOARD_PIPE "/tmp/.qtvfb_keyboard-%1"
-+
-+struct QVFbHeader
-+{
-+ int width;
-+ int height;
-+ int depth;
-+ int linestep;
-+ int dataoffset;
-+ QRect update;
-+ bool dirty;
-+ int numcols;
-+ QRgb clut[256];
-+ int viewerVersion;
-+ int serverVersion;
-+};
-+
-+struct QVFbKeyData
-+{
-+ unsigned int keycode;
-+ Qt::KeyboardModifiers modifiers;
-+ unsigned short int unicode;
-+ bool press;
-+ bool repeat;
-+};
-+
-+QT_END_HEADER
-+
-+#endif // QVFBHDR_H
+ qtestlib \
+- pixeltool
++ pixeltool qvfb
+ contains(QT_EDITION, Console) {
+ SUBDIRS += designer/src/uitools # Linguist depends on this
+ } else {
diff -Nur qt-x11-opensource-src-4.1.4/src/gui/embedded.orig/qlock.cpp qt-x11-opensource-src-4.1.4/src/gui/embedded/qlock.cpp
--- qt-x11-opensource-src-4.1.4/src/gui/embedded.orig/qlock.cpp 1970-01-01 01:00:00.000000000 +0100
+++ qt-x11-opensource-src-4.1.4/src/gui/embedded/qlock.cpp 2006-07-02 11:35:54.386518000 +0200
================================================================
Index: SOURCES/qt4-buildsystem.patch
diff -u SOURCES/qt4-buildsystem.patch:1.5 SOURCES/qt4-buildsystem.patch:1.6
--- SOURCES/qt4-buildsystem.patch:1.5 Mon Aug 22 15:00:49 2005
+++ SOURCES/qt4-buildsystem.patch Wed Oct 4 23:17:38 2006
@@ -12,20 +12,18 @@
if [ "$PLATFORM_MAC" = "yes" ]; then
echo "export MACOSX_DEPLOYMENT_TARGET = 10.2" >>$mkfile
echo "CARBON_LFLAGS +=-framework CoreServices -framework CoreFoundation" >>$mkfile
-
--- qt-copy/tools/assistant/lib/lib.pro.orig 2005-05-13 16:39:04.000000000 +0200
+++ qt-copy/tools/assistant/lib/lib.pro 2005-05-13 20:21:32.014137768 +0200
-@@ -4,9 +4,8 @@
- VERSION = 1.0
+@@ -4,8 +4,8 @@
CONFIG += qt warn_on
--CONFIG += staticlib debug_and_release
-+CONFIG += dll debug_and_release
+ mac|win32:CONFIG += debug_and_release
mac:unix:CONFIG += explicitlib
-CONFIG -= dll
++CONFIG += dll
- HEADERS = qassistantclient.h
- SOURCES = qassistantclient.cpp
+ HEADERS = qassistantclient.h \
+ qassistantclient_global.h
--- qt-copy/src/plugins/sqldrivers/sqldrivers.pro.orig 2005-05-15 21:26:42.000000000 +0200
+++ qt-copy/src/plugins/sqldrivers/sqldrivers.pro 2005-05-15 21:26:59.000000000 +0200
@@ -8,3 +8,4 @@
================================================================
Index: SOURCES/qt4-locale.patch
diff -u SOURCES/qt4-locale.patch:1.8 SOURCES/qt4-locale.patch:1.9
--- SOURCES/qt4-locale.patch:1.8 Wed May 24 22:57:20 2006
+++ SOURCES/qt4-locale.patch Wed Oct 4 23:17:38 2006
@@ -4,13 +4,13 @@
resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
QTranslator translator( 0 );
-- translator.load( QLatin1String("assistant_") + QLocale::system().name().toLower(), resourceDir );
+- translator.load( QLatin1String("assistant_") + QLocale::system().name(), resourceDir );
+ QLocale locale = QLocale::system();
+ translator.load( QLatin1String("assistant"), resourceDir + QLatin1String("/") + QLocale::languageToString(locale.language()) + QLatin1String("/LC_MESSAGES") );
a.installTranslator( &translator );
QTranslator qtTranslator( 0 );
-- qtTranslator.load( QLatin1String("qt_") + QLocale::system().name().toLower(), resourceDir );
+- qtTranslator.load( QLatin1String("qt_") + QLocale::system().name(), resourceDir );
+ qtTranslator.load( QLatin1String("qt4"), resourceDir + QLatin1String("/") + QLocale::languageToString(locale.language()) + QLatin1String("/LC_MESSAGES") );
a.installTranslator( &qtTranslator );
================================================================
Index: SOURCES/qt4-sse.patch
diff -u SOURCES/qt4-sse.patch:1.1 SOURCES/qt4-sse.patch:1.2
--- SOURCES/qt4-sse.patch:1.1 Sun Jan 15 16:47:40 2006
+++ SOURCES/qt4-sse.patch Wed Oct 4 23:17:38 2006
@@ -5,15 +5,15 @@
CFG_STL=auto
CFG_PRECOMPILE=no
+CFG_HAVE_SSE=no
+ CFG_SEPARATE_DEBUG_INFO=auto
CFG_REDUCE_EXPORTS=auto
CFG_IPV6=auto
- CFG_NAS=no
@@ -516,7 +517,7 @@
VAL=no
;;
#Qt style yes options
-- -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-tablet|-reduce-exports|-pch|-stl|-freetype|-xcursor|-xrandr|-xrender|-fontconfig|-xkb|-nis|-cups|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-opengl|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-universal)
-+ -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-tablet|-reduce-exports|-pch|-sse|-stl|-freetype|-xcursor|-xrandr|-xrender|-fontconfig|-xkb|-nis|-cups|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-opengl|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-universal)
+- -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-tablet|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-fontconfig|-xkb|-nis|-qdbus|-glib|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-opengl|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-universal|-prefix-install|-silent)
++ -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-tablet|-reduce-exports|-pch|-separate-debug-info|-sse|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-fontconfig|-xkb|-nis|-qdbus|-glib|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-opengl|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-universal|-prefix-install|-silent)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
VAL=yes
;;
@@ -36,29 +36,31 @@
fi
-# detect sse support
--if $unixtests/sse.test $XQMAKESPEC $OPT_VERBOSE; then
+-if "$unixtests/sse.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then
- CFG_HAVE_SSE=no
-else
- CFG_HAVE_SSE=yes
+# auto-detect sse support
+if [ "$CFG_HAVE_SSE" = "auto" ]; then
-+ if $unixtests/sse.test $XQMAKESPEC $OPT_VERBOSE; then
-+ CFG_HAVE_SSE=no
++ if "$unixtests/sse.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then
++ CFG_HAVE_SSE=no
+ else
-+ CFG_HAVE_SSE=yes
++ CFG_HAVE_SSE=yes
+ fi
fi
- #auto-detect GNU make support
-@@ -1931,7 +1941,7 @@
- [-no-zlib] [-qt-zlib] [-system-zlib] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg]
- [-no-libpng] [-qt-libpng] [-system-libpng] [-no-libmng] [-qt-libmng]
- [-system-libmng] [-no-nis] [-nis] [-no-cups] [-cups] [-no-largefile] [-largefile]
-- [-no-stl] [-stl] [-no-pch] [-pch] [-Istring] [-lstring] [-Lstring] [-Rstring]
-+ [-no-stl] [-stl] [-no-pch] [-pch] [-no-sse] [-sse] [-Istring] [-lstring] [-Lstring] [-Rstring]
- [-disable-<module>] [-with-<module setting>] [-without-<module setting>] [-fast]
- [-no-fast]
+ # check iwmmxt support
+@@ -1931,8 +1941,8 @@
+ [-qt-libjpeg] [-system-libjpeg] [-make <part>] [-no-make <part>]
+ [-R <string>] [-l <string>] [-no-rpath] [-rpath] [-continue]
+ [-verbose] [-v] [-silent] [-no-nis] [-nis] [-no-cups] [-cups] [-no-iconv]
+- [-iconv] [-no-pch] [-pch] [-no-qdbus] [-qdbus] [-no-separate-debug-info]
+- [-separate-debug-info]
++ [-iconv] [-no-pch] [-pch] [-no-sse] [-sse] [-no-qdbus] [-qdbus]
++ [-no-separate-debug-info] [-separate-debug-info]
+ [additional platform specific options (see below)]
+
@@ -2086,6 +2096,9 @@
$PHN -no-pch ............ Do not use precompiled header support.
$PHY -pch ............... Use precompiled header support.
@@ -66,6 +68,6 @@
+ -no-sse ............ Do not use MMX/SSE instructions.
+ -sse ............... Use MMX/SSE instructions.
+
- EOF
+ $DBN -no-qdbus........... Do not compile the QtDBus module.
+ $DBY -qdbus.............. Compile the QtDBus module.
- if [ "$PLATFORM_X11" = "yes" ]; then
================================================================
Index: SOURCES/qt4-antialias.patch
diff -u SOURCES/qt4-antialias.patch:1.4 SOURCES/qt4-antialias.patch:1.5
--- SOURCES/qt4-antialias.patch:1.4 Thu Jan 12 02:27:37 2006
+++ SOURCES/qt4-antialias.patch Wed Oct 4 23:17:38 2006
@@ -17,8 +17,8 @@
+ QSettings prefs;
+ bool qt_use_antialiasing = prefs.value( "/qt/useXft", TRUE ).toBool() ;
-- if (QX11Info::appDepth(fp->screen) <= 8) {
-+ if (QX11Info::appDepth(fp->screen) <= 8 || ! (qt_use_antialiasing)) {
++ if (QX11Info::appDepth(screen) <= 8 || ! (qt_use_antialiasing)) {
+- if (QX11Info::appDepth(screen) <= 8) {
// can't do antialiasing on 8bpp
FcPatternAddBool(pattern, FC_ANTIALIAS, false);
} else if (request.styleStrategy & (QFont::PreferAntialias|QFont::NoAntialias)) {
================================================================
Index: SOURCES/qt4-support-cflags-with-commas.patch
diff -u SOURCES/qt4-support-cflags-with-commas.patch:1.1 SOURCES/qt4-support-cflags-with-commas.patch:1.2
--- SOURCES/qt4-support-cflags-with-commas.patch:1.1 Tue Aug 16 12:01:41 2005
+++ SOURCES/qt4-support-cflags-with-commas.patch Wed Oct 4 23:17:38 2006
@@ -2,9 +2,9 @@
--- qt-x11-opensource-desktop-4.0.0.orig/configure 2005-08-16 11:54:47.000000000 +0200
+++ qt-x11-opensource-desktop-4.0.0/configure 2005-08-16 11:58:19.000000000 +0200
@@ -2737,7 +2737,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" \
+ adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'`
+ adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'`
+ sed -e "s, at SOURCE_PATH@,$adjrelpath,g" -e "s, at BUILD_PATH@,$adjoutpath,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" \
================================================================
Index: SOURCES/qt4-build-lib-static.patch
diff -u SOURCES/qt4-build-lib-static.patch:1.2 SOURCES/qt4-build-lib-static.patch:1.3
--- SOURCES/qt4-build-lib-static.patch:1.2 Mon Feb 20 15:52:14 2006
+++ SOURCES/qt4-build-lib-static.patch Wed Oct 4 23:17:38 2006
@@ -1,13 +1,13 @@
--- qt-x11-opensource-src-4.1.0/tools/assistant/lib/lib.pro.orig 2006-02-13 07:13:58.000000000 +0100
+++ qt-x11-opensource-src-4.1.0/tools/assistant/lib/lib.pro 2006-02-13 07:39:59.000000000 +0100
@@ -4,7 +4,6 @@
- VERSION = 1.0
-
CONFIG += qt warn_on
--CONFIG += dll
+ mac|win32:CONFIG += debug_and_release
mac:unix:CONFIG += explicitlib
+-CONFIG += dll
- HEADERS = qassistantclient.h
+ HEADERS = qassistantclient.h \
+ qassistantclient_global.h
@@ -17,6 +16,10 @@
QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_SHLIB
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/qt4-tools.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/SOURCES/qt4-buildsystem.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/SOURCES/qt4-locale.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/SOURCES/qt4-sse.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/qt4-antialias.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SOURCES/qt4-support-cflags-with-commas.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/qt4-build-lib-static.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list