[Libreoffice-commits] .: python3/python-3.3.0-ncurses.patch python3/UnpackedTarball_python3.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Dec 3 16:05:57 PST 2012


 python3/UnpackedTarball_python3.mk |    1 +
 python3/python-3.3.0-ncurses.patch |   11 +++++++++++
 2 files changed, 12 insertions(+)

New commits:
commit f4ae375c00deb2297074c59b62db87de080bf591
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue Dec 4 01:03:39 2012 +0100

    fix python3 build on SLED11
    
    Apparently all recent systems use ncursesw, for which there is
    -I/usr/include/ncursesw, but SLED11 uses ncurses lib, and there's no -I for that.
    
    Change-Id: I61ec795aae45e1074075351eca62299784d08b09

diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk
index 840108b..f529a4e 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
 	python3/python-3.3.0-ssl.patch.1 \
 	python3/python-3.3.0-implicit-int.patch.1 \
 	python3/python-3.3.0-ffi-clang.patch.1 \
+	python3/python-3.3.0-ncurses.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/python3/python-3.3.0-ncurses.patch b/python3/python-3.3.0-ncurses.patch
new file mode 100644
index 0000000..1d19fe5
--- /dev/null
+++ b/python3/python-3.3.0-ncurses.patch
@@ -0,0 +1,11 @@
+--- a/python3/setup.py	2012-12-04 00:40:57.000000000 +0100
++++ b/python3/setup.py	2012-12-04 00:53:49.000000000 +0100
+@@ -1289,6 +1279,8 @@
+             # Building with the system-suppied combined libncurses/libpanel
+             curses_defines.append(('HAVE_NCURSESW', '1'))
+             curses_defines.append(('_XOPEN_SOURCE_EXTENDED', '1'))
++        elif curses_library == 'ncurses':
++            curses_includes.append('/usr/include/ncurses')
+ 
+         if curses_library.startswith('ncurses'):
+             curses_libs = [curses_library]


More information about the Libreoffice-commits mailing list