From 76c68ef29cd7686cda68436285d9026f962aa35c Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Sun, 3 Mar 2024 21:52:47 -0300 Subject: [PATCH 1/4] Disabling publish on macos builds. --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a404d34a..47a10e06 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,7 +1,7 @@ name: Publish on: push: - branches: [ "macos" ] + branches: [ "publish" ] tags: [ "*" ] jobs: From c082fc0914b7022667389cbf563fae44fb60655b Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 12 Mar 2025 17:13:41 -0300 Subject: [PATCH 2/4] Debugging macos build issue. --- src/library/ft/ft.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/library/ft/ft.c b/src/library/ft/ft.c index 99495441..93249300 100644 --- a/src/library/ft/ft.c +++ b/src/library/ft/ft.c @@ -42,6 +42,7 @@ #include #include #include +#include #include From d414c89b19cb5996b46d2bacab444743c4d00f4c Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 12 Mar 2025 17:24:33 -0300 Subject: [PATCH 3/4] Fixing build withou intl. --- README.md | 9 +++++---- src/include/private/intl.h | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7e586f1f..ec8a7883 100644 --- a/README.md +++ b/README.md @@ -167,16 +167,17 @@ Install ```shell brew update - brew install xz binutils coreutils curl gettext libtool openssl pkgconfig meson ninja + brew install xz meson ninja curl gettext openssl pkgconfig brew upgrade ``` -4. Configure, build and install +4. Configure, build and install *REVISION PENDING* ```shell export PKG_CONFIG_PATH="$(brew --prefix curl)/lib/pkgconfig:$(brew --prefix openssl)/lib/pkgconfig" - ./autogen.sh --prefix="$(brew --cellar)/lib3270/5.4" --with-libiconv-prefix=$(brew --prefix gettext) - make all && make install + meson setup --reconfigure --wipe .build + meson compile -C .build + meson install -C .build brew link lib3270 ``` diff --git a/src/include/private/intl.h b/src/include/private/intl.h index faa0d82e..aa9c05b8 100644 --- a/src/include/private/intl.h +++ b/src/include/private/intl.h @@ -29,7 +29,8 @@ #include #define _( x ) dgettext(GETTEXT_PACKAGE,x) #define N_( x ) x - #else + #else #define _( x ) x #define N_( x ) x + #define dgettext(p,x) x #endif // HAVE_LIBINTL From fea62e47bed5c6f67332b76264a0a11e33bef89a Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 12 Mar 2025 17:33:54 -0300 Subject: [PATCH 4/4] Debugging macos build. --- src/library/init.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/library/init.c b/src/library/init.c index a5f937da..2b4f1c4b 100644 --- a/src/library/init.c +++ b/src/library/init.c @@ -101,7 +101,7 @@ int lib3270_loaded(void) { ansictl.vrprnt = parse_ctlchar("^R"); ansictl.vlnext = parse_ctlchar("^V"); -#ifdef _WIN32 +#if defined(_WIN32) { char lpFilename[4096]; @@ -116,11 +116,13 @@ int lib3270_loaded(void) { strncat(lpFilename,"locale",4095); bindtextdomain(GETTEXT_PACKAGE,lpFilename); } -#else +#elif defined(HAVE_LIBINTL) bindtextdomain(GETTEXT_PACKAGE, LIB3270_STRINGIZE_VALUE_OF(LOCALEDIR)); #endif // _WIN32 +#if defined(HAVE_LIBINTL) bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); +#endif // HAVE_LIBINTL #ifdef HAVE_LIBCURL trace("%s.curl_global_init",__FUNCTION__);