From 7f32046662c0d9f7a36076d34b0a00c64e5db990f01e99c4e09d313d87f11fed Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Thu, 10 Sep 2015 14:02:25 +0000 Subject: [PATCH] Accepting request 330043 from home:dimstar:Factory - Add python3-ncurses-6.0-accessors.patch: Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1. - Add python3-ncurses-6.0-accessors.patch: Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1. OBS-URL: https://build.opensuse.org/request/show/330043 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=186 --- python-base.changes | 6 +++++ python-base.spec | 3 +++ python-doc.spec | 3 +++ python-ncurses-6.0-accessors.patch | 40 ++++++++++++++++++++++++++++++ python.changes | 6 +++++ python.spec | 3 +++ 6 files changed, 61 insertions(+) create mode 100644 python-ncurses-6.0-accessors.patch diff --git a/python-base.changes b/python-base.changes index 893b4a7..478e643 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 9 12:19:01 UTC 2015 - dimstar@opensuse.org + +- Add python3-ncurses-6.0-accessors.patch: Fix build with + NCurses 6.0 and OPAQUE_WINDOW set to 1. + ------------------------------------------------------------------- Wed Jun 10 11:19:58 UTC 2015 - dmueller@suse.com diff --git a/python-base.spec b/python-base.spec index 2fe01eb..583c7ec 100644 --- a/python-base.spec +++ b/python-base.spec @@ -54,6 +54,8 @@ Patch31: python-2.7.7-mhlib-linkcount.patch Patch33: python-2.7.9-ssl_ca_path.patch # PATCH-FEATURE-SLE disable SSL verification-by-default in http clients Patch34: python-2.7.9-sles-disable-verification-by-default.patch +# PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch dimstar@opensuse.org -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 +Patch35: python-ncurses-6.0-accessors.patch # COMMON-PATCH-END %define python_version %(echo %{tarversion} | head -c 3) BuildRequires: automake @@ -146,6 +148,7 @@ other applications. %if %{suse_version} == 1315 %patch34 -p1 %endif +%patch35 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac diff --git a/python-doc.spec b/python-doc.spec index 4036dd7..a3f77f2 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -55,6 +55,8 @@ Patch31: python-2.7.7-mhlib-linkcount.patch Patch33: python-2.7.9-ssl_ca_path.patch # PATCH-FEATURE-SLE disable SSL verification-by-default in http clients Patch34: python-2.7.9-sles-disable-verification-by-default.patch +# PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch dimstar@opensuse.org -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 +Patch35: python-ncurses-6.0-accessors.patch # COMMON-PATCH-END Provides: pyth_doc Provides: pyth_ps @@ -101,6 +103,7 @@ Python, and Macintosh Module Reference in PDF format. %if %{suse_version} == 1315 %patch34 -p1 %endif +%patch35 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac diff --git a/python-ncurses-6.0-accessors.patch b/python-ncurses-6.0-accessors.patch new file mode 100644 index 0000000..9df1176 --- /dev/null +++ b/python-ncurses-6.0-accessors.patch @@ -0,0 +1,40 @@ +Index: Python-2.7.10/Modules/_cursesmodule.c +=================================================================== +--- Python-2.7.10.orig/Modules/_cursesmodule.c ++++ Python-2.7.10/Modules/_cursesmodule.c +@@ -807,7 +807,7 @@ PyCursesWindow_EchoChar(PyCursesWindowOb + } + + #ifdef WINDOW_HAS_FLAGS +- if (self->win->_flags & _ISPAD) ++ if (is_pad(self->win)) + return PyCursesCheckERR(pechochar(self->win, ch | attr), + "echochar"); + else +@@ -1237,7 +1237,7 @@ PyCursesWindow_NoOutRefresh(PyCursesWind + #ifndef WINDOW_HAS_FLAGS + if (0) + #else +- if (self->win->_flags & _ISPAD) ++ if (is_pad(self->win)) + #endif + { + switch(PyTuple_Size(args)) { +@@ -1380,7 +1380,7 @@ PyCursesWindow_Refresh(PyCursesWindowObj + #ifndef WINDOW_HAS_FLAGS + if (0) + #else +- if (self->win->_flags & _ISPAD) ++ if (is_pad(self->win)) + #endif + { + switch(PyTuple_Size(args)) { +@@ -1447,7 +1447,7 @@ PyCursesWindow_SubWin(PyCursesWindowObje + + /* printf("Subwin: %i %i %i %i \n", nlines, ncols, begin_y, begin_x); */ + #ifdef WINDOW_HAS_FLAGS +- if (self->win->_flags & _ISPAD) ++ if (is_pad(self->win)) + win = subpad(self->win, nlines, ncols, begin_y, begin_x); + else + #endif diff --git a/python.changes b/python.changes index a2db92f..4351659 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 9 12:18:20 UTC 2015 - dimstar@opensuse.org + +- Add python3-ncurses-6.0-accessors.patch: Fix build with + NCurses 6.0 and OPAQUE_WINDOW set to 1. + ------------------------------------------------------------------- Sun May 24 14:36:10 UTC 2015 - michael@stroeder.com diff --git a/python.spec b/python.spec index 2c0374e..fa8b10c 100644 --- a/python.spec +++ b/python.spec @@ -59,6 +59,8 @@ Patch31: python-2.7.7-mhlib-linkcount.patch Patch33: python-2.7.9-ssl_ca_path.patch # PATCH-FEATURE-SLE disable SSL verification-by-default in http clients Patch34: python-2.7.9-sles-disable-verification-by-default.patch +# PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch dimstar@opensuse.org -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 +Patch35: python-ncurses-6.0-accessors.patch # COMMON-PATCH-END BuildRequires: automake BuildRequires: db-devel @@ -181,6 +183,7 @@ implementation of the standard Unix DBM databases. %if %{suse_version} == 1315 %patch34 -p1 %endif +%patch35 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac