1 |
commit: d41dc78fb2b884572e7f8120f83cb133b25f1321 |
2 |
Author: Huang Rui <vowstar <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Mar 15 11:47:32 2023 +0000 |
4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 15 11:49:38 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d41dc78f |
7 |
|
8 |
sci-electronics/slang: fix pkgconfig |
9 |
|
10 |
Signed-off-by: Huang Rui <vowstar <AT> gmail.com> |
11 |
|
12 |
.../slang/files/slang-2.0-fix-pkgconfig.patch | 19 +++++++++++++++++++ |
13 |
sci-electronics/slang/slang-2.0.ebuild | 3 ++- |
14 |
sci-electronics/slang/slang-9999.ebuild | 7 +------ |
15 |
3 files changed, 22 insertions(+), 7 deletions(-) |
16 |
|
17 |
diff --git a/sci-electronics/slang/files/slang-2.0-fix-pkgconfig.patch b/sci-electronics/slang/files/slang-2.0-fix-pkgconfig.patch |
18 |
new file mode 100644 |
19 |
index 000000000..8f0a1378f |
20 |
--- /dev/null |
21 |
+++ b/sci-electronics/slang/files/slang-2.0-fix-pkgconfig.patch |
22 |
@@ -0,0 +1,19 @@ |
23 |
+From b821c33c391814ac332d6a85783179e084d1345a Mon Sep 17 00:00:00 2001 |
24 |
+From: Nick Gasson <nick@××××××××.uk> |
25 |
+Date: Sun, 20 Nov 2022 21:23:24 +0000 |
26 |
+Subject: [PATCH] Fix library name in sv-lang.pc.in (#661) |
27 |
+ |
28 |
+--- |
29 |
+ scripts/sv-lang.pc.in | 2 +- |
30 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
31 |
+ |
32 |
+diff --git a/scripts/sv-lang.pc.in b/scripts/sv-lang.pc.in |
33 |
+index eabfbc9a..fc6191b7 100644 |
34 |
+--- a/scripts/sv-lang.pc.in |
35 |
++++ b/scripts/sv-lang.pc.in |
36 |
+@@ -7,4 +7,4 @@ Description: @PROJECT_DESCRIPTION@ |
37 |
+ URL: @PROJECT_HOMEPAGE_URL@ |
38 |
+ Version: @PROJECT_VERSION@ |
39 |
+ Cflags: -I"${includedir}" |
40 |
+-Libs: -L"${libdir}" -lslang |
41 |
++Libs: -L"${libdir}" -lsvlang |
42 |
|
43 |
diff --git a/sci-electronics/slang/slang-2.0.ebuild b/sci-electronics/slang/slang-2.0.ebuild |
44 |
index b6c5846a5..bdbf27dfd 100644 |
45 |
--- a/sci-electronics/slang/slang-2.0.ebuild |
46 |
+++ b/sci-electronics/slang/slang-2.0.ebuild |
47 |
@@ -1,4 +1,4 @@ |
48 |
-# Copyright 1999-2022 Gentoo Authors |
49 |
+# Copyright 1999-2023 Gentoo Authors |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
|
52 |
EAPI="8" |
53 |
@@ -44,6 +44,7 @@ DEPEND=" |
54 |
PATCHES=( |
55 |
"${FILESDIR}/${PN}-2.0-fix-unordered-dense.patch" |
56 |
"${FILESDIR}/${PN}-2.0-renamed-svlang.patch" |
57 |
+ "${FILESDIR}/${PN}-2.0-fix-pkgconfig.patch" |
58 |
) |
59 |
|
60 |
src_configure() { |
61 |
|
62 |
diff --git a/sci-electronics/slang/slang-9999.ebuild b/sci-electronics/slang/slang-9999.ebuild |
63 |
index b6c5846a5..37cbea2e0 100644 |
64 |
--- a/sci-electronics/slang/slang-9999.ebuild |
65 |
+++ b/sci-electronics/slang/slang-9999.ebuild |
66 |
@@ -1,4 +1,4 @@ |
67 |
-# Copyright 1999-2022 Gentoo Authors |
68 |
+# Copyright 1999-2023 Gentoo Authors |
69 |
# Distributed under the terms of the GNU General Public License v2 |
70 |
|
71 |
EAPI="8" |
72 |
@@ -41,11 +41,6 @@ DEPEND=" |
73 |
${RDEPEND} |
74 |
" |
75 |
|
76 |
-PATCHES=( |
77 |
- "${FILESDIR}/${PN}-2.0-fix-unordered-dense.patch" |
78 |
- "${FILESDIR}/${PN}-2.0-renamed-svlang.patch" |
79 |
-) |
80 |
- |
81 |
src_configure() { |
82 |
python_setup |
83 |
# SLANG_SHARED_LIB_NAME=svlang because of name collision |