1 |
commit: a0d708e1c540d2618b1a510ee65f99a1b2284fde |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 12 11:55:35 2020 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 12 12:52:17 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0d708e1 |
7 |
|
8 |
dev-util/gnome-builder: bump to 3.34.1 |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
dev-util/gnome-builder/Manifest | 2 + |
14 |
.../gnome-builder/files/3.34.1-optional-vala.patch | 42 +++++ |
15 |
dev-util/gnome-builder/gnome-builder-3.34.1.ebuild | 192 +++++++++++++++++++++ |
16 |
3 files changed, 236 insertions(+) |
17 |
|
18 |
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest |
19 |
index 808a9df9a29..ed8ab782cb7 100644 |
20 |
--- a/dev-util/gnome-builder/Manifest |
21 |
+++ b/dev-util/gnome-builder/Manifest |
22 |
@@ -1,3 +1,5 @@ |
23 |
DIST gnome-builder-3.30.3.tar.xz 9486164 BLAKE2B b983fd71b1bab31386ab8f4c3a6ff57b33afd2da5aff5e41e7d1cba388a9b6998a0f799c0843bde95f8ce0456fe46457d0c0c46622d59eeb7729d2e8868898f7 SHA512 468605dbd2bd712a76c333a974bb19ca889dfe8493c2e85101641034f3e2c8eba2c0ee2f98ad01f3466f0f42946f05790763ccfaf786d73da192d64360eec47f |
24 |
DIST gnome-builder-3.32.4-patchset.tar.xz 34740 BLAKE2B 6e29ce42b2b1878b5fcec7cf057bcdc015da8817d7f9209f4d03e02bb5837525e329d0627d4465123fb20a0a46415053d7e08b445634659123ebff12d2fb9d09 SHA512 494cf1ff370c7d86d42ec352966169e73b99556dc5a1be0bf0ec53cd78e8550897bb44187ae8f471fe3e10a85dc7d44d44c5edef0569b1d0a7dff7b5d78b1fa1 |
25 |
DIST gnome-builder-3.32.4.tar.xz 11886980 BLAKE2B a7901566238dd39fe180d1e47089d7f99018be115f407d174472a8371374361fe50f2f15cb6d496a1afa3e30117d83788944636fb6a9487d4a719442ba6ae744 SHA512 a050161465edd448b0359ff781bf97b0cda6c184ea4f89193711a1bac3c7b79f76bac0d3600e3823a86aa19538228619b5d64aea94e8a67f480b5c1f79bc3b93 |
26 |
+DIST gnome-builder-3.34.1-patchset.tar.xz 44680 BLAKE2B 91e91ac8d0fcf6b54d32ce9f1dc209ac22db790a29d724dad20e337fe1962f3d407b59e7f976f1e88277833849c962a470346bb5a308e39b637e6e9ca1dc2c2a SHA512 a114346b093976db227087743a7bbe2ca9523b64a67c95729bfeb7c3c346b3bfb4d02f5e11d36bbbaf506bc7a7f140883bdea7c78407243287bc400dfda43b57 |
27 |
+DIST gnome-builder-3.34.1.tar.xz 11974748 BLAKE2B c34a31c50b327d02632ff18d48ad59f925306901e8874e0c7811b9258c56027403de0d9dc1877c696d96037bdfcdcc27f56f59a41d232e47b330382b1dbf67e9 SHA512 886c732f20563818dcf1deb96d4277fe96a9499b999cfbc7a64286e816e9a36bb978932d36a1e764b54c2d36891b7546fa058f51e036b0fa101c0872f4ce51d8 |
28 |
|
29 |
diff --git a/dev-util/gnome-builder/files/3.34.1-optional-vala.patch b/dev-util/gnome-builder/files/3.34.1-optional-vala.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..6116de17267 |
32 |
--- /dev/null |
33 |
+++ b/dev-util/gnome-builder/files/3.34.1-optional-vala.patch |
34 |
@@ -0,0 +1,42 @@ |
35 |
+From 84249e315c4a95b3ef9421dbf8492e10422e40d9 Mon Sep 17 00:00:00 2001 |
36 |
+From: Mart Raudsepp <leio@g.o> |
37 |
+Date: Thu, 12 Mar 2020 13:28:38 +0200 |
38 |
+Subject: [PATCH] build: Make vapi generation optional |
39 |
+ |
40 |
+--- |
41 |
+ meson_options.txt | 1 + |
42 |
+ src/meson.build | 2 ++ |
43 |
+ 2 files changed, 3 insertions(+) |
44 |
+ |
45 |
+diff --git a/meson_options.txt b/meson_options.txt |
46 |
+index 8984e9f69..27f9a368b 100644 |
47 |
+--- a/meson_options.txt |
48 |
++++ b/meson_options.txt |
49 |
+@@ -13,6 +13,7 @@ option('channel', |
50 |
+ |
51 |
+ option('help', type: 'boolean', value: false) |
52 |
+ option('docs', type: 'boolean', value: false) |
53 |
++option('vapi', type: 'boolean') |
54 |
+ |
55 |
+ option('network_tests', type: 'boolean', value: true, description: 'Allow networking in unit-tests') |
56 |
+ |
57 |
+diff --git a/src/meson.build b/src/meson.build |
58 |
+index 113a142ad..b0510270b 100644 |
59 |
+--- a/src/meson.build |
60 |
++++ b/src/meson.build |
61 |
+@@ -134,6 +134,7 @@ libide_gir = gnome.generate_gir(gnome_builder, |
62 |
+ extra_args: gnome_builder_gir_extra_args, |
63 |
+ ) |
64 |
+ |
65 |
++if get_option('vapi') |
66 |
+ configure_file( |
67 |
+ input: 'libide.deps', |
68 |
+ output: 'libide-' + libide_api_version + '.deps', |
69 |
+@@ -165,3 +166,4 @@ libide_vapi = gnome.generate_vapi('libide-' + libide_api_version, |
70 |
+ |
71 |
+ # Must be after vapi generation |
72 |
+ subdir('plugins/vala-pack') |
73 |
++endif |
74 |
+-- |
75 |
+2.20.1 |
76 |
+ |
77 |
|
78 |
diff --git a/dev-util/gnome-builder/gnome-builder-3.34.1.ebuild b/dev-util/gnome-builder/gnome-builder-3.34.1.ebuild |
79 |
new file mode 100644 |
80 |
index 00000000000..694f1dc3272 |
81 |
--- /dev/null |
82 |
+++ b/dev-util/gnome-builder/gnome-builder-3.34.1.ebuild |
83 |
@@ -0,0 +1,192 @@ |
84 |
+# Copyright 1999-2020 Gentoo Authors |
85 |
+# Distributed under the terms of the GNU General Public License v2 |
86 |
+ |
87 |
+EAPI=7 |
88 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
89 |
+VALA_MIN_API_VERSION="0.36" |
90 |
+DISABLE_AUTOFORMATTING=1 |
91 |
+FORCE_PRINT_ELOG=1 |
92 |
+ |
93 |
+inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 vala virtualx xdg |
94 |
+ |
95 |
+DESCRIPTION="An IDE for writing GNOME-based software" |
96 |
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder" |
97 |
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
98 |
+ |
99 |
+# FIXME: Review licenses at some point |
100 |
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0" |
101 |
+SLOT="0" |
102 |
+KEYWORDS="~amd64 ~x86" |
103 |
+IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test vala" |
104 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
105 |
+ |
106 |
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within. |
107 |
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking. |
108 |
+# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path. |
109 |
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of |
110 |
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small |
111 |
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except. |
112 |
+ |
113 |
+# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and git plugin enabled |
114 |
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2? |
115 |
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4 |
116 |
+ |
117 |
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build |
118 |
+RDEPEND=" |
119 |
+ >=dev-libs/libdazzle-3.33.90[introspection,vala?] |
120 |
+ >=dev-libs/glib-2.61.2:2 |
121 |
+ >=x11-libs/gtk+-3.22.26:3[introspection] |
122 |
+ >=x11-libs/gtksourceview-4.0.0:4[introspection] |
123 |
+ >=dev-libs/json-glib-1.2.0 |
124 |
+ >=dev-libs/jsonrpc-glib-3.19.91[vala?] |
125 |
+ >=x11-libs/pango-1.38.0 |
126 |
+ >=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}] |
127 |
+ >=dev-libs/template-glib-3.28.0[introspection,vala?] |
128 |
+ >=x11-libs/vte-0.40.2:2.91[introspection,vala?] |
129 |
+ >=net-libs/webkit-gtk-2.12.0:4=[introspection] |
130 |
+ >=dev-libs/libxml2-2.9.0 |
131 |
+ git? ( dev-libs/libgit2[ssh,threads] |
132 |
+ >=dev-libs/libgit2-glib-0.28.0.1[ssh] |
133 |
+ ) |
134 |
+ dev-libs/libpcre:3 |
135 |
+ dev-libs/libpcre2 |
136 |
+ |
137 |
+ >=dev-libs/gobject-introspection-1.54.0:= |
138 |
+ $(python_gen_cond_dep ' |
139 |
+ >=dev-python/pygobject-3.22.0:3[${PYTHON_MULTI_USEDEP}] |
140 |
+ ') |
141 |
+ ${PYTHON_DEPS} |
142 |
+ clang? ( sys-devel/clang:= ) |
143 |
+ devhelp? ( >=dev-util/devhelp-3.25.1:= ) |
144 |
+ glade? ( >=dev-util/glade-3.22.0:3.10 ) |
145 |
+ spell? ( >=app-text/gspell-1.8:0= |
146 |
+ app-text/enchant:2 ) |
147 |
+ >=dev-util/sysprof-capture-3.33.1:3 |
148 |
+ sysprof? ( >=dev-util/sysprof-3.33.4:0/3[gtk] ) |
149 |
+ vala? ( |
150 |
+ dev-lang/vala:= |
151 |
+ $(vala_depend) |
152 |
+ ) |
153 |
+" # We use subslot operator dep on vala in addition to $(vala_depend), because we have _runtime_ |
154 |
+# usage in vala-pack plugin and need it rebuilt before removing an older vala it was built against |
155 |
+DEPEND="${RDEPEND}" |
156 |
+# TODO: runtime ctags path finding.. |
157 |
+ |
158 |
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional |
159 |
+# appstream-glib needed for validation with appstream-util with FEATURES=test |
160 |
+BDEPEND=" |
161 |
+ doc? ( dev-python/sphinx ) |
162 |
+ gtk-doc? ( dev-util/gtk-doc |
163 |
+ app-text/docbook-xml-dtd:4.3 ) |
164 |
+ test? ( |
165 |
+ dev-libs/appstream-glib |
166 |
+ sys-apps/dbus ) |
167 |
+ dev-util/desktop-file-utils |
168 |
+ dev-util/glib-utils |
169 |
+ >=dev-util/meson-0.49.2 |
170 |
+ >=sys-devel/gettext-0.19.8 |
171 |
+ virtual/pkgconfig |
172 |
+" |
173 |
+ |
174 |
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide |
175 |
+extra capabilities beyond these expressed via USE flags. Some of these |
176 |
+that are currently available with packages include: |
177 |
+ |
178 |
+* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier |
179 |
+ plugin out of the box functionality. |
180 |
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for |
181 |
+ C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic |
182 |
+ highlighting and symbol resolving support. |
183 |
+* dev-python/jedi and dev-python/lxml for more accurate Python |
184 |
+ autocompletion support. |
185 |
+* dev-util/valgrind for integration with valgrind. |
186 |
+* dev-util/meson for integration with the Meson build system. |
187 |
+* dev-util/cargo for integration with the Rust Cargo build system. |
188 |
+* dev-util/cmake for integration with the CMake build system. |
189 |
+* net-libs/nodejs[npm] for integration with the NPM package system. |
190 |
+' |
191 |
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important |
192 |
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..) |
193 |
+# jhbuild support |
194 |
+# rust language server via rls; Go via go-langserver |
195 |
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template |
196 |
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE |
197 |
+ |
198 |
+PATCHES=( |
199 |
+ "${WORKDIR}/patches" # gnome-builder-3-34 branch 2020-01-22 (commit bf485934b37) + cherry-picked meson link_whole fixes |
200 |
+ "${FILESDIR}"/${PV}-optional-vala.patch |
201 |
+) |
202 |
+ |
203 |
+llvm_check_deps() { |
204 |
+ has_version "sys-devel/clang:${LLVM_SLOT}" |
205 |
+} |
206 |
+ |
207 |
+pkg_setup() { |
208 |
+ python-single-r1_pkg_setup |
209 |
+ use clang && llvm_pkg_setup |
210 |
+} |
211 |
+ |
212 |
+src_prepare() { |
213 |
+ use vala && vala_src_prepare |
214 |
+ xdg_src_prepare |
215 |
+} |
216 |
+ |
217 |
+src_configure() { |
218 |
+ local emesonargs=( |
219 |
+ -Dtracing=false |
220 |
+ -Dprofiling=false # not passing -pg to CFLAGS |
221 |
+ -Dfusermount_wrapper=false # meant for flatpak builds |
222 |
+ -Dtcmalloc=false |
223 |
+ -Dchannel=other |
224 |
+ |
225 |
+ $(meson_use vala vapi) # TODO: doesn't work anymore; crude patch included |
226 |
+ $(meson_use doc help) |
227 |
+ $(meson_use gtk-doc docs) |
228 |
+ |
229 |
+ -Dnetwork_tests=false |
230 |
+ $(meson_use clang plugin_clang) |
231 |
+ $(meson_use devhelp plugin_devhelp) |
232 |
+ -Dplugin_deviced=false |
233 |
+ -Dplugin_editorconfig=true # needs libpcre |
234 |
+ $(meson_use git plugin_git) |
235 |
+ -Dplugin_flatpak=false |
236 |
+ -Dplugin_podman=false |
237 |
+ $(meson_use glade plugin_glade) |
238 |
+ -Dplugin_git=true |
239 |
+ $(meson_use spell plugin_spellcheck) |
240 |
+ $(meson_use sysprof plugin_sysprof) |
241 |
+ $(meson_use vala plugin_vala) |
242 |
+ ) |
243 |
+ meson_src_configure |
244 |
+} |
245 |
+ |
246 |
+src_install() { |
247 |
+ meson_src_install |
248 |
+ python_optimize |
249 |
+ if use doc; then |
250 |
+ rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die |
251 |
+ rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die |
252 |
+ rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || die |
253 |
+ # custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825 |
254 |
+ mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die |
255 |
+ # _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is. |
256 |
+ rmdir "${ED}"/usr/share/doc/gnome-builder/ || die |
257 |
+ fi |
258 |
+ readme.gentoo_create_doc |
259 |
+} |
260 |
+ |
261 |
+pkg_postinst() { |
262 |
+ xdg_pkg_postinst |
263 |
+ gnome2_schemas_update |
264 |
+ readme.gentoo_print_elog |
265 |
+} |
266 |
+ |
267 |
+pkg_postrm() { |
268 |
+ xdg_pkg_postrm |
269 |
+ gnome2_schemas_update |
270 |
+} |
271 |
+ |
272 |
+src_test() { |
273 |
+ # FIXME: can't run meson_src_test together with virtx or dbus-run-session |
274 |
+ virtx dbus-run-session meson test -C "${BUILD_DIR}" |
275 |
+} |