From 2d20341bc703ec13c86fb317dbd4ddf752f96cac Mon Sep 17 00:00:00 2001 From: Joshua Root Date: Mon, 23 Sep 2024 10:37:34 +1000 Subject: [PATCH] gss fix --- security/gss/Portfile | 4 +++- security/gss/files/_GL_INLINE.patch | 13 +++++++++++++ security/gss/files/gettext-vers.patch | 11 +++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 security/gss/files/_GL_INLINE.patch create mode 100644 security/gss/files/gettext-vers.patch diff --git a/security/gss/Portfile b/security/gss/Portfile index 3ef5b5f7d56ec..a5326e30de7fb 100644 --- a/security/gss/Portfile +++ b/security/gss/Portfile @@ -22,7 +22,9 @@ checksums rmd160 6eb222b750116d274991e79c64411ee89770f185 \ sha256 ecceabdef4cae3fce7218b2ecb83eb4227dba44b53b61b8c2b2e88ae02419c73 \ size 1548407 -patchfiles patch-fix-m4.diff +patchfiles patch-fix-m4.diff \ + gettext-vers.patch \ + _GL_INLINE.patch # We are patching .m4 files use_autoreconf yes diff --git a/security/gss/files/_GL_INLINE.patch b/security/gss/files/_GL_INLINE.patch new file mode 100644 index 0000000000000..eaa07ef50cc3d --- /dev/null +++ b/security/gss/files/_GL_INLINE.patch @@ -0,0 +1,13 @@ +--- m4/extern-inline.m4.orig 2022-08-06 22:30:53 ++++ m4/extern-inline.m4 2024-09-23 10:44:31 +@@ -71,8 +71,8 @@ + # define _GL_EXTERN_INLINE extern + # define _GL_EXTERN_INLINE_IN_USE + #else +-# define _GL_INLINE static _GL_UNUSED +-# define _GL_EXTERN_INLINE static _GL_UNUSED ++# define _GL_INLINE _GL_UNUSED static ++# define _GL_EXTERN_INLINE _GL_UNUSED static + #endif + + /* In GCC 4.6 (inclusive) to 5.1 (exclusive), diff --git a/security/gss/files/gettext-vers.patch b/security/gss/files/gettext-vers.patch new file mode 100644 index 0000000000000..ba61e4dfe7a95 --- /dev/null +++ b/security/gss/files/gettext-vers.patch @@ -0,0 +1,11 @@ +--- configure.ac.orig 2022-08-06 20:11:21 ++++ configure.ac 2024-09-24 11:17:29 +@@ -57,7 +57,7 @@ + + # Internationalization. + AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION([0.19.8]) ++AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8]) + + # https://developer.gnome.org/gtk-doc-manual/stable/settingup_autoconf.html.en + m4_ifdef([GTK_DOC_CHECK], [