1 |
commit: e3d5e26c56739a1e29c8273bcee37cf6ab504ed1 |
2 |
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 23 09:39:29 2022 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 23 09:41:52 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d5e26c |
7 |
|
8 |
dev-util/edi: meson-0.61.1 fix |
9 |
|
10 |
Closes: https://bugs.gentoo.org/831771 |
11 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
12 |
|
13 |
dev-util/edi/edi-0.8.0-r2.ebuild | 64 ++++++++++++++++++++++ |
14 |
.../edi/files/edi-0.8.0-meson-0.61.1-fix.patch | 15 +++++ |
15 |
2 files changed, 79 insertions(+) |
16 |
|
17 |
diff --git a/dev-util/edi/edi-0.8.0-r2.ebuild b/dev-util/edi/edi-0.8.0-r2.ebuild |
18 |
new file mode 100644 |
19 |
index 000000000000..0c099bffe9de |
20 |
--- /dev/null |
21 |
+++ b/dev-util/edi/edi-0.8.0-r2.ebuild |
22 |
@@ -0,0 +1,64 @@ |
23 |
+# Copyright 1999-2022 Gentoo Authors |
24 |
+# Distributed under the terms of the GNU General Public License v2 |
25 |
+ |
26 |
+EAPI=7 |
27 |
+ |
28 |
+inherit llvm meson xdg |
29 |
+ |
30 |
+DESCRIPTION="An EFL-based IDE" |
31 |
+HOMEPAGE="https://www.enlightenment.org/about-edi |
32 |
+ https://phab.enlightenment.org/w/projects/edi/ |
33 |
+ https://github.com/Enlightenment/edi" |
34 |
+SRC_URI="https://github.com/Enlightenment/edi/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
35 |
+ |
36 |
+LICENSE="GPL-2 GPL-3 LGPL-2.1-with-linking-exception" |
37 |
+SLOT="0" |
38 |
+KEYWORDS="~amd64 ~x86" |
39 |
+IUSE="clang" |
40 |
+ |
41 |
+RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] ) |
42 |
+ >=dev-libs/efl-1.22.0[eet] |
43 |
+ clang? ( |
44 |
+ dev-util/bear |
45 |
+ sys-devel/clang:= |
46 |
+ )" |
47 |
+DEPEND="${RDEPEND} |
48 |
+ dev-libs/check" |
49 |
+BDEPEND="virtual/libintl |
50 |
+ virtual/pkgconfig" |
51 |
+ |
52 |
+PATCHES=( "${FILESDIR}"/edi-0.8.0-meson-0.61.1-fix.patch ) |
53 |
+ |
54 |
+llvm_check_deps() { |
55 |
+ has_version "sys-devel/clang:${LLVM_SLOT}" |
56 |
+} |
57 |
+ |
58 |
+pkg_setup() { |
59 |
+ use clang && llvm_pkg_setup |
60 |
+} |
61 |
+ |
62 |
+src_prepare() { |
63 |
+ default |
64 |
+ |
65 |
+ # fix a QA issue with .desktop file, https://phab.enlightenment.org/T7368 |
66 |
+ sed -i '/Version=/d' data/desktop/edi.desktop* || die |
67 |
+ |
68 |
+ # fix 'unexpected path' QA warning |
69 |
+ sed -i 's|share/doc/edi/|share/doc/'${PF}'/|g' doc/meson.build || die |
70 |
+} |
71 |
+ |
72 |
+src_configure() { |
73 |
+ local emesonargs=( |
74 |
+ $(meson_use clang bear) |
75 |
+ $(meson_use clang libclang) |
76 |
+ ) |
77 |
+ |
78 |
+ if use clang; then |
79 |
+ emesonargs+=( |
80 |
+ -D libclang-headerdir="$(llvm-config --includedir)" |
81 |
+ -D libclang-libdir="$(llvm-config --libdir)" |
82 |
+ ) |
83 |
+ fi |
84 |
+ |
85 |
+ meson_src_configure |
86 |
+} |
87 |
|
88 |
diff --git a/dev-util/edi/files/edi-0.8.0-meson-0.61.1-fix.patch b/dev-util/edi/files/edi-0.8.0-meson-0.61.1-fix.patch |
89 |
new file mode 100644 |
90 |
index 000000000000..8b829b5364ee |
91 |
--- /dev/null |
92 |
+++ b/dev-util/edi/files/edi-0.8.0-meson-0.61.1-fix.patch |
93 |
@@ -0,0 +1,15 @@ |
94 |
+diff -Naur a/data/extra/templates/meson.build b/data/extra/templates/meson.build |
95 |
+--- a/data/extra/templates/meson.build 2020-04-29 16:40:58.000000000 +0300 |
96 |
++++ b/data/extra/templates/meson.build 2022-02-23 11:27:30.271380219 +0200 |
97 |
+@@ -6,10 +6,9 @@ |
98 |
+ foreach skeleton_name : skeleton_names |
99 |
+ |
100 |
+ custom_target('skeleton ' + skeleton_name, |
101 |
+- command : [tar, 'zcf', '@OUTPUT@', '-C', |
102 |
++ command : [tar, 'zcf', '@OUTPUT@', '-C', |
103 |
+ join_paths(meson.source_root(), 'data', 'extra', 'templates', 'skeletons'), |
104 |
+ skeleton_name], |
105 |
+- input : join_paths('skeletons', skeleton_name), |
106 |
+ output : skeleton_name + '.tar.gz', |
107 |
+ install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'edi', 'templates'), |
108 |
+ install : true, |