From debdd19cdcc670b99c3fa17cf1e433f1caeebdc3 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 1 Jul 2021 16:42:49 +0200 Subject: [PATCH] spns #24481 : enforce sipSetBool definition - ensures GUI compilation --- products/patches/sip-5.5.0-sipSetBool.patch | 30 +++++++++++++++++++++ products/sip.pyconf | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 products/patches/sip-5.5.0-sipSetBool.patch diff --git a/products/patches/sip-5.5.0-sipSetBool.patch b/products/patches/sip-5.5.0-sipSetBool.patch new file mode 100644 index 0000000..08dfbee --- /dev/null +++ b/products/patches/sip-5.5.0-sipSetBool.patch @@ -0,0 +1,30 @@ +diff -Naur sip-5.5.0-PyQt5_sip-12.8.1_ref/sip-5.5.0/sipbuild/module/source/12.7/sipint.h sip-5.5.0-PyQt5_sip-12.8.1_new/sip-5.5.0/sipbuild/module/source/12.7/sipint.h +--- sip-5.5.0-PyQt5_sip-12.8.1_ref/sip-5.5.0/sipbuild/module/source/12.7/sipint.h 2020-11-23 14:21:33.000000000 +0100 ++++ sip-5.5.0-PyQt5_sip-12.8.1_new/sip-5.5.0/sipbuild/module/source/12.7/sipint.h 2021-07-01 15:42:35.397922670 +0200 +@@ -177,9 +177,9 @@ + void sipOMAddObject(sipObjectMap *om, sipSimpleWrapper *val); + int sipOMRemoveObject(sipObjectMap *om, sipSimpleWrapper *val); + +-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L ++//#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + #define sipSetBool(p, v) (*(_Bool *)(p) = (v)) +-#endif ++//#endif + + + #ifdef __cplusplus +diff -Naur sip-5.5.0-PyQt5_sip-12.8.1_ref/sip-5.5.0/sipbuild/module/source/12.8/sipint.h sip-5.5.0-PyQt5_sip-12.8.1_new/sip-5.5.0/sipbuild/module/source/12.8/sipint.h +--- sip-5.5.0-PyQt5_sip-12.8.1_ref/sip-5.5.0/sipbuild/module/source/12.8/sipint.h 2020-11-23 14:21:33.000000000 +0100 ++++ sip-5.5.0-PyQt5_sip-12.8.1_new/sip-5.5.0/sipbuild/module/source/12.8/sipint.h 2021-07-01 15:42:19.981784592 +0200 +@@ -177,9 +177,9 @@ + void sipOMAddObject(sipObjectMap *om, sipSimpleWrapper *val); + int sipOMRemoveObject(sipObjectMap *om, sipSimpleWrapper *val); + +-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L ++//#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + #define sipSetBool(p, v) (*(_Bool *)(p) = (v)) +-#endif ++//#endif + + + #ifdef __cplusplus diff --git a/products/sip.pyconf b/products/sip.pyconf index 58c058a..c489f25 100644 --- a/products/sip.pyconf +++ b/products/sip.pyconf @@ -4,6 +4,7 @@ default : build_source : "script" compil_script : $name + $VARS.scriptExtension get_source : "archive" + patches : [] system_info : { rpm : [] @@ -29,6 +30,7 @@ version_5_5_0 : { compil_script : 'sip-5.5.0' + $VARS.scriptExtension archive_info : {archive_name : "sip-5.5.0-PyQt5_sip-12.8.1.tar.gz"} + patches : ['sip-5.5.0-sipSetBool.patch'] } version_4_19_24 : -- 2.39.2