[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.2-5-3-g0911514
Fathi Boudra
fabo at alioth.debian.org
Fri May 21 08:37:48 UTC 2010
The following commit has been merged in the experimental-snapshots branch:
commit 0911514f6cd9231d10f608121de054aae145b333
Author: Fathi Boudra <fabo at debian.org>
Date: Fri May 21 11:35:28 2010 +0300
* Remove upstream patches:
- 0001_qpixmap_load_no_modify_referenced_copies.diff - stolen upstream
- 0002_qmake_qfileinfo_absolutepath.diff - stolen upstream
- 0003_s390_fix_atomic_ops_related_crashes.diff - stolen upstream
- 0004_problem_displaying_half_width_character.diff - stolen upstream
- 0005_always_redraw_the_complete_control.diff - stolen upstream
- 0006_expand_indicator_would_not_be_displayed.diff - stolen upstream
* Remove Debian patches:
- 82_hurd_SA_SIGINFO.diff - merged upstream
- 95_sparc_platform_definition.diff - merged upstream
- 98_alpha_ftbfs_wtf_platform_support.diff - stolen upstream
* Refresh Debian patches:
- 30_webkit_unaligned_access.diff - partially merged upstream
---
debian/changelog | 19 ++++++
debian/patches/0180-window-role.diff | 10 ++--
debian/patches/0195-compositing-properties.diff | 6 +-
debian/patches/01_qmake_for_debian.diff | 2 +-
debian/patches/0209-prevent-qt-mixing.diff | 2 +-
debian/patches/0216-allow-isystem-for-headers.diff | 4 +-
debian/patches/05_append_qt4_target.diff | 36 +++++-----
debian/patches/08_configure_quilt_compat.diff | 2 +-
debian/patches/09_qmake_lflags_as-needed.diff | 2 +-
debian/patches/10_config_tests_fixes.diff | 2 +-
.../patches/12_add_nostrip_for_debug_packages.diff | 2 +-
.../patches/15_fix_qmake_makefile_generation.diff | 2 +-
.../patches/16_hide_std_symbols_on_qtwebkit.diff | 6 +-
.../18_enable_qt3support_qtwebkit_debug_info.diff | 6 +-
debian/patches/20_install_qvfb.diff | 2 +-
debian/patches/21_qt_ia32_library_path.diff | 8 +-
debian/patches/30_webkit_unaligned_access.diff | 69 ++++++--------------
debian/patches/40_alpha_ice.diff | 2 +-
debian/patches/41_disable_opengl_visibility.diff | 4 +-
debian/patches/50_kfreebsd_build_fix.diff | 4 +-
debian/patches/51_kfreebsd_strnstr_build_fix.diff | 20 +++---
debian/patches/81_hurd_architecture.diff | 2 +-
debian/patches/89_powerpc_opts.diff | 2 +-
debian/patches/91_s390_use_gstabs.diff | 4 +-
debian/patches/92_armel_gcc43_valist_compat.diff | 2 +-
debian/patches/96_webkit_no_gc_sections.diff | 6 +-
debian/patches/series | 18 +++---
27 files changed, 116 insertions(+), 128 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 709e401..103c3e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+qt4-x11 (4:4.7.0~beta1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Remove upstream patches:
+ - 0001_qpixmap_load_no_modify_referenced_copies.diff - stolen upstream
+ - 0002_qmake_qfileinfo_absolutepath.diff - stolen upstream
+ - 0003_s390_fix_atomic_ops_related_crashes.diff - stolen upstream
+ - 0004_problem_displaying_half_width_character.diff - stolen upstream
+ - 0005_always_redraw_the_complete_control.diff - stolen upstream
+ - 0006_expand_indicator_would_not_be_displayed.diff - stolen upstream
+ * Remove Debian patches:
+ - 82_hurd_SA_SIGINFO.diff - merged upstream
+ - 95_sparc_platform_definition.diff - merged upstream
+ - 98_alpha_ftbfs_wtf_platform_support.diff - stolen upstream
+ * Refresh Debian patches:
+ - 30_webkit_unaligned_access.diff - partially merged upstream
+
+ -- Fathi Boudra <fabo at debian.org> Fri, 21 May 2010 10:31:22 +0300
+
qt4-x11 (4:4.6.2-5) unstable; urgency=low
[ Modestas Vainius ]
diff --git a/debian/patches/0180-window-role.diff b/debian/patches/0180-window-role.diff
index 29833f5..af7f883 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
-@@ -1124,8 +1124,16 @@ void QObject::setObjectName(const QStrin
+@@ -1120,8 +1120,16 @@ void QObject::setObjectName(const QStrin
{
Q_D(QObject);
d->objectName = name;
@@ -40,7 +40,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse
/*! \internal
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
-@@ -157,6 +157,9 @@ public:
+@@ -155,6 +155,9 @@ public:
void sendPendingChildInsertedEvents();
void removePendingChildInsertedEvents(QObject *child);
#endif
@@ -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
-@@ -693,6 +693,7 @@ public:
+@@ -699,6 +699,7 @@ public:
static QWidget *keyboardGrabber;
void setWindowRole();
@@ -62,7 +62,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse
void x11UpdateIsOpaque();
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -825,13 +825,17 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -824,13 +824,17 @@ void QWidgetPrivate::create_sys(WId wind
data.fstrut_dirty = 1;
// declare the widget's window role
@@ -86,7 +86,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse
}
// set client leader property
-@@ -2917,6 +2921,17 @@ void QWidgetPrivate::setWindowRole()
+@@ -2938,6 +2942,17 @@ void QWidgetPrivate::setWindowRole()
XChangeProperty(X11->display, q->internalWinId(),
ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
(unsigned char *)windowRole.constData(), windowRole.length());
diff --git a/debian/patches/0195-compositing-properties.diff b/debian/patches/0195-compositing-properties.diff
index bc4b36e..38aa986 100644
--- a/debian/patches/0195-compositing-properties.diff
+++ b/debian/patches/0195-compositing-properties.diff
@@ -13,7 +13,7 @@ bugs.kde.org number : none
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -763,6 +763,11 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -762,6 +762,11 @@ void QWidgetPrivate::create_sys(WId wind
Q_ASSERT(id);
XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
&wsa);
@@ -25,7 +25,7 @@ bugs.kde.org number : none
} else if (topLevel && !desktop) { // top-level widget
if (!X11->wm_client_leader)
create_wm_client_leader();
-@@ -816,13 +821,21 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -815,13 +820,21 @@ void QWidgetPrivate::create_sys(WId wind
// set EWMH window types
setNetWmWindowTypes();
@@ -49,7 +49,7 @@ bugs.kde.org number : none
// declare the widget's window role
QByteArray windowRole;
-@@ -842,10 +855,6 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -841,10 +854,6 @@ void QWidgetPrivate::create_sys(WId wind
XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
XA_WINDOW, 32, PropModeReplace,
(unsigned char *)&X11->wm_client_leader, 1);
diff --git a/debian/patches/01_qmake_for_debian.diff b/debian/patches/01_qmake_for_debian.diff
index d754554..a0db3a1 100644
--- a/debian/patches/01_qmake_for_debian.diff
+++ b/debian/patches/01_qmake_for_debian.diff
@@ -4,7 +4,7 @@ Ensures qmake generates Makefiles that use the -qt4 tools.
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
-@@ -38,8 +38,8 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
+@@ -35,8 +35,8 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
QMAKE_LIBS_OPENVG = -lOpenVG
QMAKE_LIBS_THREAD = -lpthread
diff --git a/debian/patches/0209-prevent-qt-mixing.diff b/debian/patches/0209-prevent-qt-mixing.diff
index e885cf4..1c9af93 100644
--- a/debian/patches/0209-prevent-qt-mixing.diff
+++ b/debian/patches/0209-prevent-qt-mixing.diff
@@ -19,7 +19,7 @@ bugs.kde.org number : none
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
-@@ -83,7 +83,9 @@ void Q_CORE_EXPORT qt_register_signal_sp
+@@ -82,7 +82,9 @@ void Q_CORE_EXPORT qt_register_signal_sp
extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set;
diff --git a/debian/patches/0216-allow-isystem-for-headers.diff b/debian/patches/0216-allow-isystem-for-headers.diff
index 016941f..f451768 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
-@@ -1029,6 +1029,11 @@ while [ "$#" -gt 0 ]; do
+@@ -1046,6 +1046,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
-@@ -2047,6 +2052,9 @@ while [ "$#" -gt 0 ]; do
+@@ -2106,6 +2111,9 @@ while [ "$#" -gt 0 ]; do
add_ipath)
I_FLAGS="$I_FLAGS -I\"${VAL}\""
;;
diff --git a/debian/patches/05_append_qt4_target.diff b/debian/patches/05_append_qt4_target.diff
index ce2b212..ca9aa6d 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
-@@ -4304,7 +4304,7 @@ END {
+@@ -4438,7 +4438,7 @@ END {
}
# build qmake
@@ -66,7 +66,7 @@ author: Fathi Boudra <fabo at debian.org>
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
-@@ -7216,8 +7216,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -7597,8 +7597,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
-@@ -7602,11 +7602,11 @@ EXEC=""
+@@ -7987,11 +7987,11 @@ EXEC=""
#-------------------------------------------------------------------------------
echo "Finding project files. Please wait..."
@@ -91,18 +91,18 @@ author: Fathi Boudra <fabo at debian.org>
fi
# .projects -> projects to process
-@@ -7785,7 +7785,7 @@ for file in .projects .projects.3; do
- echo " for $a\c"
- fi
+@@ -8166,7 +8166,7 @@ for file in .projects .projects.3; do
+ QMAKE_SPEC_ARGS="-spec $SPEC"
+ echo $ECHO_N " for $a$ECHO_C"
- QMAKE="$outpath/bin/qmake"
+ QMAKE="$outpath/bin/qmake-qt4"
QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS"
if [ "$file" = ".projects.3" ]; then
- if echo '\c' | grep '\c' >/dev/null; then
+ echo " (fast)"
--- a/projects.pro
+++ b/projects.pro
-@@ -142,7 +142,7 @@ qmake.path=$$[QT_INSTALL_BINS]
+@@ -153,7 +153,7 @@ qmake.path=$$[QT_INSTALL_BINS]
win32 {
qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
} else {
@@ -113,7 +113,7 @@ author: Fathi Boudra <fabo at debian.org>
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
-@@ -70,17 +70,17 @@ CPPFLAGS = -I. -Igenerators -Igenerators
+@@ -75,17 +75,17 @@ CPPFLAGS = -I. -Igenerators -Igenerators
CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
@@ -173,18 +173,18 @@ author: Fathi Boudra <fabo at debian.org>
DEFINES += QT_UIC
--- a/tools/assistant/tools/assistant/assistant.pro
+++ b/tools/assistant/tools/assistant/assistant.pro
-@@ -2,7 +2,7 @@ include($$QT_SOURCE_TREE/tools/shared/fo
-
+@@ -1,7 +1,7 @@
+ include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri)
TEMPLATE = app
LANGUAGE = C++
-TARGET = assistant
+TARGET = assistant-qt4
-
- contains(QT_CONFIG, webkit) {
- QT += webkit
+ contains(QT_CONFIG, webkit):QT += webkit
+ CONFIG += qt \
+ warn_on \
--- a/tools/designer/src/designer/designer.pro
+++ b/tools/designer/src/designer/designer.pro
-@@ -25,7 +25,7 @@ contains(CONFIG, static) {
+@@ -23,7 +23,7 @@ contains(CONFIG, static) {
DEFINES += QT_DESIGNER_STATIC
}
@@ -202,11 +202,11 @@ author: Fathi Boudra <fabo at debian.org>
-TARGET = linguist
+TARGET = linguist-qt4
win32:RC_FILE = linguist.rc
- mac {
+ mac {
static:CONFIG -= global_init_link_order
--- a/tools/qtconfig/qtconfig.pro
+++ b/tools/qtconfig/qtconfig.pro
-@@ -19,7 +19,7 @@ FORMS = mainwindowbase.ui palette
+@@ -22,7 +22,7 @@ FORMS = mainwindowbase.ui palette
RESOURCES = qtconfig.qrc
PROJECTNAME = Qt Configuration
@@ -236,7 +236,7 @@ author: Fathi Boudra <fabo at debian.org>
win32 {
LRELEASE ~= s,/,$$QMAKE_DIR_SEP,
LRELEASE = $${LRELEASE}.exe
-@@ -18,7 +18,7 @@ updateqm.input = TRANSLATIONS
+@@ -19,7 +19,7 @@ updateqm.input = TRANSLATIONS
updateqm.output = ${QMAKE_FILE_BASE}.qm
isEmpty(vcproj):updateqm.variable_out = PRE_TARGETDEPS
updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index 5f51a7d..991d10b 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
-@@ -7658,7 +7658,7 @@ fi
+@@ -8043,7 +8043,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 d8f001b..901a848 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
-@@ -648,6 +648,8 @@ mkdir -p "$outpath/config.tests"
+@@ -650,6 +650,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/10_config_tests_fixes.diff b/debian/patches/10_config_tests_fixes.diff
index 44588af..63c4234 100644
--- a/debian/patches/10_config_tests_fixes.diff
+++ b/debian/patches/10_config_tests_fixes.diff
@@ -12,7 +12,7 @@ Author: Fathi Boudra <fabo at debian.org>
+LIBS += -lfbclient
--- a/src/sql/drivers/drivers.pri
+++ b/src/sql/drivers/drivers.pri
-@@ -93,7 +93,7 @@ contains(sql-drivers, ibase) {
+@@ -91,7 +91,7 @@ contains(sql-drivers, ibase) {
HEADERS += drivers/ibase/qsql_ibase.h
SOURCES += drivers/ibase/qsql_ibase.cpp
diff --git a/debian/patches/12_add_nostrip_for_debug_packages.diff b/debian/patches/12_add_nostrip_for_debug_packages.diff
index 936f572..f61b8dd 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
-@@ -649,6 +649,7 @@ rm -f "$outpath/config.tests/.qmake.cach
+@@ -651,6 +651,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/15_fix_qmake_makefile_generation.diff b/debian/patches/15_fix_qmake_makefile_generation.diff
index c8fad2f..e6f1fd1 100644
--- a/debian/patches/15_fix_qmake_makefile_generation.diff
+++ b/debian/patches/15_fix_qmake_makefile_generation.diff
@@ -3,7 +3,7 @@ Author: Sune Vuorela <debian at pusling.com>
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
-@@ -2396,7 +2396,7 @@ MakefileGenerator::writeSubTargets(QText
+@@ -2390,7 +2390,7 @@ MakefileGenerator::writeSubTargets(QText
QString mkfile = subtarget->makefile;
if(!in_directory.isEmpty())
diff --git a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
index 5bb6ee8..97291e6 100644
--- a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
+++ b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
@@ -4,14 +4,14 @@ Author: Sune Vuorela <debian at pusling.com>
--- a/src/3rdparty/webkit/WebKit.pri
+++ b/src/3rdparty/webkit/WebKit.pri
-@@ -45,6 +45,7 @@ CONFIG(release, debug|release) {
+@@ -49,6 +49,7 @@ CONFIG(release, debug|release) {
BASE_DIR = $$PWD
- INCLUDEPATH += $$PWD/WebKit/qt/Api
+ INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit
+QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter
CONFIG -= warn_on
- *-g++*:QMAKE_CXXFLAGS += -Wreturn-type -fno-strict-aliasing
+ *-g++*:QMAKE_CXXFLAGS += -Wall -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
--- /dev/null
+++ b/src/3rdparty/webkit/symbols.filter
@@ -0,0 +1,5 @@
diff --git a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
index 44cdb54..8912863 100644
--- a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
+++ b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
@@ -5,9 +5,9 @@ This patch enable them.
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
-@@ -3392,8 +3392,6 @@ HEADERS += $$WEBKIT_API_HEADERS
- CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4) {
- # start with 4.5
+@@ -2900,8 +2900,6 @@ HEADERS += $$WEBKIT_API_HEADERS
+
+ CONFIG(QTDIR_build) {
# Remove the following 2 lines if you want debug information in WebCore
- CONFIG -= separate_debug_info
- CONFIG += no_debug_info
diff --git a/debian/patches/20_install_qvfb.diff b/debian/patches/20_install_qvfb.diff
index a83b676..25daad4 100644
--- a/debian/patches/20_install_qvfb.diff
+++ b/debian/patches/20_install_qvfb.diff
@@ -3,7 +3,7 @@ Author: Fathi Boudra <fabo at debian.org>
--- a/tools/tools.pro
+++ b/tools/tools.pro
-@@ -33,5 +33,7 @@ embedded: SUBDIRS += makeqpf
+@@ -40,5 +40,7 @@ embedded: SUBDIRS += makeqpf
!wince*:!cross_compile:SUBDIRS += qdoc3
diff --git a/debian/patches/21_qt_ia32_library_path.diff b/debian/patches/21_qt_ia32_library_path.diff
index 50ed914..e725f9c 100644
--- a/debian/patches/21_qt_ia32_library_path.diff
+++ b/debian/patches/21_qt_ia32_library_path.diff
@@ -40,7 +40,7 @@ Author: Bo Thorsen <bo at sonofthor.dk>
/*!
\since 4.6
Returns the installation date for this build of Qt. The install date will
-@@ -430,7 +450,7 @@ QLibraryInfo::location(LibraryLocation l
+@@ -439,7 +459,7 @@ QLibraryInfo::location(LibraryLocation l
if (loc == PrefixPath) {
// we make the prefix path absolute to the executable's directory
#ifdef BOOTSTRAPPING
@@ -49,12 +49,12 @@ Author: Bo Thorsen <bo at sonofthor.dk>
#else
if (QCoreApplication::instance()) {
#ifdef Q_OS_MAC
-@@ -439,21 +459,21 @@ QLibraryInfo::location(LibraryLocation l
+@@ -448,21 +468,21 @@ QLibraryInfo::location(LibraryLocation l
QCFType<CFURLRef> urlRef = CFBundleCopyBundleURL(bundleRef);
if (urlRef) {
QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle);
-- return QDir::cleanPath(path + QLatin1String("/Contents/") + ret);
-+ return fixLibraryPath32(QDir::cleanPath(path + QLatin1String("/Contents/") + ret));
+- return QDir::cleanPath(QString(path) + QLatin1String("/Contents/") + ret);
++ return fixLibraryPath32(QDir::cleanPath(QString(path) + QLatin1String("/Contents/") + ret));
}
}
#endif
diff --git a/debian/patches/30_webkit_unaligned_access.diff b/debian/patches/30_webkit_unaligned_access.diff
index 418e4e4..47ab3de 100644
--- a/debian/patches/30_webkit_unaligned_access.diff
+++ b/debian/patches/30_webkit_unaligned_access.diff
@@ -14,7 +14,7 @@ a real problem yet.
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp
-@@ -2259,13 +2259,13 @@ static TCMalloc_Central_FreeListPadded c
+@@ -2336,13 +2336,13 @@ static TCMalloc_Central_FreeListPadded c
// Page-level allocator
static SpinLock pageheap_lock = SPINLOCK_INITIALIZER;
@@ -62,66 +62,35 @@ 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
-@@ -398,6 +398,23 @@
- # include <ce_time.h>
- #endif
-
-+/* PLATFORM(SPARC) */
-+#if defined(__sparc__) \
-+ || defined(__sparc)
-+#define WTF_PLATFORM_SPARC 1
-+#define WTF_PLATFORM_BIG_ENDIAN 1
-+#endif
-+
-+/* For undefined platforms */
-+#if !defined(WTF_PLATFORM_BIG_ENDIAN) && !defined(WTF_PLATFORM_MIDDLE_ENDIAN)
-+#include <sys/param.h>
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+#define WTF_PLATFORM_BIG_ENDIAN 1
-+#elif __BYTE_ORDER == __PDP_ENDIAN
-+#define WTF_PLATFORM_MIDDLE_ENDIAN 1
-+#endif
-+#endif
-+
- /* Compiler */
-
- /* COMPILER(MSVC) */
--- a/src/3rdparty/webkit/WebCore/platform/text/AtomicString.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/text/AtomicString.cpp
-@@ -103,7 +103,7 @@ static inline bool equal(StringImpl* str
+@@ -103,9 +103,9 @@ static inline bool equal(StringImpl* str
if (string->length() != length)
return false;
--#if PLATFORM(ARM) || PLATFORM(SH4)
-+#if PLATFORM(ARM) || PLATFORM(SH4) || PLATFORM(SPARC)
++#if CPU(ARM) || CPU(SH4) || CPU(SPARC)
+ // FIXME: perhaps we should have a more abstract macro that indicates when
+ // going 4 bytes at a time is unsafe
+-#if CPU(ARM) || CPU(SH4)
const UChar* stringCharacters = string->characters();
for (unsigned i = 0; i != length; ++i) {
if (*stringCharacters++ != *characters++)
--- a/src/3rdparty/webkit/WebCore/platform/text/StringHash.h
+++ b/src/3rdparty/webkit/WebCore/platform/text/StringHash.h
-@@ -47,6 +47,15 @@ namespace WebCore {
- if (aLength != bLength)
- return false;
+@@ -54,13 +54,13 @@ namespace WebCore {
-+#if PLATFORM(ARM) || PLATFORM(SPARC)
-+ const UChar* aChars = a->characters();
-+ const UChar* bChars = b->characters();
+ // FIXME: perhaps we should have a more abstract macro that indicates when
+ // going 4 bytes at a time is unsafe
+-#if CPU(ARM) || CPU(SH4)
++#if CPU(ARM) || CPU(SH4) || CPU(SPARC)
+ const UChar* aChars = a->characters();
+ const UChar* bChars = b->characters();
+- for (unsigned i = 0; i != aLength; ++i) {
+ for (unsigned i = 0; i != aLength; ++i)
-+ if (*aChars++ != *bChars++)
-+ return false;
+ if (*aChars++ != *bChars++)
+ return false;
+- }
+
-+ return true;
-+#else
- const uint32_t* aChars = reinterpret_cast<const uint32_t*>(a->characters());
- const uint32_t* bChars = reinterpret_cast<const uint32_t*>(b->characters());
-
-@@ -59,6 +68,7 @@ namespace WebCore {
- return false;
-
return true;
-+#endif
- }
-
- static unsigned hash(const RefPtr<StringImpl>& key) { return key->hash(); }
+ #else
+ /* Do it 4-bytes-at-a-time on architectures where it's safe */
diff --git a/debian/patches/40_alpha_ice.diff b/debian/patches/40_alpha_ice.diff
index 599627c..169aac7 100644
--- a/debian/patches/40_alpha_ice.diff
+++ b/debian/patches/40_alpha_ice.diff
@@ -36,7 +36,7 @@ Author: Steve Langasek <vorlon at debian.org>
{
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
-@@ -520,7 +520,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de
+@@ -521,7 +521,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de
}
template <class Key, class T>
diff --git a/debian/patches/41_disable_opengl_visibility.diff b/debian/patches/41_disable_opengl_visibility.diff
index 4d8ef04..ed2ea47 100644
--- a/debian/patches/41_disable_opengl_visibility.diff
+++ b/debian/patches/41_disable_opengl_visibility.diff
@@ -2,9 +2,9 @@ temporary fix because of alpha, has to be dropped as soon as gcc's bug is fixed.
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
-@@ -35,6 +35,7 @@ SOURCES += qgl.cpp \
- qglextensions.cpp \
+@@ -36,6 +36,7 @@ SOURCES += qgl.cpp \
qglpaintdevice.cpp \
+ qglbuffer.cpp \
+QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden
diff --git a/debian/patches/50_kfreebsd_build_fix.diff b/debian/patches/50_kfreebsd_build_fix.diff
index fdb4eee..ab07438 100644
--- a/debian/patches/50_kfreebsd_build_fix.diff
+++ b/debian/patches/50_kfreebsd_build_fix.diff
@@ -55,7 +55,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
# include <fenv.h>
#endif
-@@ -6537,7 +6537,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
+@@ -6598,7 +6598,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
_control87(MCW_EM, MCW_EM);
#endif
@@ -64,7 +64,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
fenv_t envp;
feholdexcept(&envp);
#endif
-@@ -6553,7 +6553,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
+@@ -6614,7 +6614,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
#endif //_M_X64
#endif //Q_OS_WIN
diff --git a/debian/patches/51_kfreebsd_strnstr_build_fix.diff b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
index de86dec..085cd3e 100644
--- a/debian/patches/51_kfreebsd_strnstr_build_fix.diff
+++ b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
@@ -4,23 +4,23 @@ Bug: https://bugs.webkit.org/show_bug.cgi?id=33903
--- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
-@@ -68,7 +68,7 @@
- /* PLATFORM(LINUX) */
- /* Operating system level dependencies for Linux-like systems that */
- /* should be used regardless of operating environment */
+@@ -359,7 +359,7 @@
+ #endif
+
+ /* OS(LINUX) - Linux */
-#ifdef __linux__
+#if defined(__linux__) || defined(__GLIBC__)
- #define WTF_PLATFORM_LINUX 1
+ #define WTF_OS_LINUX 1
#endif
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-@@ -68,7 +68,7 @@
- /* PLATFORM(LINUX) */
- /* Operating system level dependencies for Linux-like systems that */
- /* should be used regardless of operating environment */
+@@ -383,7 +383,7 @@
+ #endif
+
+ /* OS(LINUX) - Linux */
-#ifdef __linux__
+#if defined(__linux__) || defined(__GLIBC__)
- #define WTF_PLATFORM_LINUX 1
+ #define WTF_OS_LINUX 1
#endif
diff --git a/debian/patches/81_hurd_architecture.diff b/debian/patches/81_hurd_architecture.diff
index 355b270..7185af8 100644
--- a/debian/patches/81_hurd_architecture.diff
+++ b/debian/patches/81_hurd_architecture.diff
@@ -6,7 +6,7 @@ Author: Pino Toscano <pino at kde.org>
Forwarded: http://bugreports.qt.nokia.com/browse/QTBUG-7803
--- a/configure
+++ b/configure
-@@ -2723,6 +2723,17 @@ fi
+@@ -2814,6 +2814,17 @@ fi
if [ -z "${CFG_HOST_ARCH}" ]; then
case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in
diff --git a/debian/patches/89_powerpc_opts.diff b/debian/patches/89_powerpc_opts.diff
index c3ab95c..9a0bcfb 100644
--- a/debian/patches/89_powerpc_opts.diff
+++ b/debian/patches/89_powerpc_opts.diff
@@ -3,7 +3,7 @@ Not needed long-term as the relevant g++ bug is fixed in GCC 4.4.
--- a/mkspecs/linux-g++/qmake.conf
+++ b/mkspecs/linux-g++/qmake.conf
-@@ -11,3 +11,8 @@ QMAKE_INCREMENTAL_STYLE = sublib
+@@ -12,3 +12,8 @@ QMAKE_INCREMENTAL_STYLE = sublib
include(../common/g++.conf)
include(../common/linux.conf)
load(qt_config)
diff --git a/debian/patches/91_s390_use_gstabs.diff b/debian/patches/91_s390_use_gstabs.diff
index e879bd4..dbb9906 100644
--- a/debian/patches/91_s390_use_gstabs.diff
+++ b/debian/patches/91_s390_use_gstabs.diff
@@ -8,7 +8,7 @@ Forwarded: no
--- a/src/3rdparty/webkit/WebKit.pri
+++ b/src/3rdparty/webkit/WebKit.pri
-@@ -43,6 +43,13 @@ CONFIG(release, debug|release) {
+@@ -47,6 +47,13 @@ CONFIG(release, debug|release) {
DEFINES += NDEBUG
}
@@ -20,5 +20,5 @@ Forwarded: no
+
+
BASE_DIR = $$PWD
- INCLUDEPATH += $$PWD/WebKit/qt/Api
+ INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit
QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter
diff --git a/debian/patches/92_armel_gcc43_valist_compat.diff b/debian/patches/92_armel_gcc43_valist_compat.diff
index acd3e28..0ad00bd 100644
--- a/debian/patches/92_armel_gcc43_valist_compat.diff
+++ b/debian/patches/92_armel_gcc43_valist_compat.diff
@@ -15,7 +15,7 @@ Forward: not-needed
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
-@@ -5289,6 +5289,11 @@ QString &QString::vsprintf(const char* c
+@@ -5425,6 +5425,11 @@ QString &QString::vsprintf(const char* c
return *this;
}
diff --git a/debian/patches/96_webkit_no_gc_sections.diff b/debian/patches/96_webkit_no_gc_sections.diff
index 998b25d..97693a4 100644
--- a/debian/patches/96_webkit_no_gc_sections.diff
+++ b/debian/patches/96_webkit_no_gc_sections.diff
@@ -9,12 +9,12 @@ Last-Update: 2010-04-11 (s390 added)
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
-@@ -63,7 +63,7 @@ unix {
+@@ -80,7 +80,7 @@ unix {
}
unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
-unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
+unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):QMAKE_LFLAGS += -Wl,--gc-sections
+ linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
- CONFIG(release):!CONFIG(QTDIR_build) {
- contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
+ CONFIG(release):!CONFIG(standalone_package) {
diff --git a/debian/patches/series b/debian/patches/series
index 6599108..a3686e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,10 @@
# upstream patches
-0001_qpixmap_load_no_modify_referenced_copies.diff
-0002_qmake_qfileinfo_absolutepath.diff
-0003_s390_fix_atomic_ops_related_crashes.diff
-0004_problem_displaying_half_width_character.diff
-0005_always_redraw_the_complete_control.diff
-0006_expand_indicator_would_not_be_displayed.diff
+# 0001_qpixmap_load_no_modify_referenced_copies.diff - stolen upstream
+# 0002_qmake_qfileinfo_absolutepath.diff - stolen upstream
+# 0003_s390_fix_atomic_ops_related_crashes.diff - stolen upstream
+# 0004_problem_displaying_half_width_character.diff - stolen upstream
+# 0005_always_redraw_the_complete_control.diff - stolen upstream
+# 0006_expand_indicator_would_not_be_displayed.diff - stolen upstream
# qt-copy patches
0180-window-role.diff
@@ -40,11 +40,11 @@
71_hppa_unaligned_access_fix_458133.diff
80_hurd_max_path.diff
81_hurd_architecture.diff
-82_hurd_SA_SIGINFO.diff
+# 82_hurd_SA_SIGINFO.diff - merged upstream
89_powerpc_opts.diff
91_s390_use_gstabs.diff
92_armel_gcc43_valist_compat.diff
-95_sparc_platform_definition.diff
+# 95_sparc_platform_definition.diff - merged upstream
96_webkit_no_gc_sections.diff
97_alpha_ftbfs_qatomic_alpha_h_types.diff
-98_alpha_ftbfs_wtf_platform_support.diff
+# 98_alpha_ftbfs_wtf_platform_support.diff - stolen upstream
--
Qt 4 Debian packaging
More information about the pkg-kde-commits
mailing list