diff mbox

[v6,9/9] package/python-pyqt5: add patch to fix build with Qt 5.8.0

Message ID 1485849551-20469-10-git-send-email-mr.zoltan.gyarmati@gmail.com
State Accepted
Headers show

Commit Message

Zoltan Gyarmati Jan. 31, 2017, 7:59 a.m. UTC 
Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
---
 ...owOkButtonHint-and-WindowCancelButtonHint.patch | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch

Comments

Arnout Vandecappelle Feb. 2, 2017, 11:15 p.m. UTC | #1 
On 31-01-17 08:59, Zoltan Gyarmati wrote:
> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
> ---
>  ...owOkButtonHint-and-WindowCancelButtonHint.patch | 27 ++++++++++++++++++++++

 This is potentially problematic. What if Qt 5.6 is used?

 Probably it's not a big issue, it just means you can't use these two classes
anymore in python, which is probably OK.

 Regards,
 Arnout

>  1 file changed, 27 insertions(+)
>  create mode 100644 package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch
> 
> diff --git a/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch b/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch
> new file mode 100644
> index 0000000..146cce0
> --- /dev/null
> +++ b/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch
> @@ -0,0 +1,27 @@
> +From bb7cbdede46f72468bbb1b9bbefd43a1dbad21c0 Mon Sep 17 00:00:00 2001
> +From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
> +Date: Mon, 30 Jan 2017 18:28:15 +0100
> +Subject: [PATCH] remove WindowOkButtonHint and WindowCancelButtonHint from
> + qnamespace.sip as they are removed from qt5.8
> +
> +Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
> +---
> + sip/QtCore/qnamespace.sip | 2 --
> + 1 file changed, 2 deletions(-)
> +
> +diff --git a/sip/QtCore/qnamespace.sip b/sip/QtCore/qnamespace.sip
> +index 2db83b7..559f410 100644
> +--- a/sip/QtCore/qnamespace.sip
> ++++ b/sip/QtCore/qnamespace.sip
> +@@ -209,8 +209,6 @@ namespace Qt
> +         WindowContextHelpButtonHint,
> +         WindowShadeButtonHint,
> +         WindowStaysOnTopHint,
> +-        WindowOkButtonHint,
> +-        WindowCancelButtonHint,
> +         WindowStaysOnBottomHint,
> +         WindowCloseButtonHint,
> +         MacWindowToolBarButtonHint,
> +-- 
> +2.7.4
> +
>
Zoltan Gyarmati Feb. 6, 2017, 8:57 a.m. UTC | #2 
Dear Arnout, Peter, Thomas,


ok, thanks for the feedbacks, I'll tailor together a new version in the
upcoming days,


regards

Zoltan Gyarmati
https://zgyarmati.de

On 02/03/2017 12:15 AM, Arnout Vandecappelle wrote:
>
> On 31-01-17 08:59, Zoltan Gyarmati wrote:
>> Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
>> ---
>>  ...owOkButtonHint-and-WindowCancelButtonHint.patch | 27 ++++++++++++++++++++++
>  This is potentially problematic. What if Qt 5.6 is used?
>
>  Probably it's not a big issue, it just means you can't use these two classes
> anymore in python, which is probably OK.
>
>  Regards,
>  Arnout
>
>>  1 file changed, 27 insertions(+)
>>  create mode 100644 package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch
>>
>> diff --git a/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch b/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch
>> new file mode 100644
>> index 0000000..146cce0
>> --- /dev/null
>> +++ b/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch
>> @@ -0,0 +1,27 @@
>> +From bb7cbdede46f72468bbb1b9bbefd43a1dbad21c0 Mon Sep 17 00:00:00 2001
>> +From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
>> +Date: Mon, 30 Jan 2017 18:28:15 +0100
>> +Subject: [PATCH] remove WindowOkButtonHint and WindowCancelButtonHint from
>> + qnamespace.sip as they are removed from qt5.8
>> +
>> +Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
>> +---
>> + sip/QtCore/qnamespace.sip | 2 --
>> + 1 file changed, 2 deletions(-)
>> +
>> +diff --git a/sip/QtCore/qnamespace.sip b/sip/QtCore/qnamespace.sip
>> +index 2db83b7..559f410 100644
>> +--- a/sip/QtCore/qnamespace.sip
>> ++++ b/sip/QtCore/qnamespace.sip
>> +@@ -209,8 +209,6 @@ namespace Qt
>> +         WindowContextHelpButtonHint,
>> +         WindowShadeButtonHint,
>> +         WindowStaysOnTopHint,
>> +-        WindowOkButtonHint,
>> +-        WindowCancelButtonHint,
>> +         WindowStaysOnBottomHint,
>> +         WindowCloseButtonHint,
>> +         MacWindowToolBarButtonHint,
>> +-- 
>> +2.7.4
>> +
>>
Arnout Vandecappelle Feb. 6, 2017, 1:28 p.m. UTC | #3 
On 06-02-17 09:57, Zoltan Gyarmati wrote:
> Dear Arnout, Peter, Thomas,
> 
> 
> ok, thanks for the feedbacks, I'll tailor together a new version in the
> upcoming days,

 Thomas is going to apply it now during the BR developer days, so there is no
need to resend the series. If there is any patch from the series that is still
problematic, Thomas will say so.

 Regards,
 Arnout
diff mbox

Patch

diff --git a/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch b/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch
new file mode 100644
index 0000000..146cce0
--- /dev/null
+++ b/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch
@@ -0,0 +1,27 @@ 
+From bb7cbdede46f72468bbb1b9bbefd43a1dbad21c0 Mon Sep 17 00:00:00 2001
+From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
+Date: Mon, 30 Jan 2017 18:28:15 +0100
+Subject: [PATCH] remove WindowOkButtonHint and WindowCancelButtonHint from
+ qnamespace.sip as they are removed from qt5.8
+
+Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
+---
+ sip/QtCore/qnamespace.sip | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/sip/QtCore/qnamespace.sip b/sip/QtCore/qnamespace.sip
+index 2db83b7..559f410 100644
+--- a/sip/QtCore/qnamespace.sip
++++ b/sip/QtCore/qnamespace.sip
+@@ -209,8 +209,6 @@ namespace Qt
+         WindowContextHelpButtonHint,
+         WindowShadeButtonHint,
+         WindowStaysOnTopHint,
+-        WindowOkButtonHint,
+-        WindowCancelButtonHint,
+         WindowStaysOnBottomHint,
+         WindowCloseButtonHint,
+         MacWindowToolBarButtonHint,
+-- 
+2.7.4
+