Merge pull request #95 from libyui/fix-impexp

Fix build by porting NCURSES_CXX_IMPEXP from upstream (bsc#1174759)
libyui · Aug 4, 2020 · a75ceec · a75ceec
2 parents 58463ca + 0ce721c
commit a75ceec
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/VERSION.cmake b/VERSION.cmake
@@ -1,6 +1,6 @@
 SET( VERSION_MAJOR "2" )
 SET( VERSION_MINOR "55" )
-SET( VERSION_PATCH "0" )
+SET( VERSION_PATCH "1" )
 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" )
 
 ##### This is needed for the libyui core ONLY.

diff --git a/package/libyui-ncurses-doc.spec b/package/libyui-ncurses-doc.spec
@@ -19,7 +19,7 @@
 %define so_version 12
 
 Name:           %{parent}-doc
-Version:        2.55.0
+Version:        2.55.1
 Release:        0
 Source:         %{parent}-%{version}.tar.bz2
 

diff --git a/package/libyui-ncurses.changes b/package/libyui-ncurses.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jul 31 13:33:27 UTC 2020 - Martin Vidner <mvidner@suse.com>
+
+- Fix build by porting NCURSES_CXX_IMPEXP from upstream
+  (bsc#1174759).
+- 2.55.1
+
 -------------------------------------------------------------------
 Thu Jun  4 12:05:43 UTC 2020 - Stefan Hundhammer <shundhammer@suse.com>
 

diff --git a/package/libyui-ncurses.spec b/package/libyui-ncurses.spec
@@ -17,7 +17,7 @@
 
 
 Name:           libyui-ncurses
-Version:        2.55.0
+Version:        2.55.1
 Release:        0
 Source:         %{name}-%{version}.tar.bz2
 

diff --git a/src/ncursesw.h b/src/ncursesw.h
@@ -28,6 +28,9 @@
 #include <iosfwd>
 
 #include <ncursesw/curses.h>
+#ifndef NCURSES_CXX_IMPEXP
+#define NCURSES_CXX_IMPEXP NCURSES_EXPORT_GENERAL_IMPORT
+#endif
 #include <ncursesw/etip.h>
 #include <cstdio>
 #include <cstdarg>