[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728
Fathi Boudra
fabo at alioth.debian.org
Sat Jun 11 11:42:47 UTC 2011
The following commit has been merged in the experimental-snapshots branch:
commit f66baf962df6686e7d7d193f886061db43afe81c
Author: Fathi Boudra <fabo at debian.org>
Date: Fri Mar 4 09:56:56 2011 +0200
Remove patches included in Qt 4.7.2
---
debian/changelog | 5 +
.../0001_backport_e3f1268_alsa_buffer_overrun.diff | 86 --------------------
...port_6ae84f1_fix_QTextEdit_selectAll_crash.diff | 27 ------
debian/patches/22_use___GLIBC__.diff | 35 --------
debian/patches/series | 3 -
5 files changed, 5 insertions(+), 151 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 42dfb19..1d53a30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,11 @@ qt4-x11 (4:4.7.2-1) UNRELEASED; urgency=low
[ Fathi Boudra ]
* Update installed files.
+ * Remove patches:
+ - 0001_backport_e3f1268_alsa_buffer_overrun.diff - stolen upstream.
+ - 0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff - stolen
+ upstream.
+ - 22_use___GLIBC__.diff - merged upstream.
-- Fathi Boudra <fabo at debian.org> Thu, 03 Mar 2011 20:58:36 +0200
diff --git a/debian/patches/0001_backport_e3f1268_alsa_buffer_overrun.diff b/debian/patches/0001_backport_e3f1268_alsa_buffer_overrun.diff
deleted file mode 100644
index 1fcdddf..0000000
--- a/debian/patches/0001_backport_e3f1268_alsa_buffer_overrun.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-From: Andrew den Exter <andrew.den-exter at nokia.com>
-Date: Tue, 9 Nov 2010 16:30:32 +1000
-Subject: [PATCH] Fix potential buffer overrun in ALSA QAudioInput implementation.
-Origin: backport commit:e3f1268e63064a54215051cf91d5f6b8c8bd4f0f
-Forwarded: yes
-Bug: http://bugreports.qt.nokia.com/browse/QTBUG-14549
-Bug: http://bugreports.qt.nokia.com/browse/QTBUG-8578
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=603052
-Applied-Upstream: yes
-Reviewed-by: Derick Hawcroft
-Last-Update: 2010-12-05
-
-Don't write more than the supplied max buffer size to the output buffer.
-
-Task-number: QTBUG-14549 QTBUG-8578
-Reviewed-by: Derick Hawcroft
----
- src/multimedia/audio/qaudioinput_alsa_p.cpp | 21 ++++++++++++---------
- 1 files changed, 12 insertions(+), 9 deletions(-)
-
---- a/src/multimedia/audio/qaudioinput_alsa_p.cpp
-+++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp
-@@ -464,19 +464,18 @@ int QAudioInputPrivate::bytesReady() con
-
- qint64 QAudioInputPrivate::read(char* data, qint64 len)
- {
-- Q_UNUSED(len)
--
- // Read in some audio data and write it to QIODevice, pull mode
- if ( !handle )
- return 0;
-
-- bytesAvailable = checkBytesReady();
-+ // bytesAvaiable is saved as a side effect of checkBytesReady().
-+ int bytesToRead = checkBytesReady();
-
-- if (bytesAvailable < 0) {
-+ if (bytesToRead < 0) {
- // bytesAvailable as negative is error code, try to recover from it.
-- xrun_recovery(bytesAvailable);
-- bytesAvailable = checkBytesReady();
-- if (bytesAvailable < 0) {
-+ xrun_recovery(bytesToRead);
-+ bytesToRead = checkBytesReady();
-+ if (bytesToRead < 0) {
- // recovery failed must stop and set error.
- close();
- errorState = QAudio::IOError;
-@@ -486,9 +485,11 @@ qint64 QAudioInputPrivate::read(char* da
- }
- }
-
-+ bytesToRead = qMin<qint64>(len, bytesToRead);
-+ bytesToRead -= bytesToRead % period_size;
- int count=0, err = 0;
- while(count < 5) {
-- int chunks = bytesAvailable/period_size;
-+ int chunks = bytesToRead/period_size;
- int frames = chunks*period_frames;
- if(frames > (int)buffer_frames)
- frames = buffer_frames;
-@@ -536,6 +537,7 @@ qint64 QAudioInputPrivate::read(char* da
- emit stateChanged(deviceState);
- }
- } else {
-+ bytesAvailable -= err;
- totalTimeValue += err;
- resuming = false;
- if (deviceState != QAudio::ActiveState) {
-@@ -548,6 +550,7 @@ qint64 QAudioInputPrivate::read(char* da
-
- } else {
- memcpy(data,audioBuffer,err);
-+ bytesAvailable -= err;
- totalTimeValue += err;
- resuming = false;
- if (deviceState != QAudio::ActiveState) {
-@@ -643,7 +646,7 @@ bool QAudioInputPrivate::deviceReady()
- {
- if(pullMode) {
- // reads some audio data and writes it to QIODevice
-- read(0,0);
-+ read(0, buffer_size);
- } else {
- // emits readyRead() so user will call read() on QIODevice to get some audio data
- InputPrivate* a = qobject_cast<InputPrivate*>(audioSource);
diff --git a/debian/patches/0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff b/debian/patches/0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff
deleted file mode 100644
index 0868781..0000000
--- a/debian/patches/0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6ae84f1183e91c910ca92a55e37f8254ace805c0 Mon Sep 17 00:00:00 2001
-From: Jiang Jiang <jiang.jiang at nokia.com>
-Date: Mon, 6 Dec 2010 13:07:36 +0100
-Subject: [PATCH] Fix QTextEdit::selectAll crash from textChanged()
-
-Doing selectAll() after the entire block of text has been removed
-will cause this crash, because we didn't check if the block we
-found is valid or not.
-
-Task-number: QTBUG-15857
-Reviewed-by: Eskil
----
- src/gui/text/qtextcursor.cpp | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
---- a/src/gui/text/qtextcursor.cpp
-+++ b/src/gui/text/qtextcursor.cpp
-@@ -366,6 +366,9 @@ bool QTextCursorPrivate::movePosition(QT
- if (!blockIt.isValid())
- return false;
-
-+ if (!blockIt.isValid())
-+ return false;
-+
- if (op >= QTextCursor::Left && op <= QTextCursor::WordRight
- && blockIt.textDirection() == Qt::RightToLeft) {
- if (op == QTextCursor::Left)
diff --git a/debian/patches/22_use___GLIBC__.diff b/debian/patches/22_use___GLIBC__.diff
deleted file mode 100644
index d6f1f06..0000000
--- a/debian/patches/22_use___GLIBC__.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Author: Pino Toscano <pino at kde.org>
-Description: Use GLIBC functions on any GLIBC architecture.
- Make use of __GLIBC__ instead of Q_OS_LINUX for functions available globally
- in GNU libc, not just on Linux.
-Last-Update: 2010-10-02
-
---- a/src/corelib/tools/qlocale.cpp
-+++ b/src/corelib/tools/qlocale.cpp
-@@ -77,7 +77,7 @@ QT_END_NAMESPACE
- #include <qdebug.h>
- #include <time.h>
-
--#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- # include <fenv.h>
- #endif
-
-@@ -6637,7 +6637,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
- _control87(MCW_EM, MCW_EM);
- #endif
-
--#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- fenv_t envp;
- feholdexcept(&envp);
- #endif
-@@ -6653,7 +6653,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
- #endif //_M_X64
- #endif //Q_OS_WIN
-
--#if defined(Q_OS_LINUX) && !defined(__UCLIBC__)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- fesetenv(&envp);
- #endif
-
diff --git a/debian/patches/series b/debian/patches/series
index 722b9ef..66060e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
# upstream patches
-0001_backport_e3f1268_alsa_buffer_overrun.diff
-0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff
# qt-copy patches
0195-compositing-properties.diff
@@ -20,7 +18,6 @@
18_enable_qt3support_qtwebkit_debug_info.diff
20_install_qvfb.diff
21_qt_ia32_library_path.diff
-22_use___GLIBC__.diff
23_permit_plugins_built_with_future_qt.diff
30_webkit_unaligned_access.diff
40_alpha_ice.diff
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list