GerbilSoft/rom-properties
1
Fork 0
mirror of https://github.com/GerbilSoft/rom-properties.git synced 2025-06-18 11:35:38 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[gettext.win32] Updated to gettext-0.24.

Browse Source 
Compiled with:
- i386:  gcc-14.2.1_p20241116, MinGW-w64 12.0.0
- amd64: gcc-14.2.1_p20241221, MinGW-w64 12.0.0

I tried updating it before, but every time I rebuilt gettext, it would
cause all of rom-properties to crash on startup. It turns out the
problem was -Wl,--pic-executable; removing this fixed it.

This *might* prevent ASLR .reloc sections from being generated in the
gettext executables. These are only used at compile time, so it's not
that big of an issue.

Removed most of the patches, since they are no longer necessary.
The remaining patches:

- 001-gettext-runtime-disable-iconv.patch
- 122-Use-LF-as-newline-in-envsubst.patch

Both patches have been updated for gettext-0.24.

TODO: Build for arm, arm64, and arm64ec.
This commit is contained in:
David Korth 2025-04-21 20:37:26 -04:00
parent 384c3d5abb
commit 684ef662a7
51 changed files with 815 additions and 516 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
extlib/gettext.win32/bin.i386/cldr-plurals.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/hostname.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/iconv.dll vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/libgettextlib-0-22.dll vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/libgettextlib-0-24.dll vendored Executable file
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/libgettextpo-0.dll vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/libgettextsrc-0-22.dll vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/libgettextsrc-0-24.dll vendored Executable file
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/libtextstyle-0.dll vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/msgattrib.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/msgcat.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/msgcmp.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/msgcomm.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/msgconv.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/msgen.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/msgexec.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/msgfilter.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/msgfmt.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/msggrep.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/msginit.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/msgmerge.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/msgunfmt.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/msguniq.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/recode-sr-latin.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/urlget.exe vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/bin.i386/xgettext.exe vendored
View File

Binary file not shown.

901
extlib/gettext.win32/include/libgnuintl.h vendored
View File

File diff suppressed because it is too large Load Diff

8
extlib/gettext.win32/lib.amd64/libgnuintl-8.def vendored
View File

@ -1,5 +1,4 @@
EXPORTS
DllMain
__imp_libintl_version DATA
__printf__
_nl_expand_alias
@ -10,6 +9,7 @@ EXPORTS
dcngettext
dgettext
dngettext
getlocalename_l_unsafe
gettext
libintl_asprintf
libintl_bind_textdomain_codeset
@ -22,7 +22,6 @@ EXPORTS
libintl_fprintf
libintl_fwprintf
libintl_gettext
libintl_hash_string
libintl_ngettext
libintl_nl_current_default_domain DATA
libintl_nl_default_default_domain DATA
@ -47,4 +46,9 @@ EXPORTS
libintl_wprintf
locale_charset
ngettext
rpl_getcwd
rpl_pthread_once
setlocale_messages
setlocale_messages_null
textdomain
wgetcwd

BIN
extlib/gettext.win32/lib.amd64/libgnuintl-8.dll vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/lib.amd64/libgnuintl-8.exp vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/lib.amd64/libgnuintl-8.lib vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/lib.amd64/libgnuintl.dll.a vendored
View File

Binary file not shown.

7
extlib/gettext.win32/lib.i386/libgnuintl-8.def vendored
View File

@ -9,6 +9,7 @@ EXPORTS
dcngettext
dgettext
dngettext
getlocalename_l_unsafe
gettext
libintl_asprintf
libintl_bind_textdomain_codeset
@ -21,7 +22,6 @@ EXPORTS
libintl_fprintf
libintl_fwprintf
libintl_gettext
libintl_hash_string
libintl_ngettext
libintl_nl_current_default_domain DATA
libintl_nl_default_default_domain DATA
@ -46,4 +46,9 @@ EXPORTS
libintl_wprintf
locale_charset
ngettext
rpl_getcwd
rpl_pthread_once
setlocale_messages
setlocale_messages_null
textdomain
wgetcwd

BIN
extlib/gettext.win32/lib.i386/libgnuintl-8.dll vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/lib.i386/libgnuintl-8.exp vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/lib.i386/libgnuintl-8.lib vendored
View File

Binary file not shown.

BIN
extlib/gettext.win32/lib.i386/libgnuintl.dll.a vendored
View File

Binary file not shown.

17
extlib/gettext.win32/patches/0005-Fix-compilation-of-pthread_sigmask.c.patch vendored
View File

@ -1,17 +0,0 @@
From: Michele Locati <michele@locati.it>
Date: Fri, 10 May 2019 11:11:02 +0200
Subject: [PATCH] Fix compilation of pthread_sigmask.c
--- a/gettext-tools/gnulib-tests/pthread_sigmask.c
+++ b/gettext-tools/gnulib-tests/pthread_sigmask.c
@@ -30,9 +30,9 @@
# include <unistd.h>
#endif
+#undef pthread_sigmask
int
pthread_sigmask (int how, const sigset_t *new_mask, sigset_t *old_mask)
-#undef pthread_sigmask
{
#if HAVE_PTHREAD_SIGMASK
int ret;

57
extlib/gettext.win32/patches/001-gettext-runtime-disable-iconv.patch vendored Normal file
View File

@ -0,0 +1,57 @@
diff '--color=auto' -ur gettext-0.24.orig/gettext-runtime/config.h.in gettext-0.24/gettext-runtime/config.h.in
--- gettext-0.24.orig/gettext-runtime/config.h.in 2025-02-25 05:25:16.000000000 -0500
+++ gettext-0.24/gettext-runtime/config.h.in 2025-04-21 13:07:02.520459899 -0400
@@ -725,10 +725,12 @@
#undef HAVE_GOOD_USELOCALE
/* Define if you have the iconv() function and it works. */
-#undef HAVE_ICONV
+/* rom-properties: Disabled. */
+/* #undef HAVE_ICONV */
/* Define to 1 if you have the <iconv.h> header file. */
-#undef HAVE_ICONV_H
+/* rom-properties: Disabled. */
+/* #undef HAVE_ICONV_H */
/* Define to 1 if the compiler supports one of the keywords 'inline',
'__inline__', '__inline' and effectively inlines functions marked as such.
@@ -1243,11 +1245,13 @@
#undef HAVE___INLINE
/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
+/* rom-properties: Disabled. */
+/* #undef ICONV_CONST */
/* Define to a symbolic name denoting the flavor of iconv_open()
implementation. */
-#undef ICONV_FLAVOR
+/* rom-properties: Disabled. */
+/* #undef ICONV_FLAVOR */
/* Define to the value of ${prefix}, as a string. */
#undef INSTALLPREFIX
diff '--color=auto' -ur gettext-0.24.orig/gettext-runtime/intl/config.h.in gettext-0.24/gettext-runtime/intl/config.h.in
--- gettext-0.24.orig/gettext-runtime/intl/config.h.in 2025-02-25 05:25:10.000000000 -0500
+++ gettext-0.24/gettext-runtime/intl/config.h.in 2025-04-21 13:06:27.935503569 -0400
@@ -373,7 +373,8 @@
#undef HAVE_GOOD_USELOCALE
/* Define if you have the iconv() function and it works. */
-#undef HAVE_ICONV
+/* rom-properties: Disabled. */
+/* #undef HAVE_ICONV */
/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
#undef HAVE_INTMAX_T
@@ -758,7 +759,8 @@
#endif
/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
+/* rom-properties: Disabled. */
+/* #undef ICONV_CONST */
/* Define as the bit index in the word where to find bit 0 of the exponent of
'long double'. */

44
extlib/gettext.win32/patches/06-dont-include-ctype-after-gnulibs-wctype.mingw.patch vendored
View File

@ -1,44 +0,0 @@
--- gettext-tools/gnulib-lib/libxml/parser.c.orig 2013-01-18 10:24:37 +0400
+++ gettext-tools/gnulib-lib/libxml/parser.c 2013-01-18 10:36:35 +0400
@@ -78,6 +78,9 @@
#include <string.h>
#include <stdarg.h>
#include <stddef.h>
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
#include <libxml/xmlmemory.h>
#include <libxml/threads.h>
#include <libxml/globals.h>
@@ -97,9 +100,6 @@
#include <libxml/xmlschemastypes.h>
#include <libxml/relaxng.h>
#endif
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
--- gettext-tools/gnulib-lib/libxml/threads.c.orig 2013-01-18 10:38:24 +0400
+++ gettext-tools/gnulib-lib/libxml/threads.c 2013-01-18 10:41:11 +0400
@@ -41,15 +41,16 @@
#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#include <libxml/threads.h>
#include <libxml/globals.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif

110
extlib/gettext.win32/patches/07-fix-asprintf-conflict.mingw.patch vendored
View File

@ -1,110 +0,0 @@
--- gettext-runtime/libasprintf/gnulib-lib/vasnprintf.h.orig 2023-05-19 00:19:37.000000000 -0400
+++ gettext-runtime/libasprintf/gnulib-lib/vasnprintf.h 2023-07-01 12:17:08.374266671 -0400
@@ -35,6 +35,8 @@
extern "C" {
#endif
+#if !defined(__USE_MINGW_ANSI_STDIO) && defined(__MINGW64_VERSION_MAJOR)
+
/* Write formatted output to a string dynamically allocated with malloc().
You can pass a preallocated buffer for the result in RESULTBUF and its
size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
@@ -63,6 +65,7 @@
# define asnprintf rpl_asnprintf
# define vasnprintf rpl_vasnprintf
#endif
+
extern char * asnprintf (char *restrict resultbuf, size_t *lengthp,
const char *format, ...)
_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 3, 4));
@@ -70,6 +73,8 @@
const char *format, va_list args)
_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 3, 0));
+#endif /* !defined(__USE_MINGW_ANSI_STDIO) && defined(__MINGW64_VERSION_MAJOR) */
+
#ifdef __cplusplus
}
#endif
--- gettext-runtime/intl/gnulib-lib/vasnprintf.h.orig 2023-05-19 00:19:37.000000000 -0400
+++ gettext-runtime/intl/gnulib-lib/vasnprintf.h 2023-07-01 12:17:08.374266671 -0400
@@ -35,6 +35,8 @@
extern "C" {
#endif
+#if !defined(__USE_MINGW_ANSI_STDIO) && defined(__MINGW64_VERSION_MAJOR)
+
/* Write formatted output to a string dynamically allocated with malloc().
You can pass a preallocated buffer for the result in RESULTBUF and its
size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
@@ -63,6 +65,7 @@
# define asnprintf rpl_asnprintf
# define vasnprintf rpl_vasnprintf
#endif
+
extern char * asnprintf (char *restrict resultbuf, size_t *lengthp,
const char *format, ...)
_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 3, 4));
@@ -70,6 +73,8 @@
const char *format, va_list args)
_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 3, 0));
+#endif /* !defined(__USE_MINGW_ANSI_STDIO) && defined(__MINGW64_VERSION_MAJOR) */
+
#ifdef __cplusplus
}
#endif
--- gettext-runtime/libasprintf/vasprintf.h.orig 2019-05-11 07:29:32.000000000 -0400
+++ gettext-runtime/libasprintf/vasprintf.h 2023-07-01 12:15:45.172287523 -0400
@@ -37,6 +37,8 @@
extern "C" {
#endif
+#if !defined(__USE_MINGW_ANSI_STDIO) && defined(__MINGW64_VERSION_MAJOR)
+
/* Write formatted output to a string dynamically allocated with malloc().
If the memory allocation succeeds, store the address of the string in
*RESULT and return the number of resulting bytes, excluding the trailing
@@ -46,6 +48,8 @@
extern int vasprintf (char **result, const char *format, va_list args)
__attribute__ ((__format__ (__printf__, 2, 0)));
+#endif /* !defined(__USE_MINGW_ANSI_STDIO) && defined(__MINGW64_VERSION_MAJOR) */
+
#ifdef __cplusplus
}
#endif
--- gettext-runtime/libasprintf/gnulib-lib/vasnprintf.c.orig 2023-06-12 13:34:50.000000000 -0400
+++ gettext-runtime/libasprintf/gnulib-lib/vasnprintf.c 2023-07-01 12:19:12.477235568 -0400
@@ -80,7 +80,14 @@
#endif
#include <locale.h> /* localeconv() */
+#if defined(__MINGW64_VERSION_MAJOR) && defined(__USE_MINGW_ANSI_STDIO)
+# define REMOVED__USE_MINGW_ANSI_STDIO
+# undef __USE_MINGW_ANSI_STDIO
+#endif
#include <stdio.h> /* snprintf(), sprintf() */
+#if defined(__MINGW64_VERSION_MAJOR) && defined(REMOVED__USE_MINGW_ANSI_STDIO)
+# define __USE_MINGW_ANSI_STDIO 1
+#endif
#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
#include <string.h> /* memcpy(), strlen() */
#include <wchar.h> /* mbstate_t, mbrtowc(), mbrlen(), wcrtomb() */
--- gettext-runtime/intl/gnulib-lib/vasnprintf.c.orig 2023-06-12 13:34:50.000000000 -0400
+++ gettext-runtime/intl/gnulib-lib/vasnprintf.c 2023-07-01 12:19:12.477235568 -0400
@@ -80,7 +80,14 @@
#endif
#include <locale.h> /* localeconv() */
+#if defined(__MINGW64_VERSION_MAJOR) && defined(__USE_MINGW_ANSI_STDIO)
+# define REMOVED__USE_MINGW_ANSI_STDIO
+# undef __USE_MINGW_ANSI_STDIO
+#endif
#include <stdio.h> /* snprintf(), sprintf() */
+#if defined(__MINGW64_VERSION_MAJOR) && defined(REMOVED__USE_MINGW_ANSI_STDIO)
+# define __USE_MINGW_ANSI_STDIO 1
+#endif
#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
#include <string.h> /* memcpy(), strlen() */
#include <wchar.h> /* mbstate_t, mbrtowc(), mbrlen(), wcrtomb() */

11
extlib/gettext.win32/patches/08-vs-compatible.patch vendored
View File

@ -1,11 +0,0 @@
--- gettext-runtime/intl/libgnuintl.in.h.orig 2023-06-17 06:58:50.000000000 -0400
+++ gettext-runtime/intl/libgnuintl.in.h 2023-07-01 12:21:22.071203089 -0400
@@ -385,7 +385,7 @@
# if !((defined printf && defined _GL_STDIO_H) || defined GNULIB_overrides_printf) /* don't override gnulib */
# undef printf
-# if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
+# if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__ || defined _MSC_VER
/* Don't break __attribute__((format(printf,M,N))).
This redefinition is only possible because the libc in NetBSD, Cygwin,
mingw does not have a function __printf__.

88
extlib/gettext.win32/patches/1000-disable-iconv-in-config-h-in.diff vendored
View File

@ -1,88 +0,0 @@
--- gettext-0.22/gettext-tools/config.h.in.orig 2023-07-28 11:27:02.945221690 -0400
+++ gettext-0.22/gettext-tools/config.h.in 2023-07-28 11:28:23.103950976 -0400
@@ -1450,10 +1450,12 @@
#undef HAVE_GOOD_USELOCALE
/* Define if you have the iconv() function and it works. */
-#undef HAVE_ICONV
+/* rom-properties: Disabled. */
+/* #undef HAVE_ICONV */
/* Define to 1 if you have the <iconv.h> header file. */
-#undef HAVE_ICONV_H
+/* rom-properties: Disabled. */
+/* #undef HAVE_ICONV_H */
/* Define to 1 if you have the `inet_ntop' function. */
#undef HAVE_INET_NTOP
@@ -2315,11 +2317,13 @@
#undef HAVE___XPG_STRERROR_R
/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
+/* rom-properties: Disabled. */
+/* #undef ICONV_CONST */
/* Define to a symbolic name denoting the flavor of iconv_open()
implementation. */
-#undef ICONV_FLAVOR
+/* rom-properties: Disabled. */
+/* #undef ICONV_FLAVOR */
/* Define to the value of ${prefix}, as a string. */
#undef INSTALLPREFIX
--- gettext-0.22/gettext-runtime/config.h.in.orig 2023-07-28 11:27:15.394179647 -0400
+++ gettext-0.22/gettext-runtime/config.h.in 2023-07-28 11:28:35.397909457 -0400
@@ -533,10 +533,12 @@
#undef HAVE_GOOD_USELOCALE
/* Define if you have the iconv() function and it works. */
-#undef HAVE_ICONV
+/* rom-properties: Disabled. */
+/* #undef HAVE_ICONV */
/* Define to 1 if you have the <iconv.h> header file. */
-#undef HAVE_ICONV_H
+/* rom-properties: Disabled. */
+/* #undef HAVE_ICONV_H */
/* Define to 1 if the compiler supports one of the keywords 'inline',
'__inline__', '__inline' and effectively inlines functions marked as such.
@@ -958,11 +960,13 @@
#undef HAVE___INLINE
/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
+/* rom-properties: Disabled. */
+/* #undef ICONV_CONST */
/* Define to a symbolic name denoting the flavor of iconv_open()
implementation. */
-#undef ICONV_FLAVOR
+/* rom-properties: Disabled. */
+/* #undef ICONV_FLAVOR */
/* Define to the value of ${prefix}, as a string. */
#undef INSTALLPREFIX
--- gettext-0.22/gettext-runtime/intl/config.h.in.orig 2023-06-17 07:53:52.000000000 -0400
+++ gettext-0.22/gettext-runtime/intl/config.h.in 2023-07-28 11:28:42.230886380 -0400
@@ -351,7 +351,8 @@
#undef HAVE_GOOD_USELOCALE
/* Define if you have the iconv() function and it works. */
-#undef HAVE_ICONV
+/* rom-properties: Disabled. */
+/* #undef HAVE_ICONV */
/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
#undef HAVE_INTMAX_T
@@ -715,7 +716,8 @@
#endif
/* Define as const if the declaration of iconv() needs const. */
-#undef ICONV_CONST
+/* rom-properties: Disabled. */
+/* #undef ICONV_CONST */
/* Define to the value of ${prefix}, as a string. */
#undef INSTALLPREFIX

13
extlib/gettext.win32/patches/1002-dcigettext-c-include-wchar-h.patch vendored
View File

@ -1,13 +0,0 @@
--- gettext-0.21/gettext-runtime/intl/dcigettext.c.orig 2020-06-06 10:03:32.000000000 -0400
+++ gettext-0.21/gettext-runtime/intl/dcigettext.c 2020-08-20 11:57:33.117783195 -0400
@@ -65,6 +65,10 @@
# include <unistd.h>
#endif
+#if defined _WIN32 && !defined __CYGWIN__
+# include <wchar.h>
+#endif
+
#include <locale.h>
#ifdef _LIBC

10
extlib/gettext.win32/patches/1003-gettextsrc-exports-missing-formatstring-ruby.patch vendored
View File

@ -1,10 +0,0 @@
--- gettext-0.21/gettext-tools/woe32dll/gettextsrc-exports.c.orig 2019-12-23 06:21:12.000000000 -0500
+++ gettext-0.21/gettext-tools/woe32dll/gettextsrc-exports.c 2020-08-20 12:20:30.752088214 -0400
@@ -50,6 +50,7 @@
VARIABLE(formatstring_python_brace)
VARIABLE(formatstring_qt)
VARIABLE(formatstring_qt_plural)
+VARIABLE(formatstring_ruby)
VARIABLE(formatstring_scheme)
VARIABLE(formatstring_sh)
VARIABLE(formatstring_smalltalk)

17
extlib/gettext.win32/patches/1004-gettext-runtime-disable-iconv.patch vendored
View File

@ -1,17 +0,0 @@
--- gettext-0.21/gettext-runtime/config.h.in.orig 2020-07-26 17:03:57.000000000 -0400
+++ gettext-0.21/gettext-runtime/config.h.in 2020-08-20 12:49:17.066788915 -0400
@@ -391,10 +391,12 @@
#undef HAVE_GETUID
/* Define if you have the iconv() function and it works. */
-#undef HAVE_ICONV
+/* rom-properties: Disabled. */
+/* #undef HAVE_ICONV */
/* Define to 1 if you have the <iconv.h> header file. */
-#undef HAVE_ICONV_H
+/* rom-properties: Disabled. */
+/* #undef HAVE_ICONV_H */
/* Define to 1 if the compiler supports one of the keywords 'inline',
'__inline__', '__inline' and effectively inlines functions marked as such.

24
extlib/gettext.win32/patches/122-Use-LF-as-newline-in-envsubst.patch vendored
View File

@ -1,19 +1,5 @@
From 89170435bde2d889dee8b20c74d7771e6af8f19e Mon Sep 17 00:00:00 2001
From: Tim S <stahta01@users.sourceforge.net>
Date: Sun, 16 Sep 2018 10:35:04 -0400
Subject: [PATCH] Use LF as newline in envsubst
Now using underline prefix in functions as stated at:
https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/setmode
And, change mode back to prior mode
---
gettext-runtime/src/envsubst.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff a/gettext-runtime/src/envsubst.c b/gettext-runtime/src/envsubst.c
--- a/gettext-runtime/src/envsubst.c.orig 2023-06-17 06:58:50.000000000 -0400
+++ b/gettext-runtime/src/envsubst.c 2023-07-01 12:25:40.029138440 -0400
--- ./gettext-runtime/src/envsubst.c.orig 2024-12-31 05:05:32.000000000 -0500
+++ ./gettext-runtime/src/envsubst.c 2025-01-06 11:44:15.432757696 -0500
@@ -28,6 +28,11 @@
#include <unistd.h>
#include <locale.h>
@ -23,10 +9,10 @@ diff a/gettext-runtime/src/envsubst.c b/gettext-runtime/src/envsubst.c
+# include <fcntl.h>
+#endif
+
#include <error.h>
#include "attribute.h"
#include "noreturn.h"
#include "closeout.h"
#include "error.h"
@@ -289,8 +294,21 @@
@@ -292,8 +297,21 @@
static void
print_variable (const char *var_ptr, size_t var_len)
{

12
extlib/gettext.win32/patches/200-tools-gnulib-define-installdir.patch vendored
View File

@ -1,12 +0,0 @@
for relocate()
--- gettext-0.19.8.1/gettext-tools/gnulib-lib/Makefile.am.orig 2019-05-11 22:20:53.069987300 +0200
+++ gettext-0.19.8.1/gettext-tools/gnulib-lib/Makefile.am 2019-05-11 22:21:54.510209600 +0200
@@ -48,6 +48,8 @@
# Parametrization of the 'relocatable' module.
AM_CPPFLAGS += -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1
+AM_CPPFLAGS += -DINSTALLDIR=\"$(bindir)\"
+
# Parametrization of the 'libxml' module:
# When building a shared library, don't export the variables
# xmlMalloc, xmlMallocAtomic, xmlRealloc, xmlFree, xmlMemStrdup.

4
src/rpcli/rpcli.cpp
View File

@ -112,7 +112,7 @@ static int DelayLoad_test_ImageTypesConfig_className(void) {
# ifdef ENABLE_NLS
// DelayLoad: libi18n
# include "libi18n/i18n.h"
DELAYLOAD_TEST_FUNCTION_IMPL1(textdomain, nullptr);
DELAYLOAD_TEST_FUNCTION_IMPL1(libintl_textdomain, nullptr);
# endif /* ENABLE_NLS */
#endif /* _MSC_VER */
@ -642,7 +642,7 @@ int RP_C_API _tmain(int argc, TCHAR *argv[])
#if defined(ENABLE_NLS) && defined(_MSC_VER)
// Delay load verification: libgnuintl
// TODO: Skip this if not linked with /DELAYLOAD?
if (DelayLoad_test_textdomain() != 0) {
if (DelayLoad_test_libintl_textdomain() != 0) {
// Delay load failed.
_fputts(_T("*** ERROR: ") LIBGNUINTL_DLL _T(" could not be loaded.\n\n")
_T("This build of rom-properties has localization enabled,\n")

4
src/win32/DllMain.cpp
View File

@ -52,7 +52,7 @@ static ULONG_PTR gdipToken = 0;
# include "libwin32common/DelayLoadHelper.h"
// DelayLoad test implementation.
# include "libi18n/i18n.h"
DELAYLOAD_TEST_FUNCTION_IMPL1(textdomain, nullptr);
DELAYLOAD_TEST_FUNCTION_IMPL1(libintl_textdomain, nullptr);
#endif /* defined(_MSC_VER) && defined(ENABLE_NLS) */
/**
@ -144,7 +144,7 @@ _Check_return_ STDAPI DllGetClassObject(_In_ REFCLSID rclsid, _In_ REFIID riid,
#if defined(_MSC_VER) && defined(ENABLE_NLS)
// Delay load verification.
if (DelayLoad_test_textdomain() != 0) {
if (DelayLoad_test_libintl_textdomain() != 0) {
// Delay load failed.
return E_UNEXPECTED;
}

4
src/win32/config/ConfigDialog.cpp
View File

@ -29,7 +29,7 @@ using std::tstring;
// MSVC: Exception handling for /DELAYLOAD.
# include "libwin32common/DelayLoadHelper.h"
// DelayLoad test implementation.
DELAYLOAD_TEST_FUNCTION_IMPL1(textdomain, nullptr);
DELAYLOAD_TEST_FUNCTION_IMPL1(libintl_textdomain, nullptr);
#endif /* defined(_MSC_VER) && defined(ENABLE_NLS) */
// rp_image backend registration
@ -498,7 +498,7 @@ int CALLBACK rp_show_config_dialog(
#if defined(_MSC_VER) && defined(ENABLE_NLS)
// Delay load verification.
if (DelayLoad_test_textdomain() != 0) {
if (DelayLoad_test_libintl_textdomain() != 0) {
// Delay load failed.
// TODO: Use a CMake macro for the soversion?
MessageBox(hWnd,