[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.0-1-20-ge9ea0ec
Fathi Boudra
fabo at alioth.debian.org
Tue Jan 19 19:59:46 UTC 2010
The following commit has been merged in the experimental-snapshots branch:
commit 90aa4cc6d79a1d7532997aa26b394f1babea6dea
Author: Fathi Boudra <fabo at debian.org>
Date: Tue Jan 19 20:56:37 2010 +0100
Refresh patches.
---
debian/patches/0180-window-role.diff | 4 +-
debian/patches/0216-allow-isystem-for-headers.diff | 4 +-
debian/patches/0289-context-for-shortcuts-tr.diff | 8 ++--
debian/patches/05_append_qt4_target.diff | 43 ++++++++++++++------
.../patches/07_trust_dpkg-arch_over_uname-m.diff | 2 +-
debian/patches/08_configure_quilt_compat.diff | 2 +-
debian/patches/09_qmake_lflags_as-needed.diff | 2 +-
.../patches/12_add_nostrip_for_debug_packages.diff | 2 +-
.../18_enable_qt3support_qtwebkit_debug_info.diff | 2 +-
debian/patches/20_install_qvfb.diff | 16 ++++----
debian/patches/30_webkit_unaligned_access.diff | 2 +-
debian/patches/40_alpha_ice.diff | 4 +-
debian/patches/92_armel_gcc43_valist_compat.diff | 8 ++--
debian/patches/95_sparc_platform_definition.diff | 4 +-
debian/patches/96_powerpc_no_gc_sections.diff | 2 +-
15 files changed, 61 insertions(+), 44 deletions(-)
diff --git a/debian/patches/0180-window-role.diff b/debian/patches/0180-window-role.diff
index e16af4b..ef4b5a4 100644
--- a/debian/patches/0180-window-role.diff
+++ b/debian/patches/0180-window-role.diff
@@ -21,7 +21,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
-@@ -1136,8 +1136,16 @@ void QObject::setObjectName(const QStrin
+@@ -1124,8 +1124,16 @@ void QObject::setObjectName(const QStrin
{
Q_D(QObject);
d->objectName = name;
@@ -52,7 +52,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse
Sender *sender);
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
-@@ -661,6 +661,7 @@ public:
+@@ -691,6 +691,7 @@ public:
static QWidget *keyboardGrabber;
void setWindowRole();
diff --git a/debian/patches/0216-allow-isystem-for-headers.diff b/debian/patches/0216-allow-isystem-for-headers.diff
index edb1c4b..016941f 100644
--- a/debian/patches/0216-allow-isystem-for-headers.diff
+++ b/debian/patches/0216-allow-isystem-for-headers.diff
@@ -27,7 +27,7 @@ bugs.kde.org number :
--- a/configure
+++ b/configure
-@@ -1012,6 +1012,11 @@ while [ "$#" -gt 0 ]; do
+@@ -1029,6 +1029,11 @@ while [ "$#" -gt 0 ]; do
VAL=`echo $1 | sed 's,-D,,'`
fi
;;
@@ -39,7 +39,7 @@ bugs.kde.org number :
-I?*|-I)
VAR="add_ipath"
if [ "$1" = "-I" ]; then
-@@ -2020,6 +2025,9 @@ while [ "$#" -gt 0 ]; do
+@@ -2047,6 +2052,9 @@ while [ "$#" -gt 0 ]; do
add_ipath)
I_FLAGS="$I_FLAGS -I\"${VAL}\""
;;
diff --git a/debian/patches/0289-context-for-shortcuts-tr.diff b/debian/patches/0289-context-for-shortcuts-tr.diff
index d81cf55..0fd3fca 100644
--- a/debian/patches/0289-context-for-shortcuts-tr.diff
+++ b/debian/patches/0289-context-for-shortcuts-tr.diff
@@ -12,7 +12,7 @@ context to these strings helps creating a more correct translation
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
-@@ -1139,10 +1139,10 @@ int QKeySequencePrivate::decodeString(co
+@@ -1153,10 +1153,10 @@ int QKeySequencePrivate::decodeString(co
QList<QModifKeyName> modifs;
if (nativeText) {
@@ -27,7 +27,7 @@ context to these strings helps creating a more correct translation
}
modifs += *gmodifs; // Test non-translated ones last
-@@ -1232,7 +1232,7 @@ QString QKeySequence::encodeString(int k
+@@ -1246,7 +1246,7 @@ QString QKeySequence::encodeString(int k
static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format)
{
if (!str.isEmpty())
@@ -36,7 +36,7 @@ context to these strings helps creating a more correct translation
: QString::fromLatin1("+");
str += theKey;
}
-@@ -1272,13 +1272,13 @@ QString QKeySequencePrivate::encodeStrin
+@@ -1286,13 +1286,13 @@ QString QKeySequencePrivate::encodeStrin
{
// On other systems the order is Meta, Control, Alt, Shift
if ((key & Qt::META) == Qt::META)
@@ -54,7 +54,7 @@ context to these strings helps creating a more correct translation
}
-@@ -1293,7 +1293,7 @@ QString QKeySequencePrivate::encodeStrin
+@@ -1307,7 +1307,7 @@ QString QKeySequencePrivate::encodeStrin
p += QChar((key-0x10000)%400+0xdc00);
}
} else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) {
diff --git a/debian/patches/05_append_qt4_target.diff b/debian/patches/05_append_qt4_target.diff
index a0dda3d..74b7c5a 100644
--- a/debian/patches/05_append_qt4_target.diff
+++ b/debian/patches/05_append_qt4_target.diff
@@ -57,7 +57,7 @@ author: Fathi Boudra <fabo at debian.org>
if [ "$VERBOSE" = "yes" ]; then
--- a/configure
+++ b/configure
-@@ -4262,7 +4262,7 @@ END {
+@@ -4304,7 +4304,7 @@ END {
}
# build qmake
@@ -66,7 +66,7 @@ author: Fathi Boudra <fabo at debian.org>
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
-@@ -7157,8 +7157,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -7216,8 +7216,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -77,7 +77,7 @@ author: Fathi Boudra <fabo at debian.org>
QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -7542,11 +7542,11 @@ EXEC=""
+@@ -7602,11 +7602,11 @@ EXEC=""
#-------------------------------------------------------------------------------
echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@ author: Fathi Boudra <fabo at debian.org>
fi
# .projects -> projects to process
-@@ -7721,7 +7721,7 @@ for file in .projects .projects.3; do
+@@ -7785,7 +7785,7 @@ for file in .projects .projects.3; do
echo " for $a\c"
fi
@@ -102,7 +102,7 @@ author: Fathi Boudra <fabo at debian.org>
if echo '\c' | grep '\c' >/dev/null; then
--- a/projects.pro
+++ b/projects.pro
-@@ -137,7 +137,7 @@ qmake.path=$$[QT_INSTALL_BINS]
+@@ -142,7 +142,7 @@ qmake.path=$$[QT_INSTALL_BINS]
win32 {
qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
} else {
@@ -143,7 +143,7 @@ author: Fathi Boudra <fabo at debian.org>
+TARGET = lrelease-qt4
DESTDIR = ../../../bin
- QT -= gui
+ DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
--- a/tools/linguist/lupdate/lupdate.pro
+++ b/tools/linguist/lupdate/lupdate.pro
@@ -1,5 +1,5 @@
@@ -217,14 +217,31 @@ author: Fathi Boudra <fabo at debian.org>
target.path=$$[QT_INSTALL_BINS]
--- a/translations/translations.pri
+++ b/translations/translations.pri
-@@ -13,8 +13,8 @@ defineReplace(fixPath) {
- return ($$1)
+@@ -8,7 +8,7 @@ defineReplace(prependAll) {
+ return ($$result)
}
--LUPDATE = $$fixPath($$QT_BUILD_TREE/bin/lupdate) -locations relative -no-ui-lines
--LRELEASE = $$fixPath($$QT_BUILD_TREE/bin/lrelease)
-+LUPDATE = $$fixPath($$QT_BUILD_TREE/bin/lupdate-qt4) -locations relative -no-ui-lines
-+LRELEASE = $$fixPath($$QT_BUILD_TREE/bin/lrelease-qt4)
+-LUPDATE = $$QT_BUILD_TREE/bin/lupdate -locations relative -no-ui-lines
++LUPDATE = $$QT_BUILD_TREE/bin/lupdate-qt4 -locations relative -no-ui-lines
+ LUPDATE ~= s,/,$$QMAKE_DIR_SEP,
###### Qt Libraries
-
+--- a/translations/translations.pro
++++ b/translations/translations.pro
+@@ -1,6 +1,6 @@
+ TRANSLATIONS = $$files(*.ts)
+
+-LRELEASE = $$QT_BUILD_TREE/bin/lrelease
++LRELEASE = $$QT_BUILD_TREE/bin/lrelease-qt4
+ LRELEASE ~= s,/,$$QMAKE_DIR_SEP,
+
+ contains(TEMPLATE_PREFIX, vc):vcproj = 1
+@@ -14,7 +14,7 @@ LIBS =
+ updateqm.input = TRANSLATIONS
+ updateqm.output = ${QMAKE_FILE_BASE}.qm
+ isEmpty(vcproj):updateqm.variable_out = PRE_TARGETDEPS
+-updateqm.commands = @echo lrelease ${QMAKE_FILE_IN} && $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
++updateqm.commands = @echo lrelease-qt4 ${QMAKE_FILE_IN} && $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
+ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
+ updateqm.CONFIG += no_link
+ QMAKE_EXTRA_COMPILERS += updateqm
diff --git a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
index 8527e54..01eb78f 100644
--- a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
+++ b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
@@ -4,7 +4,7 @@ Trolltech task ID : 181882
--- a/configure
+++ b/configure
-@@ -154,7 +154,50 @@ linkerSupportsFlag()
+@@ -168,7 +168,50 @@ linkerSupportsFlag()
#-------------------------------------------------------------------------------
# need that throughout the script
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index 122e0bc..5f51a7d 100644
--- a/debian/patches/08_configure_quilt_compat.diff
+++ b/debian/patches/08_configure_quilt_compat.diff
@@ -3,7 +3,7 @@ It breaks qmake projects search.
--- a/configure
+++ b/configure
-@@ -7598,7 +7598,7 @@ fi
+@@ -7658,7 +7658,7 @@ fi
# .projects.3 -> the rest
rm -f .projects .projects.1 .projects.2 .projects.3
diff --git a/debian/patches/09_qmake_lflags_as-needed.diff b/debian/patches/09_qmake_lflags_as-needed.diff
index ae95ca2..d8f001b 100644
--- a/debian/patches/09_qmake_lflags_as-needed.diff
+++ b/debian/patches/09_qmake_lflags_as-needed.diff
@@ -5,7 +5,7 @@ Bug reported to Trolltech.
--- a/configure
+++ b/configure
-@@ -634,6 +634,8 @@ mkdir -p "$outpath/config.tests"
+@@ -648,6 +648,8 @@ mkdir -p "$outpath/config.tests"
rm -f "$outpath/config.tests/.qmake.cache"
cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
diff --git a/debian/patches/12_add_nostrip_for_debug_packages.diff b/debian/patches/12_add_nostrip_for_debug_packages.diff
index 09ff450..936f572 100644
--- a/debian/patches/12_add_nostrip_for_debug_packages.diff
+++ b/debian/patches/12_add_nostrip_for_debug_packages.diff
@@ -6,7 +6,7 @@ let dh_strip do it to generate debug packages.
--- a/configure
+++ b/configure
-@@ -635,6 +635,7 @@ rm -f "$outpath/config.tests/.qmake.cach
+@@ -649,6 +649,7 @@ rm -f "$outpath/config.tests/.qmake.cach
cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
QMakeVar add QMAKE_LFLAGS -Wl,--as-needed
diff --git a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
index c0e1c4f..5aed855 100644
--- a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
+++ b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
@@ -5,7 +5,7 @@ This patch enable them.
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
-@@ -3360,8 +3360,6 @@ HEADERS += $$WEBKIT_API_HEADERS
+@@ -3389,8 +3389,6 @@ HEADERS += $$WEBKIT_API_HEADERS
CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4) {
# start with 4.5
# Remove the following 2 lines if you want debug information in WebCore
diff --git a/debian/patches/20_install_qvfb.diff b/debian/patches/20_install_qvfb.diff
index 57d02af..a83b676 100644
--- a/debian/patches/20_install_qvfb.diff
+++ b/debian/patches/20_install_qvfb.diff
@@ -3,11 +3,11 @@ Author: Fathi Boudra <fabo at debian.org>
--- a/tools/tools.pro
+++ b/tools/tools.pro
-@@ -15,6 +15,7 @@ no-png {
- }
- SUBDIRS += linguist
- SUBDIRS += qdoc3
-+ SUBDIRS += qvfb
- symbian: SUBDIRS = designer
- wince*: SUBDIRS = qtestlib designer
- unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
+@@ -33,5 +33,7 @@ embedded: SUBDIRS += makeqpf
+
+ !wince*:!cross_compile:SUBDIRS += qdoc3
+
++SUBDIRS += qvfb
++
+ CONFIG+=ordered
+ QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)"
diff --git a/debian/patches/30_webkit_unaligned_access.diff b/debian/patches/30_webkit_unaligned_access.diff
index a8d836f..418e4e4 100644
--- a/debian/patches/30_webkit_unaligned_access.diff
+++ b/debian/patches/30_webkit_unaligned_access.diff
@@ -64,7 +64,7 @@ a real problem yet.
template<typename ValueArg> struct ListHashSetNode {
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
-@@ -378,6 +378,23 @@
+@@ -398,6 +398,23 @@
# include <ce_time.h>
#endif
diff --git a/debian/patches/40_alpha_ice.diff b/debian/patches/40_alpha_ice.diff
index 6915b2d..7669799 100644
--- a/debian/patches/40_alpha_ice.diff
+++ b/debian/patches/40_alpha_ice.diff
@@ -1,6 +1,6 @@
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -75,12 +75,7 @@ class QLibraryInfoPrivate
+@@ -79,12 +79,7 @@ class QLibraryInfoPrivate
{
public:
static QSettings *findConfiguration();
@@ -14,7 +14,7 @@
static QSettings *configuration()
{
QLibrarySettings *ls = qt_library_settings();
-@@ -88,6 +83,13 @@ public:
+@@ -92,6 +87,13 @@ public:
}
};
diff --git a/debian/patches/92_armel_gcc43_valist_compat.diff b/debian/patches/92_armel_gcc43_valist_compat.diff
index 9c2ee38..1db7aa3 100644
--- a/debian/patches/92_armel_gcc43_valist_compat.diff
+++ b/debian/patches/92_armel_gcc43_valist_compat.diff
@@ -26,7 +26,7 @@ Forward: not-needed
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-@@ -96,6 +100,11 @@
+@@ -96,6 +100,11 @@ Q_CORE_EXPORT int qstrnicmp(const char *
// implemented in qvsnprintf.cpp
Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap);
@@ -40,7 +40,7 @@ Forward: not-needed
#ifdef QT3_SUPPORT
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
-@@ -5289,6 +5289,12 @@
+@@ -5289,6 +5289,12 @@ QString &QString::vsprintf(const char* c
return *this;
}
@@ -55,7 +55,7 @@ Forward: not-needed
base, which is 10 by default and must be between 2 and 36, or 0.
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/tools/qstring.h
-@@ -177,6 +177,15 @@
+@@ -177,6 +177,15 @@ public:
__attribute__ ((format (printf, 2, 0)))
#endif
;
@@ -73,7 +73,7 @@ Forward: not-needed
__attribute__ ((format (printf, 2, 3)))
--- a/src/corelib/tools/qvsnprintf.cpp
+++ b/src/corelib/tools/qvsnprintf.cpp
-@@ -104,6 +104,13 @@
+@@ -104,6 +104,13 @@ int qvsnprintf(char *str, size_t n, cons
#endif
diff --git a/debian/patches/95_sparc_platform_definition.diff b/debian/patches/95_sparc_platform_definition.diff
index 0c5216b..8aee1be 100644
--- a/debian/patches/95_sparc_platform_definition.diff
+++ b/debian/patches/95_sparc_platform_definition.diff
@@ -4,8 +4,8 @@ Forwarded: not-needed
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
-@@ -218,6 +218,16 @@
- #define WTF_PLATFORM_BIG_ENDIAN 1
+@@ -228,6 +228,16 @@
+ #define WTF_PLATFORM_SPARC
#endif
+/* PLATFORM(SPARC32) */
diff --git a/debian/patches/96_powerpc_no_gc_sections.diff b/debian/patches/96_powerpc_no_gc_sections.diff
index e8cf4c8..6e21496 100644
--- a/debian/patches/96_powerpc_no_gc_sections.diff
+++ b/debian/patches/96_powerpc_no_gc_sections.diff
@@ -5,7 +5,7 @@ Author: Steve Langasek <steve.langasek at ubuntu.com>
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
-@@ -51,7 +51,7 @@
+@@ -60,7 +60,7 @@ unix {
}
unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
--
Qt 4 Debian packaging
More information about the pkg-kde-commits
mailing list