diff options
| author |   Tomas Mozes <hydrapolic@gmail.com> | 2017-12-19 16:30:41 +0100 |
|---|---|---|
| committer |   Thomas Deutschmann <whissi@gentoo.org> | 2017-12-20 21:44:04 +0100 |
| commit | d03a886fc569f7025ff7d97b7975c5af817ad963 (patch) | |
| tree | 7d60eef6d3e26833deea63059422ae00b4d47de1 /app-admin/syslog-ng/files | |
| parent | app-admin/syslog-ng: move dev-libs/ivykis to RDEPEND (diff) | |
| download | gentoo-d03a886fc569f7025ff7d97b7975c5af817ad963.tar.gz gentoo-d03a886fc569f7025ff7d97b7975c5af817ad963.tar.bz2 gentoo-d03a886fc569f7025ff7d97b7975c5af817ad963.zip | |
app-admin/syslog-ng: fix building with dev-libs/json-c-0.13
Closes: https://bugs.gentoo.org/641688
Package-Manager: Portage-2.3.18, Repoman-2.3.6
Diffstat (limited to 'app-admin/syslog-ng/files')
| -rw-r--r-- | app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch b/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch new file mode 100644 index 000000000000..3703bec22ba1 --- /dev/null +++ b/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch @@ -0,0 +1,33 @@ +From 1b824dd6389e209eab752d5a698c6093f311e3e3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org> +Date: Mon, 11 Dec 2017 15:46:06 +0100 +Subject: [PATCH] modules/json: Adaptions for json-c v0.13 + +--- + modules/json/json-parser.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/modules/json/json-parser.c b/modules/json/json-parser.c +index 0368ed8f7..356df48b9 100644 +--- a/modules/json/json-parser.c ++++ b/modules/json/json-parser.c +@@ -20,6 +20,8 @@ + * COPYING for details. + */ + ++#define JSON_C_VER_013 (13 << 8) ++ + #include "json-parser.h" + #include "dot-notation.h" + #include "scratch-buffers.h" +@@ -28,7 +30,10 @@ + #include <ctype.h> + + #include <json.h> ++ ++#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013) + #include <json_object_private.h> ++#endif + + typedef struct _JSONParser + { |