1 |
commit: ab035b1dbd390143b3f34ac7084790e1fbfb2769 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Mar 27 18:44:35 2018 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 30 17:14:23 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab035b1d |
7 |
|
8 |
dev-libs/jsoncpp: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/7656 |
11 |
|
12 |
dev-libs/jsoncpp/files/jsoncpp-0.10.2-arm.patch | 25 ---------- |
13 |
.../files/jsoncpp-1.6.2-fix-pkgconfig.patch | 55 ---------------------- |
14 |
2 files changed, 80 deletions(-) |
15 |
|
16 |
diff --git a/dev-libs/jsoncpp/files/jsoncpp-0.10.2-arm.patch b/dev-libs/jsoncpp/files/jsoncpp-0.10.2-arm.patch |
17 |
deleted file mode 100644 |
18 |
index 838ef848794..00000000000 |
19 |
--- a/dev-libs/jsoncpp/files/jsoncpp-0.10.2-arm.patch |
20 |
+++ /dev/null |
21 |
@@ -1,25 +0,0 @@ |
22 |
-From 96412d2964775fd6fb9bf359936743dd508af8ba Mon Sep 17 00:00:00 2001 |
23 |
-From: Christopher Dunn <cdunn2001@×××××.com> |
24 |
-Date: Wed, 10 Jun 2015 21:22:24 -0500 |
25 |
-Subject: [PATCH] fix #290 |
26 |
- |
27 |
-(cherry picked from commit 2760c7902a5cc7173aabe4e1f31dcf93e79377d5) |
28 |
---- |
29 |
- src/test_lib_json/main.cpp | 3 +++ |
30 |
- 1 file changed, 3 insertions(+) |
31 |
- |
32 |
-diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp |
33 |
-index 85110ad..080ba6e 100644 |
34 |
---- a/src/test_lib_json/main.cpp |
35 |
-+++ b/src/test_lib_json/main.cpp |
36 |
-@@ -296,7 +296,10 @@ JSONTEST_FIXTURE(ValueTest, null) { |
37 |
- JSONTEST_ASSERT_EQUAL(0.0, null_.asFloat()); |
38 |
- JSONTEST_ASSERT_STRING_EQUAL("", null_.asString()); |
39 |
- |
40 |
-+#if !defined(__ARMEL__) |
41 |
-+ // See line #165 of include/json/value.h |
42 |
- JSONTEST_ASSERT_EQUAL(Json::Value::null, null_); |
43 |
-+#endif |
44 |
- } |
45 |
- |
46 |
- JSONTEST_FIXTURE(ValueTest, strings) { |
47 |
|
48 |
diff --git a/dev-libs/jsoncpp/files/jsoncpp-1.6.2-fix-pkgconfig.patch b/dev-libs/jsoncpp/files/jsoncpp-1.6.2-fix-pkgconfig.patch |
49 |
deleted file mode 100644 |
50 |
index 5c3420e4500..00000000000 |
51 |
--- a/dev-libs/jsoncpp/files/jsoncpp-1.6.2-fix-pkgconfig.patch |
52 |
+++ /dev/null |
53 |
@@ -1,55 +0,0 @@ |
54 |
-From e6f1cffdd3fb04a0ed96319e6f8df6a7cbdd1557 Mon Sep 17 00:00:00 2001 |
55 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
56 |
-Date: Tue, 19 May 2015 17:32:31 +0200 |
57 |
-Subject: [PATCH] Fix custom includedir & libdir substitution in pkg-config |
58 |
-MIME-Version: 1.0 |
59 |
-Content-Type: text/plain; charset=UTF-8 |
60 |
-Content-Transfer-Encoding: 8bit |
61 |
- |
62 |
-Do not prepend ${prefix} to substituted includedir & libdir |
63 |
-in the pkg-config file -- if the paths are overriden by user, CMake puts |
64 |
-absolute paths there (even if user specifies a relative path). Instead, |
65 |
-use the absolute path provided by CMake and appropriately default |
66 |
-LIBRARY_INSTALL_DIR & INCLUDE_INSTALL_DIR to absolute paths with |
67 |
-${CMAKE_INSTALL_PREFIX} prepended. |
68 |
- |
69 |
-Fixes: https://github.com/open-source-parsers/jsoncpp/issues/279 |
70 |
-Signed-off-by: Michał Górny <mgorny@g.o> |
71 |
---- |
72 |
- CMakeLists.txt | 6 +++--- |
73 |
- pkg-config/jsoncpp.pc.in | 4 ++-- |
74 |
- 2 files changed, 5 insertions(+), 5 deletions(-) |
75 |
- |
76 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
77 |
-index 30038d5..d31a6ad 100644 |
78 |
---- a/CMakeLists.txt |
79 |
-+++ b/CMakeLists.txt |
80 |
-@@ -25,11 +25,11 @@ SET(LIB_SUFFIX "" CACHE STRING "Optional arch-dependent suffix for the library i |
81 |
- |
82 |
- SET(RUNTIME_INSTALL_DIR bin |
83 |
- CACHE PATH "Install dir for executables and dlls") |
84 |
--SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX} |
85 |
-+SET(ARCHIVE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} |
86 |
- CACHE PATH "Install dir for static libraries") |
87 |
--SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX} |
88 |
-+SET(LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} |
89 |
- CACHE PATH "Install dir for shared libraries") |
90 |
--SET(INCLUDE_INSTALL_DIR include |
91 |
-+SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include |
92 |
- CACHE PATH "Install dir for headers") |
93 |
- SET(PACKAGE_INSTALL_DIR lib${LIB_SUFFIX}/cmake |
94 |
- CACHE PATH "Install dir for cmake package config files") |
95 |
-diff --git a/pkg-config/jsoncpp.pc.in b/pkg-config/jsoncpp.pc.in |
96 |
-index 9613181..3ca4a84 100644 |
97 |
---- a/pkg-config/jsoncpp.pc.in |
98 |
-+++ b/pkg-config/jsoncpp.pc.in |
99 |
-@@ -1,7 +1,7 @@ |
100 |
- prefix=@CMAKE_INSTALL_PREFIX@ |
101 |
- exec_prefix=${prefix} |
102 |
--libdir=${exec_prefix}/@LIBRARY_INSTALL_DIR@ |
103 |
--includedir=${prefix}/@INCLUDE_INSTALL_DIR@ |
104 |
-+libdir=@LIBRARY_INSTALL_DIR@ |
105 |
-+includedir=@INCLUDE_INSTALL_DIR@ |
106 |
- |
107 |
- Name: jsoncpp |
108 |
- Description: A C++ library for interacting with JSON |