1 |
commit: bebab38678b84cc6bc2793d20be80ea74efc4863 |
2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 1 09:24:44 2023 +0000 |
4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 1 09:24:44 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bebab386 |
7 |
|
8 |
dev-cpp/json11: fix pkg-config file |
9 |
|
10 |
Closes: https://bugs.gentoo.org/863098 |
11 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
12 |
|
13 |
...1.0.0-json11.pc-do-not-state-the-defaults.patch | 22 ++++++++++++++++++++++ |
14 |
dev-cpp/json11/json11-1.0.0-r1.ebuild | 19 +++++++++++++++++++ |
15 |
2 files changed, 41 insertions(+) |
16 |
|
17 |
diff --git a/dev-cpp/json11/files/json11-1.0.0-json11.pc-do-not-state-the-defaults.patch b/dev-cpp/json11/files/json11-1.0.0-json11.pc-do-not-state-the-defaults.patch |
18 |
new file mode 100644 |
19 |
index 000000000000..76b1591d1150 |
20 |
--- /dev/null |
21 |
+++ b/dev-cpp/json11/files/json11-1.0.0-json11.pc-do-not-state-the-defaults.patch |
22 |
@@ -0,0 +1,22 @@ |
23 |
+From d98236beaf015f2693589fca1904fb0dd01b2e6d Mon Sep 17 00:00:00 2001 |
24 |
+From: Florian Schmaus <flo@×××××××××.eu> |
25 |
+Date: Wed, 1 Mar 2023 10:16:49 +0100 |
26 |
+Subject: [PATCH] json11.pc: do not state the defaults |
27 |
+ |
28 |
+This appearantly breaks multi-arch installations. See |
29 |
+https://bugs.gentoo.org/863098 |
30 |
+ |
31 |
+Suggested-by: Thomas Scheider <qsx@×××××××××.eu> |
32 |
+Signed-off-by: Florian Schmaus <flow@g.o> |
33 |
+--- a/json11.pc.in |
34 |
++++ b/json11.pc.in |
35 |
+@@ -5,5 +5,4 @@ includedir=${prefix}/include/@CMAKE_LIBRARY_ARCHITECTURE@ |
36 |
+ Name: @PROJECT_NAME@ |
37 |
+ Description: json11 is a tiny JSON library for C++11, providing JSON parsing and serialization. |
38 |
+ Version: @PROJECT_VERSION@ |
39 |
+-Libs: -L${libdir} -ljson11 |
40 |
+-Cflags: -I${includedir} |
41 |
++Libs: -ljson11 |
42 |
+-- |
43 |
+2.39.2 |
44 |
+ |
45 |
|
46 |
diff --git a/dev-cpp/json11/json11-1.0.0-r1.ebuild b/dev-cpp/json11/json11-1.0.0-r1.ebuild |
47 |
new file mode 100644 |
48 |
index 000000000000..31d7acab3239 |
49 |
--- /dev/null |
50 |
+++ b/dev-cpp/json11/json11-1.0.0-r1.ebuild |
51 |
@@ -0,0 +1,19 @@ |
52 |
+# Copyright 2022-2023 Gentoo Authors |
53 |
+# Distributed under the terms of the GNU General Public License v2 |
54 |
+ |
55 |
+EAPI=8 |
56 |
+ |
57 |
+inherit cmake |
58 |
+ |
59 |
+DESCRIPTION="A tiny JSON library for C++11" |
60 |
+HOMEPAGE="https://github.com/dropbox/json11" |
61 |
+SRC_URI="https://github.com/dropbox/json11/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" |
62 |
+ |
63 |
+LICENSE="MIT" |
64 |
+SLOT="0" |
65 |
+KEYWORDS="~amd64 ~x86" |
66 |
+ |
67 |
+PATCHES=( |
68 |
+ "${FILESDIR}"/${P}-fix-multiarch-install.patch |
69 |
+ "${FILESDIR}"/${PN}-1.0.0-json11.pc-do-not-state-the-defaults.patch |
70 |
+) |