commit: 38fd71ad2ae1f16eeb54b3f3a72bd665c0bc9eac Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sun Aug 13 08:34:49 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Aug 13 11:27:21 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38fd71ad
dev-libs/json-c: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/5401 .../json-c/files/json-c-0.10-automake-1.13.patch | 31 ---------------------- dev-libs/json-c/files/json-c-0.10-flags.patch | 6 ----- dev-libs/json-c/files/json-c-0.10-headers.patch | 27 ------------------- 3 files changed, 64 deletions(-) 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 deleted file mode 100644 index 285c68b8b8a..00000000000 --- a/dev-libs/json-c/files/json-c-0.10-automake-1.13.patch +++ /dev/null @@ -1,31 +0,0 @@ -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?= <tho...@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/files/json-c-0.10-flags.patch b/dev-libs/json-c/files/json-c-0.10-flags.patch deleted file mode 100644 index 8634f870177..00000000000 --- a/dev-libs/json-c/files/json-c-0.10-flags.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- json-c-0.10/Makefile.am.inc -+++ json-c-0.10/Makefile.am.inc -@@ -1,2 +1,2 @@ --AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT -+AM_CFLAGS = -Wall -Wwrite-strings -std=gnu99 -D_GNU_SOURCE -D_REENTRANT - diff --git a/dev-libs/json-c/files/json-c-0.10-headers.patch b/dev-libs/json-c/files/json-c-0.10-headers.patch deleted file mode 100644 index f3486739b9d..00000000000 --- a/dev-libs/json-c/files/json-c-0.10-headers.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- json-c-0.10/json.pc.in -+++ json-c-0.10/json.pc.in -@@ -8,4 +8,4 @@ - Version: @VERSION@ - Requires: - Libs: -L${libdir} -ljson --Cflags: -I${includedir}/json -+Cflags: -I${includedir}/json-c ---- json-c-0.10/Makefile.am -+++ json-c-0.10/Makefile.am -@@ -8,7 +8,7 @@ - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = json.pc - --libjsonincludedir = $(includedir)/json -+libjsonincludedir = $(includedir)/json-c - libjsoninclude_HEADERS = \ - arraylist.h \ - bits.h \ -@@ -17,6 +17,7 @@ - json_config.h \ - json_inttypes.h \ - json_object.h \ -+ json_object_iterator.h \ - json_object_private.h \ - json_tokener.h \ - json_util.h \
