diff options
| author |   Michael Haubenwallner <haubi@gentoo.org> | 2017-09-25 17:33:24 +0200 |
|---|---|---|
| committer | Michael Haubenwallner <haubi@gentoo.org> | 2017-09-25 17:33:24 +0200 |
| commit | a4e90bad12fbd494c3829b386ddadf7518a4443d (patch) | |
| tree | 2e5a3d02c322da688b4e8b482b772410445623f1 | |
| parent | dev-libs/libiconv-1.14-r1: fix for winnt (diff) | |
| download | prefix-a4e90bad.tar.gz prefix-a4e90bad.tar.bz2 prefix-a4e90bad.zip | |
dev-libs/libintl-0.19.8.1-r00.1: update winnt support
Package-Manager: Portage-2.3.8-prefix, Repoman-2.3.3
| -rw-r--r-- | dev-libs/libintl/files/0.19.3-localename.patch | 4 | ||||
| -rw-r--r-- | dev-libs/libintl/files/0.19.8.1-winnt.patch | 11 | ||||
| -rw-r--r-- | dev-libs/libintl/libintl-0.19.8.1-r00.1.ebuild | 1 |
3 files changed, 14 insertions, 2 deletions
diff --git a/dev-libs/libintl/files/0.19.3-localename.patch b/dev-libs/libintl/files/0.19.3-localename.patch index b5e37fb421..1df7811ed7 100644 --- a/dev-libs/libintl/files/0.19.3-localename.patch +++ b/dev-libs/libintl/files/0.19.3-localename.patch @@ -55,7 +55,7 @@ #endif -#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */ -+#if defined WINDOWS_NATIVE_ /* Native Windows */ ++#if defined WINDOWS_NATIVE /* Native Windows */ # define WIN32_LEAN_AND_MEAN # include <windows.h> # include <winnls.h> @@ -114,7 +114,7 @@ #endif -#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */ -+#if defined WINDOWS_NATIVE_ /* Native Windows */ ++#if defined WINDOWS_NATIVE /* Native Windows */ # define WIN32_LEAN_AND_MEAN # include <windows.h> # include <winnls.h> diff --git a/dev-libs/libintl/files/0.19.8.1-winnt.patch b/dev-libs/libintl/files/0.19.8.1-winnt.patch new file mode 100644 index 0000000000..009e0dd551 --- /dev/null +++ b/dev-libs/libintl/files/0.19.8.1-winnt.patch @@ -0,0 +1,11 @@ +--- gettext-0.19.8.1/gettext-runtime/intl/export.h.orig 2017-09-25 17:11:21.466134600 +0200 ++++ gettext-0.19.8.1/gettext-runtime/intl/export.h 2017-09-25 17:11:23.294289400 +0200 +@@ -1,6 +1,8 @@ + + #if @HAVE_VISIBILITY@ && BUILDING_LIBINTL + #define LIBINTL_DLL_EXPORTED __attribute__((__visibility__("default"))) ++#elif defined(_MSC_VER) && BUILDING_LIBINTL ++#define LIBINTL_DLL_EXPORTED __declspec(dllexport) + #else + #define LIBINTL_DLL_EXPORTED + #endif diff --git a/dev-libs/libintl/libintl-0.19.8.1-r00.1.ebuild b/dev-libs/libintl/libintl-0.19.8.1-r00.1.ebuild index f2b7b245be..e33cfc4414 100644 --- a/dev-libs/libintl/libintl-0.19.8.1-r00.1.ebuild +++ b/dev-libs/libintl/libintl-0.19.8.1-r00.1.ebuild @@ -31,6 +31,7 @@ S="${WORKDIR}/${MY_P}/gettext-runtime" src_prepare() { epatch "${FILESDIR}"/0.19.3-localename.patch # Cygwin epatch "${FILESDIR}"/0.19.8.1-hide-newlocale.patch # feature test + epatch "${FILESDIR}"/0.19.8.1-winnt.patch # The libtool files are stored higher up, so make sure we run in the # whole tree and not just the subdir we build. |