diff options
| author | spz <spz@pkgsrc.org> | 2015-06-13 10:50:01 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2015-06-13 10:50:01 +0000 |
| commit | a2d9cf5d5784c6c92ea8cb0b78599d1e16d1dc82 (patch) | |
| tree | 485912be8a02db63f3b4eaf13799f91667ba97df | |
| parent | 63652f954df220fb9574f8983ddf0a7ef0715a54 (diff) | |
| download | pkgsrc-a2d9cf5d5784c6c92ea8cb0b78599d1e16d1dc82.tar.gz | |
Pullup ticket #4741 - requested by tron
security/gnutls: build fix
Revisions pulled up:
- security/gnutls/distinfo 1.115
- security/gnutls/patches/patch-src_libopts_libopts.c 1.1
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: joerg
Date: Mon Jun 8 13:44:57 UTC 2015
Modified Files:
pkgsrc/security/gnutls: distinfo
Added Files:
pkgsrc/security/gnutls/patches: patch-src_libopts_libopts.c
Log Message:
Workaround gettext context function definition mess to unbreak
NetBSD/current.
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/security/gnutls/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/security/gnutls/patches/patch-src_libopts_libopts.c
| -rw-r--r-- | security/gnutls/distinfo | 3 | ||||
| -rw-r--r-- | security/gnutls/patches/patch-src_libopts_libopts.c | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo index e4cbb22097b..8cfb8aff4f5 100644 --- a/security/gnutls/distinfo +++ b/security/gnutls/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.112 2015/02/11 11:25:57 adam Exp $ +$NetBSD: distinfo,v 1.112.2.1 2015/06/13 10:50:01 spz Exp $ SHA1 (gnutls-3.2.21.tar.xz) = fa12e643ad21bcaf450d534f262c813d75843966 RMD160 (gnutls-3.2.21.tar.xz) = 8d3b7817dcd28d3c4f1e3ad0d014ab7891daa7f9 @@ -10,6 +10,7 @@ SHA1 (patch-lib_nettle_rnd.c) = bbce9bbb61d2be625585f6c8ed5bda95f3a80344 SHA1 (patch-lib_system.h) = fb67be62f1e889a665a65ab151ced24fa1ab3e2e SHA1 (patch-src_libopts_autoopts_options.h) = 60be5b43f23ba5978759c1e245781da7f9125071 SHA1 (patch-src_libopts_compat_compat.h) = 2e0a1be460917b2d7a8f6bdac698dad405143013 +SHA1 (patch-src_libopts_libopts.c) = ce5e7681def882e95ed5ab770564d1f999b97039 SHA1 (patch-src_libopts_makeshell.c) = c94e717027d078a081acd10eaec51a44dc4d42e1 SHA1 (patch-src_libopts_proto.h) = 9749cc4bd080e1a8d800bde181143acb9c340ec8 SHA1 (patch-tests_Makefile.in) = 0c2e37c632686301855cf6d0ed09583e797ae4e3 diff --git a/security/gnutls/patches/patch-src_libopts_libopts.c b/security/gnutls/patches/patch-src_libopts_libopts.c new file mode 100644 index 00000000000..53e97ac23c1 --- /dev/null +++ b/security/gnutls/patches/patch-src_libopts_libopts.c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_libopts_libopts.c,v 1.1.2.2 2015/06/13 10:50:01 spz Exp $ + +Workaround broken gettext.h conflicting with native implementation of +message contexts in NetBSD. + +--- src/libopts/libopts.c.orig 2015-06-08 13:12:30.000000000 +0000 ++++ src/libopts/libopts.c +@@ -1,3 +1,7 @@ ++#include <config.h> ++#if ENABLE_NLS ++#include <gettext.h> ++#endif + #define AUTOOPTS_INTERNAL 1 + #include "autoopts/project.h" + #define LOCAL static |