| 1 |
commit: a4e90bad12fbd494c3829b386ddadf7518a4443d |
| 2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 25 15:33:24 2017 +0000 |
| 4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 25 15:33:24 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a4e90bad |
| 7 |
|
| 8 |
dev-libs/libintl-0.19.8.1-r00.1: update winnt support |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.8-prefix, Repoman-2.3.3 |
| 11 |
|
| 12 |
dev-libs/libintl/files/0.19.3-localename.patch | 4 ++-- |
| 13 |
dev-libs/libintl/files/0.19.8.1-winnt.patch | 11 +++++++++++ |
| 14 |
dev-libs/libintl/libintl-0.19.8.1-r00.1.ebuild | 1 + |
| 15 |
3 files changed, 14 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/libintl/files/0.19.3-localename.patch b/dev-libs/libintl/files/0.19.3-localename.patch |
| 18 |
index b5e37fb421..1df7811ed7 100644 |
| 19 |
--- a/dev-libs/libintl/files/0.19.3-localename.patch |
| 20 |
+++ b/dev-libs/libintl/files/0.19.3-localename.patch |
| 21 |
@@ -55,7 +55,7 @@ |
| 22 |
#endif |
| 23 |
|
| 24 |
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */ |
| 25 |
-+#if defined WINDOWS_NATIVE_ /* Native Windows */ |
| 26 |
++#if defined WINDOWS_NATIVE /* Native Windows */ |
| 27 |
# define WIN32_LEAN_AND_MEAN |
| 28 |
# include <windows.h> |
| 29 |
# include <winnls.h> |
| 30 |
@@ -114,7 +114,7 @@ |
| 31 |
#endif |
| 32 |
|
| 33 |
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */ |
| 34 |
-+#if defined WINDOWS_NATIVE_ /* Native Windows */ |
| 35 |
++#if defined WINDOWS_NATIVE /* Native Windows */ |
| 36 |
# define WIN32_LEAN_AND_MEAN |
| 37 |
# include <windows.h> |
| 38 |
# include <winnls.h> |
| 39 |
|
| 40 |
diff --git a/dev-libs/libintl/files/0.19.8.1-winnt.patch b/dev-libs/libintl/files/0.19.8.1-winnt.patch |
| 41 |
new file mode 100644 |
| 42 |
index 0000000000..009e0dd551 |
| 43 |
--- /dev/null |
| 44 |
+++ b/dev-libs/libintl/files/0.19.8.1-winnt.patch |
| 45 |
@@ -0,0 +1,11 @@ |
| 46 |
+--- gettext-0.19.8.1/gettext-runtime/intl/export.h.orig 2017-09-25 17:11:21.466134600 +0200 |
| 47 |
++++ gettext-0.19.8.1/gettext-runtime/intl/export.h 2017-09-25 17:11:23.294289400 +0200 |
| 48 |
+@@ -1,6 +1,8 @@ |
| 49 |
+ |
| 50 |
+ #if @HAVE_VISIBILITY@ && BUILDING_LIBINTL |
| 51 |
+ #define LIBINTL_DLL_EXPORTED __attribute__((__visibility__("default"))) |
| 52 |
++#elif defined(_MSC_VER) && BUILDING_LIBINTL |
| 53 |
++#define LIBINTL_DLL_EXPORTED __declspec(dllexport) |
| 54 |
+ #else |
| 55 |
+ #define LIBINTL_DLL_EXPORTED |
| 56 |
+ #endif |
| 57 |
|
| 58 |
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 |
| 59 |
index f2b7b245be..e33cfc4414 100644 |
| 60 |
--- a/dev-libs/libintl/libintl-0.19.8.1-r00.1.ebuild |
| 61 |
+++ b/dev-libs/libintl/libintl-0.19.8.1-r00.1.ebuild |
| 62 |
@@ -31,6 +31,7 @@ S="${WORKDIR}/${MY_P}/gettext-runtime" |
| 63 |
src_prepare() { |
| 64 |
epatch "${FILESDIR}"/0.19.3-localename.patch # Cygwin |
| 65 |
epatch "${FILESDIR}"/0.19.8.1-hide-newlocale.patch # feature test |
| 66 |
+ epatch "${FILESDIR}"/0.19.8.1-winnt.patch |
| 67 |
|
| 68 |
# The libtool files are stored higher up, so make sure we run in the |
| 69 |
# whole tree and not just the subdir we build. |
Archives