[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.0-beta1-1-5-g04b0868
Fathi Boudra
fabo at alioth.debian.org
Tue Nov 17 12:27:40 UTC 2009
The following commit has been merged in the experimental-snapshots branch:
commit 5f68306e9f2391dd45a3cdb5056c2c30fab50622
Author: Fathi Boudra <fabo at debian.org>
Date: Tue Nov 17 13:25:18 2009 +0100
Referesh patches
---
debian/patches/0180-window-role.diff | 8 ++++----
debian/patches/0195-compositing-properties.diff | 6 +++---
debian/patches/01_qmake_for_debian.diff | 2 +-
debian/patches/0216-allow-isystem-for-headers.diff | 4 ++--
debian/patches/05_append_qt4_target.diff | 16 ++++++++--------
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 +-
.../patches/16_hide_std_symbols_on_qtwebkit.diff | 2 +-
.../18_enable_qt3support_qtwebkit_debug_info.diff | 2 +-
debian/patches/30_webkit_unaligned_access.diff | 8 ++++----
debian/patches/40_alpha_ice.diff | 2 +-
debian/patches/41_disable_opengl_visibility.diff | 2 +-
debian/patches/91_s390_-gstabs.diff | 2 +-
14 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/debian/patches/0180-window-role.diff b/debian/patches/0180-window-role.diff
index df6352b..355c21d 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
-@@ -1122,8 +1122,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
-@@ -601,6 +601,7 @@ public:
+@@ -655,6 +655,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
-@@ -816,13 +816,17 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -820,13 +820,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
-@@ -2893,6 +2897,17 @@ void QWidgetPrivate::setWindowRole()
+@@ -2914,6 +2918,17 @@ void QWidgetPrivate::setWindowRole()
(unsigned char *)windowRole.constData(), windowRole.length());
}
diff --git a/debian/patches/0195-compositing-properties.diff b/debian/patches/0195-compositing-properties.diff
index e69b2f4..09b2f91 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
-@@ -754,6 +754,11 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -758,6 +758,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();
-@@ -807,13 +812,21 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -811,13 +816,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;
-@@ -833,10 +846,6 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -837,10 +850,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 618354b..d754554 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
-@@ -29,8 +29,8 @@ QMAKE_LIBS_OPENGL_QT = -lGL
+@@ -38,8 +38,8 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
QMAKE_LIBS_OPENVG = -lOpenVG
QMAKE_LIBS_THREAD = -lpthread
diff --git a/debian/patches/0216-allow-isystem-for-headers.diff b/debian/patches/0216-allow-isystem-for-headers.diff
index 7b97ad2..2f0c21a 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
-@@ -1020,6 +1020,11 @@ while [ "$#" -gt 0 ]; do
+@@ -1022,6 +1022,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
-@@ -2017,6 +2022,9 @@ while [ "$#" -gt 0 ]; do
+@@ -2030,6 +2035,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 35c3549..9c48028 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
-@@ -4204,7 +4204,7 @@ END {
+@@ -4258,7 +4258,7 @@ END {
}
# build qmake
@@ -66,7 +66,7 @@ author: Fathi Boudra <fabo at debian.org>
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
-@@ -7080,8 +7080,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -7153,8 +7153,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
-@@ -7464,11 +7464,11 @@ EXEC=""
+@@ -7538,11 +7538,11 @@ EXEC=""
#-------------------------------------------------------------------------------
echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@ author: Fathi Boudra <fabo at debian.org>
fi
# .projects -> projects to process
-@@ -7642,7 +7642,7 @@ for file in .projects .projects.3; do
+@@ -7717,7 +7717,7 @@ for file in .projects .projects.3; do
echo " for $a\c"
fi
@@ -180,8 +180,8 @@ author: Fathi Boudra <fabo at debian.org>
-TARGET = assistant
+TARGET = assistant-qt4
- DEFINES += QT_CLUCENE_SUPPORT
-
+ contains(QT_CONFIG, webkit) {
+ QT += webkit
--- a/tools/designer/src/designer/designer.pro
+++ b/tools/designer/src/designer/designer.pro
@@ -25,7 +25,7 @@ contains(CONFIG, static) {
@@ -217,8 +217,8 @@ author: Fathi Boudra <fabo at debian.org>
target.path=$$[QT_INSTALL_BINS]
--- a/translations/translations.pri
+++ b/translations/translations.pri
-@@ -16,8 +16,8 @@ WIN {
- }
+@@ -13,8 +13,8 @@ defineReplace(fixPath) {
+ return ($$1)
}
-LUPDATE = $$fixPath($$QT_BUILD_TREE/bin/lupdate) -locations relative -no-ui-lines
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index d148b97..9305dad 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
-@@ -7520,7 +7520,7 @@ fi
+@@ -7594,7 +7594,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 f56f44a..f945dfd 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
-@@ -643,6 +643,8 @@ mkdir -p "$outpath/config.tests"
+@@ -644,6 +644,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 438cc4a..be98e1b 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
-@@ -644,6 +644,7 @@ rm -f "$outpath/config.tests/.qmake.cach
+@@ -645,6 +645,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/16_hide_std_symbols_on_qtwebkit.diff b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
index e8e2063..484b57e 100644
--- a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
+++ b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
@@ -1,6 +1,6 @@
--- a/src/3rdparty/webkit/WebKit.pri
+++ b/src/3rdparty/webkit/WebKit.pri
-@@ -38,6 +38,7 @@ CONFIG(release, debug|release) {
+@@ -45,6 +45,7 @@ CONFIG(release, debug|release) {
BASE_DIR = $$PWD
INCLUDEPATH += $$PWD/WebKit/qt/Api
diff --git a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
index 5a9cc12..c0e1c4f 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
-@@ -3320,8 +3320,6 @@ HEADERS += $$WEBKIT_API_HEADERS
+@@ -3360,8 +3360,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/30_webkit_unaligned_access.diff b/debian/patches/30_webkit_unaligned_access.diff
index ab04517..e7c5d8b 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
-@@ -2255,13 +2255,13 @@ static TCMalloc_Central_FreeListPadded c
+@@ -2259,13 +2259,13 @@ static TCMalloc_Central_FreeListPadded c
// Page-level allocator
static SpinLock pageheap_lock = SPINLOCK_INITIALIZER;
@@ -64,8 +64,8 @@ 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
-@@ -318,6 +318,23 @@
- # endif
+@@ -376,6 +376,23 @@
+ # include <ce_time.h>
#endif
+/* PLATFORM(SPARC) */
@@ -90,7 +90,7 @@ a real problem yet.
/* COMPILER(MSVC) */
--- a/src/3rdparty/webkit/WebCore/platform/text/AtomicString.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/text/AtomicString.cpp
-@@ -101,7 +101,7 @@ static inline bool equal(StringImpl* str
+@@ -103,7 +103,7 @@ static inline bool equal(StringImpl* str
if (string->length() != length)
return false;
diff --git a/debian/patches/40_alpha_ice.diff b/debian/patches/40_alpha_ice.diff
index c19315d..6915b2d 100644
--- a/debian/patches/40_alpha_ice.diff
+++ b/debian/patches/40_alpha_ice.diff
@@ -30,7 +30,7 @@
{
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
-@@ -510,7 +510,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de
+@@ -520,7 +520,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 c32115e..4d8ef04 100644
--- a/debian/patches/41_disable_opengl_visibility.diff
+++ b/debian/patches/41_disable_opengl_visibility.diff
@@ -2,7 +2,7 @@ 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
-@@ -42,6 +42,7 @@ SOURCES += qgl.cpp \
+@@ -35,6 +35,7 @@ SOURCES += qgl.cpp \
qglextensions.cpp \
qglpaintdevice.cpp \
diff --git a/debian/patches/91_s390_-gstabs.diff b/debian/patches/91_s390_-gstabs.diff
index d7b2928..91e2d1f 100644
--- a/debian/patches/91_s390_-gstabs.diff
+++ b/debian/patches/91_s390_-gstabs.diff
@@ -8,7 +8,7 @@ Debian bug 528485
--- a/src/3rdparty/webkit/WebKit.pri
+++ b/src/3rdparty/webkit/WebKit.pri
-@@ -36,6 +36,14 @@ CONFIG(release, debug|release) {
+@@ -43,6 +43,14 @@ CONFIG(release, debug|release) {
DEFINES += NDEBUG
}
--
Qt 4 Debian packaging
More information about the pkg-kde-commits
mailing list