[Pkg-owncloud-commits] [owncloud-client] 416/484: Ensure patches apply cleanly, drop patch 14
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Dec 16 00:38:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 127c107094bedddaa89ae6cd780494294c50207f
Author: Daniel Molkentin <danimo at owncloud.com>
Date: Wed Nov 25 11:48:43 2015 +0100
Ensure patches apply cleanly, drop patch 14
---
.../patches/0004-Cocoa-Fix-systray-SVG-icons.patch | 32 ++++++++++++++++++
...ch => 0005-OSX-Fix-disapearing-tray-icon.patch} | 0
...ce-debug-info-with-macx-clang_NOUPSTREAM.patch} | 0
...oad-corruptions-when-server-closes-conne.patch} | 0
...-TlsV1_0OrLater-TlsV1_1OrLater-and-TlsV1_.patch | 38 ----------------------
admin/qt/patches/README.md | 7 ++--
6 files changed, 36 insertions(+), 41 deletions(-)
diff --git a/admin/qt/patches/0004-Cocoa-Fix-systray-SVG-icons.patch b/admin/qt/patches/0004-Cocoa-Fix-systray-SVG-icons.patch
new file mode 100644
index 0000000..011b9a0
--- /dev/null
+++ b/admin/qt/patches/0004-Cocoa-Fix-systray-SVG-icons.patch
@@ -0,0 +1,32 @@
+From 22f3d359350fd65e4bbe2e9420fcc4460e8a590a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig at digia.com>
+Date: Tue, 10 Mar 2015 22:37:39 +0100
+Subject: [PATCH] Cocoa: Fix systray SVG icons.
+
+Regression caused by f3699510.
+
+Task-number: QTBUG-44686
+Change-Id: I546422a67d4da29fac196025b09bddcb45c1b641
+Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov at digia.com>
+---
+ src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+index e449fd3..8a35705 100755
+--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
++++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+@@ -234,6 +234,10 @@ void QCocoaSystemTrayIcon::updateIcon(const QIcon &icon)
+ }
+ }
+
++ // Handle SVG icons, which do not return anything for availableSizes().
++ if (!selectedSize.isValid())
++ selectedSize = icon.actualSize(QSize(maxPixmapHeight, maxPixmapHeight), mode);
++
+ QPixmap pixmap = icon.pixmap(selectedSize, mode);
+
+ // Draw a low-resolution icon if there is not enough pixels for a retina
+--
+1.9.1
+
diff --git a/admin/qt/patches/0004-OSX-Fix-disapearing-tray-icon.patch b/admin/qt/patches/0005-OSX-Fix-disapearing-tray-icon.patch
similarity index 100%
rename from admin/qt/patches/0004-OSX-Fix-disapearing-tray-icon.patch
rename to admin/qt/patches/0005-OSX-Fix-disapearing-tray-icon.patch
diff --git a/admin/qt/patches/0005-Fix-force-debug-info-with-macx-clang_NOUPSTREAM.patch b/admin/qt/patches/0006-Fix-force-debug-info-with-macx-clang_NOUPSTREAM.patch
similarity index 100%
rename from admin/qt/patches/0005-Fix-force-debug-info-with-macx-clang_NOUPSTREAM.patch
rename to admin/qt/patches/0006-Fix-force-debug-info-with-macx-clang_NOUPSTREAM.patch
diff --git a/admin/qt/patches/0006-QNAM-Fix-upload-corruptions-when-server-closes-conne.patch b/admin/qt/patches/0007-QNAM-Fix-upload-corruptions-when-server-closes-conne.patch
similarity index 100%
rename from admin/qt/patches/0006-QNAM-Fix-upload-corruptions-when-server-closes-conne.patch
rename to admin/qt/patches/0007-QNAM-Fix-upload-corruptions-when-server-closes-conne.patch
diff --git a/admin/qt/patches/0014-Fix-SNI-for-TlsV1_0OrLater-TlsV1_1OrLater-and-TlsV1_.patch b/admin/qt/patches/0014-Fix-SNI-for-TlsV1_0OrLater-TlsV1_1OrLater-and-TlsV1_.patch
deleted file mode 100644
index b58bacd..0000000
--- a/admin/qt/patches/0014-Fix-SNI-for-TlsV1_0OrLater-TlsV1_1OrLater-and-TlsV1_.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0d3c8feeeb3c49d01bcfbca63b672e20ab29aa9f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= <aklitzing at gmail.com>
-Date: Thu, 30 Jul 2015 10:08:36 +0200
-Subject: [PATCH] Fix SNI for TlsV1_0OrLater, TlsV1_1OrLater and TlsV1_2OrLater
-
-Since SslV3, SslV2 and UnknownProtocol do not support it we can
-invert the IF clause here.
-
-Change-Id: I42e942337d01f3a8c97885b268bffa568e40d335
-Task-number: QTBUG-47528
-Reviewed-by: Mikkel Krautz <mikkel at krautz.dk>
-Reviewed-by: Richard J. Moore <rich at kde.org>
----
- src/network/ssl/qsslsocket_openssl.cpp | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index 049666b..bc1df81 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -377,12 +377,9 @@ bool QSslSocketBackendPrivate::initSslContext()
- return false;
- }
-
-- if ((configuration.protocol == QSsl::TlsV1SslV3 ||
-- configuration.protocol == QSsl::TlsV1_0 ||
-- configuration.protocol == QSsl::TlsV1_1 ||
-- configuration.protocol == QSsl::TlsV1_2 ||
-- configuration.protocol == QSsl::SecureProtocols ||
-- configuration.protocol == QSsl::AnyProtocol) &&
-+ if (configuration.protocol != QSsl::SslV2 &&
-+ configuration.protocol != QSsl::SslV3 &&
-+ configuration.protocol != QSsl::UnknownProtocol &&
- mode == QSslSocket::SslClientMode && q_SSLeay() >= 0x00090806fL) {
- // Set server hostname on TLS extension. RFC4366 section 3.1 requires it in ACE format.
- QString tlsHostName = verificationPeerName.isEmpty() ? q->peerName() : verificationPeerName;
---
-1.9.1
diff --git a/admin/qt/patches/README.md b/admin/qt/patches/README.md
index f41bcd6..466a6c7 100644
--- a/admin/qt/patches/README.md
+++ b/admin/qt/patches/README.md
@@ -16,9 +16,10 @@ purpose is outlined in each patches' front matter.
* 0003-Fix-crash-if-PAC-script-retrieval-returns-a-null-CFD.patch
### Part of Qt v5.4.2 and later
-* 0004-OSX-Fix-disapearing-tray-icon.patch
+* 0004-Cocoa-Fix-systray-SVG-icons.patch
+* 0005-OSX-Fix-disapearing-tray-icon.patch
(TODO: actual patch slighly differs)
-* 0006-QNAM-Fix-upload-corruptions-when-server-closes-conne.patch
+* 0007-QNAM-Fix-upload-corruptions-when-server-closes-conne.patch
(TODO: Actual patch on build machine spans over two commit but is identical)
### Part of Qt v5.5.1 and later
@@ -35,7 +36,7 @@ purpose is outlined in each patches' front matter.
* 0016-Fix-possible-crash-when-passing-an-invalid-PAC-URL.patch
### Not submitted to be part of any release:
-* 0005-Fix-force-debug-info-with-macx-clang_NOUPSTREAM.patch
+* 0006-Fix-force-debug-info-with-macx-clang_NOUPSTREAM.patch
This is only needed if you intent to harvest debugging symbols
for breakpad.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list