[neon/forks/pyqt5/Neon/release-lts] debian: Drop qtspeech_5.14.diff, not needed since we upgraded to Qt 5.15.

Dmitry Shachnev null at kde.org
Wed May 26 11:29:29 BST 2021


Git commit 31f81d2e2537ee6062989c634c139462f060c947 by Dmitry Shachnev.
Committed on 27/11/2020 at 11:36.
Pushed by jriddell into branch 'Neon/release-lts'.

Drop qtspeech_5.14.diff, not needed since we upgraded to Qt 5.15.

M  +1    -0    debian/changelog
D  +0    -36   debian/patches/qtspeech_5.14.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/forks/pyqt5/commit/31f81d2e2537ee6062989c634c139462f060c947

diff --git a/debian/changelog b/debian/changelog
index 6e2cc2c9..e007204e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 pyqt5 (5.15.1+dfsg-3) UNRELEASED; urgency=medium
 
   * Break calibre < 5.0 (see #970921).
+  * Drop qtspeech_5.14.diff, not needed since we upgraded to Qt 5.15.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 25 Sep 2020 21:40:19 +0300
 
diff --git a/debian/patches/qtspeech_5.14.diff b/debian/patches/qtspeech_5.14.diff
deleted file mode 100644
index 77abfbe0..00000000
--- a/debian/patches/qtspeech_5.14.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Dmitry Shachnev <mitya57 at debian.org>
-Date: Sat, 19 Sep 2020 15:38:41 +0300
-Subject: Do not require Qt 5.15 for QtTextToSpeech module
-
-The public API has not changed between 5.14 and 5.15.
----
- sip/QtTextToSpeech/qtexttospeech.sip | 2 +-
- sip/QtTextToSpeech/qvoice.sip        | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sip/QtTextToSpeech/qtexttospeech.sip b/sip/QtTextToSpeech/qtexttospeech.sip
-index 729996e..5b0fb3e 100644
---- a/sip/QtTextToSpeech/qtexttospeech.sip
-+++ b/sip/QtTextToSpeech/qtexttospeech.sip
-@@ -20,7 +20,7 @@
- // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- 
- 
--%If (Qt_5_15_0 -)
-+%If (Qt_5_14_0 -)
- 
- class QTextToSpeech : QObject
- {
-diff --git a/sip/QtTextToSpeech/qvoice.sip b/sip/QtTextToSpeech/qvoice.sip
-index e5416ff..14025be 100644
---- a/sip/QtTextToSpeech/qvoice.sip
-+++ b/sip/QtTextToSpeech/qvoice.sip
-@@ -20,7 +20,7 @@
- // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- 
- 
--%If (Qt_5_15_0 -)
-+%If (Qt_5_14_0 -)
- 
- class QVoice
- {
diff --git a/debian/patches/series b/debian/patches/series
index e686dc4d..571798e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 hashable_signals.diff
-qtspeech_5.14.diff



More information about the Neon-commits mailing list