From a7528303134dce43e7325b70ca3a4f4c5a3da742d5b3d6e4ab0167a8ccd5dfa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 4 Jul 2016 14:04:10 +0000 Subject: [PATCH 1/2] Accepting request 406271 from home:frispete:PyQt5 Here's an important fix for this package: Due to deprecation of the timestamp option, the logic is reversed by this patch, resulting in: sip: Deprecation warning: the -T flag is ignored and deprecated on every invocation. (Try it!) As if that weren't enough, the new PyQt5 version makes use of a new sip switch -f, that turns this warning into an error, resulting in a complete operational dysfunctionality. - removed build-compare.diff: it is the default since 4.18 anyway - disable-rpaths.diff refreshed - removed build-compare.diff: it is the default since 4.18 anyway - disable-rpaths.diff refreshed OBS-URL: https://build.opensuse.org/request/show/406271 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt/python-sip?expand=0&rev=136 --- build-compare.diff | 11 ----------- disable-rpaths.diff | 8 +++++--- python-sip.changes | 6 ++++++ python-sip.spec | 5 +---- python3-sip.changes | 6 ++++++ python3-sip.spec | 5 +---- python3-sip.spec.changes | 0 7 files changed, 19 insertions(+), 22 deletions(-) delete mode 100644 build-compare.diff create mode 100644 python3-sip.spec.changes diff --git a/build-compare.diff b/build-compare.diff deleted file mode 100644 index aee2455..0000000 --- a/build-compare.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- sipgen/main.c -+++ sipgen/main.c -@@ -78,7 +78,7 @@ - kwArgs = NoKwArgs; - protHack = FALSE; - docs = FALSE; -- timestamp = TRUE; -+ timestamp = FALSE; - - /* Parse the command line. */ - optnr = 1; diff --git a/disable-rpaths.diff b/disable-rpaths.diff index ff8e9e7..0f262f8 100644 --- a/disable-rpaths.diff +++ b/disable-rpaths.diff @@ -1,6 +1,8 @@ ---- siputils.py -+++ siputils.py -@@ -818,6 +818,7 @@ +Index: b/siputils.py +=================================================================== +--- a/siputils.py ++++ b/siputils.py +@@ -926,6 +926,7 @@ class Makefile: rpaths is the cannonical list of rpaths. """ flags = [] diff --git a/python-sip.changes b/python-sip.changes index f1e4757..a1f7a7e 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 4 05:09:07 UTC 2016 - hpj@urpla.net + +- removed build-compare.diff: it is the default since 4.18 anyway +- disable-rpaths.diff refreshed + ------------------------------------------------------------------- Wed May 11 14:28:39 UTC 2016 - termim@gmail.com diff --git a/python-sip.spec b/python-sip.spec index a9c5336..4487b09 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -27,8 +27,6 @@ Url: http://www.riverbankcomputing.com/software/sip/introa Source0: sip-%{version}.tar.gz # PATCH-FIX-OPENSUSE disable-rpaths.diff -- Disable rpaths Patch0: disable-rpaths.diff -# PATCH-FIX-OPENSUSE build-compare.diff cmorve69@yahoo.es -- Fix build-compare -Patch1: build-compare.diff BuildRequires: c++_compiler BuildRequires: python BuildRequires: python-devel @@ -63,8 +61,7 @@ own sip bindings. %prep %setup -q -n sip-%{version} -%patch0 -%patch1 +%patch0 -p1 %build export CFLAGS="%{optflags}" diff --git a/python3-sip.changes b/python3-sip.changes index 648da94..2b923a3 100644 --- a/python3-sip.changes +++ b/python3-sip.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 4 05:09:07 UTC 2016 - hpj@urpla.net + +- removed build-compare.diff: it is the default since 4.18 anyway +- disable-rpaths.diff refreshed + ------------------------------------------------------------------- Wed May 11 14:30:46 UTC 2016 - termim@gmail.com diff --git a/python3-sip.spec b/python3-sip.spec index 2b31f5b..a775d65 100644 --- a/python3-sip.spec +++ b/python3-sip.spec @@ -30,8 +30,6 @@ Url: http://www.riverbankcomputing.com/software/sip/intro Source0: sip-%{version}.tar.gz # PATCH-FIX-OPENSUSE disable-rpaths.diff -- Disable rpaths Patch0: disable-rpaths.diff -# PATCH-FIX-OPENSUSE build-compare.diff cmorve69@yahoo.es -- Fix build-compare -Patch1: build-compare.diff BuildRequires: c++_compiler BuildRequires: python3-devel Requires(pre): python3 @@ -66,8 +64,7 @@ own sip bindings. %prep %setup -q -n sip-%{version} -%patch0 -%patch1 +%patch0 -p1 %build export CFLAGS="%{optflags}" diff --git a/python3-sip.spec.changes b/python3-sip.spec.changes new file mode 100644 index 0000000..473a0f4 From f0e5528994fe7502d8460e0576890ddb69371fe3f55ce89b5f858a1b12c3ad5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 4 Jul 2016 14:17:40 +0000 Subject: [PATCH 2/2] - OBS-URL: https://build.opensuse.org/package/show/KDE:Qt/python-sip?expand=0&rev=137 --- python3-sip.spec.changes | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 python3-sip.spec.changes diff --git a/python3-sip.spec.changes b/python3-sip.spec.changes deleted file mode 100644 index 473a0f4..0000000