| 1 |
commit: 38fd71ad2ae1f16eeb54b3f3a72bd665c0bc9eac |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Aug 13 08:34:49 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 13 11:27:21 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38fd71ad |
| 7 |
|
| 8 |
dev-libs/json-c: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/5401 |
| 11 |
|
| 12 |
.../json-c/files/json-c-0.10-automake-1.13.patch | 31 ---------------------- |
| 13 |
dev-libs/json-c/files/json-c-0.10-flags.patch | 6 ----- |
| 14 |
dev-libs/json-c/files/json-c-0.10-headers.patch | 27 ------------------- |
| 15 |
3 files changed, 64 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
deleted file mode 100644 |
| 19 |
index 285c68b8b8a..00000000000 |
| 20 |
--- a/dev-libs/json-c/files/json-c-0.10-automake-1.13.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,31 +0,0 @@ |
| 23 |
-https://github.com/json-c/json-c/commit/36ec47db49277f4a5eda30823cf6d1f238f34991 |
| 24 |
- |
| 25 |
-From 36ec47db49277f4a5eda30823cf6d1f238f34991 Mon Sep 17 00:00:00 2001 |
| 26 |
-From: =?UTF-8?q?Thomas=20Gst=C3=A4dtner?= <thomas@××××××××××.net> |
| 27 |
-Date: Sun, 3 Mar 2013 00:17:25 +0100 |
| 28 |
-Subject: [PATCH] configure.in: mv AM_CONFIG_HEADER to AC_CONFIG_HEADER |
| 29 |
- |
| 30 |
-the former has been deprecated and does not work on newer autoconf |
| 31 |
-versions. |
| 32 |
---- |
| 33 |
- configure.in | 4 ++-- |
| 34 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
| 35 |
- |
| 36 |
-diff --git a/configure.in b/configure.in |
| 37 |
-index 1a428b6..d68d7a1 100644 |
| 38 |
---- a/configure.in |
| 39 |
-+++ b/configure.in |
| 40 |
-@@ -20,8 +20,8 @@ AM_CONDITIONAL(ENABLE_OLDNAME_COMPAT, [test "x${enable_oldname_compat}" != "xno" |
| 41 |
- # Checks for libraries. |
| 42 |
- |
| 43 |
- # Checks for header files. |
| 44 |
--AM_CONFIG_HEADER(config.h) |
| 45 |
--AM_CONFIG_HEADER(json_config.h) |
| 46 |
-+AC_CONFIG_HEADER(config.h) |
| 47 |
-+AC_CONFIG_HEADER(json_config.h) |
| 48 |
- AC_HEADER_STDC |
| 49 |
- AC_CHECK_HEADERS(fcntl.h limits.h strings.h syslog.h unistd.h [sys/cdefs.h] [sys/param.h] stdarg.h locale.h) |
| 50 |
- AC_CHECK_HEADER(inttypes.h,[AC_DEFINE([JSON_C_HAVE_INTTYPES_H],[1],[Public define for json_inttypes.h])]) |
| 51 |
--- |
| 52 |
-1.8.1.6 |
| 53 |
- |
| 54 |
|
| 55 |
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 |
| 56 |
deleted file mode 100644 |
| 57 |
index 8634f870177..00000000000 |
| 58 |
--- a/dev-libs/json-c/files/json-c-0.10-flags.patch |
| 59 |
+++ /dev/null |
| 60 |
@@ -1,6 +0,0 @@ |
| 61 |
---- json-c-0.10/Makefile.am.inc |
| 62 |
-+++ json-c-0.10/Makefile.am.inc |
| 63 |
-@@ -1,2 +1,2 @@ |
| 64 |
--AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT |
| 65 |
-+AM_CFLAGS = -Wall -Wwrite-strings -std=gnu99 -D_GNU_SOURCE -D_REENTRANT |
| 66 |
- |
| 67 |
|
| 68 |
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 |
| 69 |
deleted file mode 100644 |
| 70 |
index f3486739b9d..00000000000 |
| 71 |
--- a/dev-libs/json-c/files/json-c-0.10-headers.patch |
| 72 |
+++ /dev/null |
| 73 |
@@ -1,27 +0,0 @@ |
| 74 |
---- json-c-0.10/json.pc.in |
| 75 |
-+++ json-c-0.10/json.pc.in |
| 76 |
-@@ -8,4 +8,4 @@ |
| 77 |
- Version: @VERSION@ |
| 78 |
- Requires: |
| 79 |
- Libs: -L${libdir} -ljson |
| 80 |
--Cflags: -I${includedir}/json |
| 81 |
-+Cflags: -I${includedir}/json-c |
| 82 |
---- json-c-0.10/Makefile.am |
| 83 |
-+++ json-c-0.10/Makefile.am |
| 84 |
-@@ -8,7 +8,7 @@ |
| 85 |
- pkgconfigdir = $(libdir)/pkgconfig |
| 86 |
- pkgconfig_DATA = json.pc |
| 87 |
- |
| 88 |
--libjsonincludedir = $(includedir)/json |
| 89 |
-+libjsonincludedir = $(includedir)/json-c |
| 90 |
- libjsoninclude_HEADERS = \ |
| 91 |
- arraylist.h \ |
| 92 |
- bits.h \ |
| 93 |
-@@ -17,6 +17,7 @@ |
| 94 |
- json_config.h \ |
| 95 |
- json_inttypes.h \ |
| 96 |
- json_object.h \ |
| 97 |
-+ json_object_iterator.h \ |
| 98 |
- json_object_private.h \ |
| 99 |
- json_tokener.h \ |
| 100 |
- json_util.h \ |
Archives