rev 13742 - in branches/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Wed Feb 4 09:10:29 UTC 2009
Author: fabo
Date: 2009-02-04 09:10:27 +0000 (Wed, 04 Feb 2009)
New Revision: 13742
Added:
branches/qt4-x11/debian/TODO.Debian
branches/qt4-x11/debian/patches/19_install_qdoc3.diff
Modified:
branches/qt4-x11/debian/changelog
branches/qt4-x11/debian/patches/0180-window-role.diff
branches/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff
branches/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
branches/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff
branches/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff
branches/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff
branches/qt4-x11/debian/patches/0257-qurl-validate-speedup.diff
branches/qt4-x11/debian/patches/04_launch_uic-qt4.diff
branches/qt4-x11/debian/patches/05_append_qt4_target.diff
branches/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
branches/qt4-x11/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
branches/qt4-x11/debian/patches/series
branches/qt4-x11/debian/qt4-dev-tools.install
Log:
Refresh patches.
Add qdoc3 (used to generate qt-creator documentation).
Move TODO entry to TODO.Debian.
Added: branches/qt4-x11/debian/TODO.Debian
===================================================================
--- branches/qt4-x11/debian/TODO.Debian (rev 0)
+++ branches/qt4-x11/debian/TODO.Debian 2009-02-04 09:10:27 UTC (rev 13742)
@@ -0,0 +1,15 @@
+ +++ TODO:
+
+ * Review bug reports.
+ * Update debian/copyright.
+ * Use pkgkde-symbolshelper. Add pkg-kde-tools (>= 0.3.1) b-d.
+ * Merge Ubuntu changes ? (IMHO, no)
+ - Fix binary-post-install/libqt4-dev:: to install qt.tags to libqt4-dev
+ - Add missing depends to libqt4-dev based on Qt build dependencies
+ * what to do with phonon and webkit ?
+ - webkit links against phonon.
+ * TT changed the build key generation and added backwards compatibility.
+ We need to re-add 07_trust_dpkg-arch_over_uname-m.diff patch for our
+ backward compatibility *and* figure out what to do with the new build key
+ generation.
+
Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog 2009-02-03 21:49:21 UTC (rev 13741)
+++ branches/qt4-x11/debian/changelog 2009-02-04 09:10:27 UTC (rev 13742)
@@ -1,4 +1,4 @@
-qt4-x11 (4.5.0~beta1+snapshot20090117-1) UNRELEASED; urgency=low
+qt4-x11 (4.5.0~rc1-1) UNRELEASED; urgency=low
* New upstream release:
- QGtkStyle is part of Qt 4.5 release. (Closes: #507143)
@@ -10,6 +10,7 @@
* Build documentations if current version is a snapshot.
* Update *.install and *.lintian files.
* Move mkspecs in qt4-qmake package to use qt4-qmake standalone.
+ * Add qdoc3 to qt4-dev-tools package.
* Add Debian patches:
- 18_enable_qt3support_qtwebkit_debug_info.diff
On Qt >= 4.5, debug info are disabled for Qt3Support and QtWebkit.
@@ -37,23 +38,8 @@
* Refresh qt-copy patches:
0180, 0195, 0209, 0216, 0225, 0226, 0234, 0245, 0255, 0257.
- +++ TODO:
+ -- Fathi Boudra <fabo at debian.org> Wed, 04 Feb 2009 10:08:05 +0100
- * Review bug reports.
- * Update debian/copyright.
- * Use pkgkde-symbolshelper. Add pkg-kde-tools (>= 0.3.1) b-d.
- * Merge Ubuntu changes ? (IMHO, no)
- - Fix binary-post-install/libqt4-dev:: to install qt.tags to libqt4-dev
- - Add missing depends to libqt4-dev based on Qt build dependencies
- * what to do with phonon and webkit ?
- - webkit links against phonon.
- * TT changed the build key generation and added backwards compatibility.
- We need to re-add 07_trust_dpkg-arch_over_uname-m.diff patch for our
- backward compatibility *and* figure out what to do with the new build key
- generation.
-
- -- Fathi Boudra <fabo at debian.org> Sat, 10 Jan 2009 19:54:09 +0100
-
qt4-x11 (4.4.3-2) unstable; urgency=low
+++ Changes by Armin Berres:
Modified: branches/qt4-x11/debian/patches/0180-window-role.diff
===================================================================
--- branches/qt4-x11/debian/patches/0180-window-role.diff 2009-02-03 21:49:21 UTC (rev 13741)
+++ branches/qt4-x11/debian/patches/0180-window-role.diff 2009-02-04 09:10:27 UTC (rev 13742)
@@ -14,7 +14,7 @@
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
-@@ -989,9 +989,18 @@ void QObject::setObjectName(const QStrin
+@@ -988,9 +988,18 @@ void QObject::setObjectName(const QStrin
{
Q_D(QObject);
d->objectName = name;
@@ -47,7 +47,7 @@
struct Connection
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
-@@ -353,6 +353,7 @@ public:
+@@ -355,6 +355,7 @@ public:
#if defined(Q_WS_X11)
void setWindowRole();
Modified: branches/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff
===================================================================
--- branches/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff 2009-02-03 21:49:21 UTC (rev 13741)
+++ branches/qt4-x11/debian/patches/0216-allow-isystem-for-headers.diff 2009-02-04 09:10:27 UTC (rev 13742)
@@ -24,7 +24,7 @@
--- a/configure
+++ b/configure
-@@ -848,6 +848,11 @@ while [ "$#" -gt 0 ]; do
+@@ -845,6 +845,11 @@ while [ "$#" -gt 0 ]; do
VAL=`echo $1 | sed 's,-D,,'`
fi
;;
@@ -36,7 +36,7 @@
-I?*|-I)
VAR="add_ipath"
if [ "$1" = "-I" ]; then
-@@ -1807,6 +1812,9 @@ while [ "$#" -gt 0 ]; do
+@@ -1805,6 +1810,9 @@ while [ "$#" -gt 0 ]; do
add_ipath)
I_FLAGS="$I_FLAGS -I\"${VAL}\""
;;
Modified: branches/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
===================================================================
--- branches/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch 2009-02-03 21:49:21 UTC (rev 13741)
+++ branches/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch 2009-02-04 09:10:27 UTC (rev 13742)
@@ -21,7 +21,7 @@
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
-@@ -664,8 +664,8 @@ void QTabBarPrivate::refresh()
+@@ -673,8 +673,8 @@ void QTabBarPrivate::refresh()
layoutTabs();
makeVisible(currentIndex);
q->update();
Modified: branches/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff
===================================================================
--- branches/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff 2009-02-03 21:49:21 UTC (rev 13741)
+++ branches/qt4-x11/debian/patches/0226-qtreeview-column_resize_when_needed.diff 2009-02-04 09:10:27 UTC (rev 13742)
@@ -28,7 +28,7 @@
#endif // QT_NO_TREEVIEW
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
-@@ -238,6 +238,19 @@ void QTreeView::setModel(QAbstractItemMo
+@@ -240,6 +240,19 @@ void QTreeView::setModel(QAbstractItemMo
connect(d->model, SIGNAL(modelAboutToBeReset()), SLOT(_q_modelAboutToBeReset()));
@@ -48,7 +48,7 @@
if (d->sortingEnabled)
sortByColumn(header()->sortIndicatorSection(), header()->sortIndicatorOrder());
}
-@@ -2850,6 +2863,8 @@ void QTreeViewPrivate::expand(int item,
+@@ -2852,6 +2865,8 @@ void QTreeViewPrivate::expand(int item,
}
if (model->canFetchMore(index))
model->fetchMore(index);
@@ -57,7 +57,7 @@
}
void QTreeViewPrivate::collapse(int item, bool emitSignal)
-@@ -2888,6 +2903,8 @@ void QTreeViewPrivate::collapse(int item
+@@ -2890,6 +2905,8 @@ void QTreeViewPrivate::collapse(int item
if (animationsEnabled)
beginAnimatedOperation();
}
@@ -66,7 +66,7 @@
}
void QTreeViewPrivate::prepareAnimatedOperation(int item, AnimatedOperation::Type type)
-@@ -3005,6 +3022,25 @@ void QTreeViewPrivate::_q_modelAboutToBe
+@@ -3030,6 +3047,25 @@ void QTreeViewPrivate::_q_modelAboutToBe
viewItems.clear();
}
Modified: branches/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff
===================================================================
--- branches/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff 2009-02-03 21:49:21 UTC (rev 13741)
+++ branches/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff 2009-02-04 09:10:27 UTC (rev 13742)
@@ -9,7 +9,7 @@
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
-@@ -3332,11 +3332,11 @@ int QApplication::x11ProcessEvent(XEvent
+@@ -3336,11 +3336,11 @@ int QApplication::x11ProcessEvent(XEvent
QSize oldSize(w->size());
w->data->crect.setWidth(DisplayWidth(X11->display, scr));
w->data->crect.setHeight(DisplayHeight(X11->display, scr));
Modified: branches/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff
===================================================================
--- branches/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff 2009-02-03 21:49:21 UTC (rev 13741)
+++ branches/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff 2009-02-04 09:10:27 UTC (rev 13742)
@@ -31,7 +31,7 @@
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
-@@ -3533,7 +3533,7 @@ QList<QPair<int, int> > QTreeViewPrivate
+@@ -3562,7 +3562,7 @@ QList<QPair<int, int> > QTreeViewPrivate
current.first = -2; // -1 is not enough because -1+1 = 0
current.second = -2;
foreach (int logicalColumn, logicalIndexes) {
Modified: branches/qt4-x11/debian/patches/0257-qurl-validate-speedup.diff
===================================================================
--- branches/qt4-x11/debian/patches/0257-qurl-validate-speedup.diff 2009-02-03 21:49:21 UTC (rev 13741)
+++ branches/qt4-x11/debian/patches/0257-qurl-validate-speedup.diff 2009-02-04 09:10:27 UTC (rev 13742)
@@ -10,7 +10,7 @@
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
-@@ -3547,6 +3547,8 @@ void QUrlPrivate::validate() const
+@@ -3551,6 +3551,8 @@ void QUrlPrivate::validate() const
QURL_SETFLAG(that->stateFlags, Validated);
Modified: branches/qt4-x11/debian/patches/04_launch_uic-qt4.diff
===================================================================
--- branches/qt4-x11/debian/patches/04_launch_uic-qt4.diff 2009-02-03 21:49:21 UTC (rev 13741)
+++ branches/qt4-x11/debian/patches/04_launch_uic-qt4.diff 2009-02-04 09:10:27 UTC (rev 13742)
@@ -2,7 +2,7 @@
--- a/tools/designer/src/lib/shared/qdesigner_utils.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp
-@@ -613,7 +613,7 @@ namespace qdesigner_internal
+@@ -663,7 +663,7 @@ namespace qdesigner_internal
binary += QDir::separator();
switch (mode) {
case UIC_GenerateCode:
Modified: branches/qt4-x11/debian/patches/05_append_qt4_target.diff
===================================================================
--- branches/qt4-x11/debian/patches/05_append_qt4_target.diff 2009-02-03 21:49:21 UTC (rev 13741)
+++ branches/qt4-x11/debian/patches/05_append_qt4_target.diff 2009-02-04 09:10:27 UTC (rev 13742)
@@ -57,7 +57,7 @@
if [ "$VERBOSE" = "yes" ]; then
--- a/configure
+++ b/configure
-@@ -3936,7 +3936,7 @@ END {
+@@ -3935,7 +3935,7 @@ END {
}
# build qmake
@@ -66,7 +66,7 @@
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
-@@ -6487,8 +6487,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -6511,8 +6511,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 @@
QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -6838,11 +6838,11 @@ EXEC=""
+@@ -6861,11 +6861,11 @@ EXEC=""
#-------------------------------------------------------------------------------
echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@
fi
# .projects -> projects to process
-@@ -7015,7 +7015,7 @@ for file in .projects .projects.3; do
+@@ -7038,7 +7038,7 @@ for file in .projects .projects.3; do
echo " for $a\c"
fi
Modified: branches/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
===================================================================
--- branches/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff 2009-02-03 21:49:21 UTC (rev 13741)
+++ branches/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff 2009-02-04 09:10:27 UTC (rev 13742)
@@ -5,7 +5,7 @@
--- a/configure
+++ b/configure
-@@ -495,6 +495,8 @@ mkdir -p "$outpath/config.tests"
+@@ -452,6 +452,8 @@ mkdir -p "$outpath/config.tests"
rm -f "$outpath/config.tests/.qmake.cache"
cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
Modified: branches/qt4-x11/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
===================================================================
--- branches/qt4-x11/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff 2009-02-03 21:49:21 UTC (rev 13741)
+++ branches/qt4-x11/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff 2009-02-04 09:10:27 UTC (rev 13742)
@@ -5,7 +5,7 @@
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
-@@ -2031,9 +2031,3 @@ HEADERS += $$WEBKIT_API_HEADERS
+@@ -2030,9 +2030,3 @@ HEADERS += $$WEBKIT_API_HEADERS
}
}
Added: branches/qt4-x11/debian/patches/19_install_qdoc3.diff
===================================================================
--- branches/qt4-x11/debian/patches/19_install_qdoc3.diff (rev 0)
+++ branches/qt4-x11/debian/patches/19_install_qdoc3.diff 2009-02-04 09:10:27 UTC (rev 13742)
@@ -0,0 +1,21 @@
+--- a/tools/qdoc3/qdoc3.pro
++++ b/tools/qdoc3/qdoc3.pro
+@@ -106,3 +106,8 @@ win32 {
+ QT_WINCONFIG = debug
+ }
+ }
++
++TARGET = qdoc3
++target.path = $$[QT_INSTALL_BINS]
++INSTALLS += target
++
+--- a/tools/tools.pro
++++ b/tools/tools.pro
+@@ -13,6 +13,7 @@ no-png {
+ SUBDIRS += designer
+ }
+ SUBDIRS += linguist
++ SUBDIRS += qdoc3
+ wince*: SUBDIRS = qtestlib designer
+ unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
+ win32:!wince*:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt
Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series 2009-02-03 21:49:21 UTC (rev 13741)
+++ branches/qt4-x11/debian/patches/series 2009-02-04 09:10:27 UTC (rev 13742)
@@ -24,6 +24,7 @@
16_hide_std_symbols_on_qtwebkit.diff
17_add_postgresql_8.3_support.diff
18_enable_qt3support_qtwebkit_debug_info.diff
+19_install_qdoc3.diff
30_webkit_unaligned_access.diff
40_alpha_ice.diff
41_disable_opengl_visibility.diff
Modified: branches/qt4-x11/debian/qt4-dev-tools.install
===================================================================
--- branches/qt4-x11/debian/qt4-dev-tools.install 2009-02-03 21:49:21 UTC (rev 13741)
+++ branches/qt4-x11/debian/qt4-dev-tools.install 2009-02-04 09:10:27 UTC (rev 13742)
@@ -5,6 +5,7 @@
usr/bin/pixeltool
usr/bin/qcollectiongenerator
usr/bin/qdbusviewer
+usr/bin/qdoc3
usr/bin/qhelpconverter
usr/bin/qhelpgenerator
usr/bin/xmlpatterns
More information about the pkg-kde-commits
mailing list