diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2013-04-29 18:51:02 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2013-04-29 18:51:02 +0000 |
| commit | a9f3ee3893a7ca3f62a7b2000a1c8a309ba74d1e (patch) | |
| tree | 1f4b5d0523406e931307693b3046242a019a79c6 /dev-libs/json-c | |
| parent | Add webm/webp formats. (diff) | |
| download | gentoo-2-a9f3ee3893a7ca3f62a7b2000a1c8a309ba74d1e.tar.gz gentoo-2-a9f3ee3893a7ca3f62a7b2000a1c8a309ba74d1e.tar.bz2 gentoo-2-a9f3ee3893a7ca3f62a7b2000a1c8a309ba74d1e.zip | |
Backport upstream patch for automake-1.13 to json-c-0.10. Bug #466960
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)
Diffstat (limited to 'dev-libs/json-c')
| -rw-r--r-- | dev-libs/json-c/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/json-c/files/json-c-0.10-automake-1.13.patch | 31 | ||||
| -rw-r--r-- | dev-libs/json-c/json-c-0.10-r1.ebuild | 4 |
3 files changed, 39 insertions, 2 deletions
diff --git a/dev-libs/json-c/ChangeLog b/dev-libs/json-c/ChangeLog index bf632dfcbfbf..3ea2bcb6e212 100644 --- a/dev-libs/json-c/ChangeLog +++ b/dev-libs/json-c/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/json-c # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/ChangeLog,v 1.27 2013/04/25 19:21:56 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/ChangeLog,v 1.28 2013/04/29 18:51:01 hwoarang Exp $ + + 29 Apr 2013; Markos Chandras <hwoarang@gentoo.org> + +files/json-c-0.10-automake-1.13.patch, json-c-0.10-r1.ebuild: + Backport upstream patch for automake-1.13 to json-c-0.10. Bug #466960 *json-c-0.11 (25 Apr 2013) diff --git a/dev-libs/json-c/files/json-c-0.10-automake-1.13.patch b/dev-libs/json-c/files/json-c-0.10-automake-1.13.patch new file mode 100644 index 000000000000..285c68b8b8aa --- /dev/null +++ b/dev-libs/json-c/files/json-c-0.10-automake-1.13.patch @@ -0,0 +1,31 @@ +https://github.com/json-c/json-c/commit/36ec47db49277f4a5eda30823cf6d1f238f34991 + +From 36ec47db49277f4a5eda30823cf6d1f238f34991 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Gst=C3=A4dtner?= <thomas@gstaedtner.net> +Date: Sun, 3 Mar 2013 00:17:25 +0100 +Subject: [PATCH] configure.in: mv AM_CONFIG_HEADER to AC_CONFIG_HEADER + +the former has been deprecated and does not work on newer autoconf +versions. +--- + configure.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 1a428b6..d68d7a1 100644 +--- a/configure.in ++++ b/configure.in +@@ -20,8 +20,8 @@ AM_CONDITIONAL(ENABLE_OLDNAME_COMPAT, [test "x${enable_oldname_compat}" != "xno" + # Checks for libraries. + + # Checks for header files. +-AM_CONFIG_HEADER(config.h) +-AM_CONFIG_HEADER(json_config.h) ++AC_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADER(json_config.h) + AC_HEADER_STDC + AC_CHECK_HEADERS(fcntl.h limits.h strings.h syslog.h unistd.h [sys/cdefs.h] [sys/param.h] stdarg.h locale.h) + AC_CHECK_HEADER(inttypes.h,[AC_DEFINE([JSON_C_HAVE_INTTYPES_H],[1],[Public define for json_inttypes.h])]) +-- +1.8.1.6 + diff --git a/dev-libs/json-c/json-c-0.10-r1.ebuild b/dev-libs/json-c/json-c-0.10-r1.ebuild index f3177754ce40..da9b9b07ede9 100644 --- a/dev-libs/json-c/json-c-0.10-r1.ebuild +++ b/dev-libs/json-c/json-c-0.10-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.10-r1.ebuild,v 1.1 2013/02/01 21:16:29 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.10-r1.ebuild,v 1.2 2013/04/29 18:51:01 hwoarang Exp $ EAPI=5 @@ -22,6 +22,8 @@ PATCHES=( # bug 452234 "${FILESDIR}"/${P}-headers.patch + # bug 466960 + "${FILESDIR}"/${P}-automake-1.13.patch ) # tests break otherwise |