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

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 (file)
index 0000000..3703bec
--- /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
+ {

diff --git a/app-admin/syslog-ng/syslog-ng-3.12.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild
similarity index 98%
rename from app-admin/syslog-ng/syslog-ng-3.12.1-r1.ebuild
rename to app-admin/syslog-ng/syslog-ng-3.12.1.ebuild
index 55136f58ec401405cd7560d3652e950edff69098..b608df786967159dee3692e90d5c3a62ea191ab7 100644 (file)
--- a/app-admin/syslog-ng/syslog-ng-3.12.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.12.1.ebuild
@@ -43,6 +43,10 @@ DEPEND="${RDEPEND}
        sys-devel/flex
        virtual/pkgconfig"
 
+PATCHES=(
+       "${FILESDIR}"/patches/${PN}-3.12.1-json-c-0.13+.patch
+)
+
 S=${WORKDIR}/${PN}-${MY_PV}
 
 pkg_setup() {
@@ -59,7 +63,6 @@ src_prepare() {
 
        if use !json ; then
                sed -i -e '/cim/d' scl/Makefile.am || die
-               eautoreconf
        fi
 
        for f in "${FILESDIR}"/*logrotate*.in ; do
@@ -73,6 +76,8 @@ src_prepare() {
        done
 
        default
+
+       eautoreconf
 }
 
 src_configure() {

diff --git a/app-admin/syslog-ng/syslog-ng-3.13.2-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
similarity index 98%
rename from app-admin/syslog-ng/syslog-ng-3.13.2-r1.ebuild
rename to app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
index 2f5ba1e3a39d9b7f75465f84d6268c1230487c96..ddb99e5c2c899eccaa6aba0e194475bfc6045470 100644 (file)
--- a/app-admin/syslog-ng/syslog-ng-3.13.2-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
@@ -43,6 +43,10 @@ DEPEND="${RDEPEND}
        sys-devel/flex
        virtual/pkgconfig"
 
+PATCHES=(
+       "${FILESDIR}"/patches/${PN}-3.12.1-json-c-0.13+.patch
+)
+
 S=${WORKDIR}/${PN}-${MY_PV}
 
 pkg_setup() {
@@ -60,7 +64,6 @@ src_prepare() {
        # drop scl modules requiring json
        if use !json; then
                sed -i -r '/cim|ewmm|graylog2/d' scl/Makefile.am || die
-               eautoreconf
        fi
 
        # use gentoo default path
@@ -80,6 +83,8 @@ src_prepare() {
        done
 
        default
+
+       eautoreconf
 }
 
 src_configure() {