1 |
Haha, I gave you a patch, sorry. |
2 |
|
3 |
The patch just describes which change you need to make. If you really |
4 |
want to have an easy life, then restore the original ebuild (rsync if |
5 |
you will) and run this: |
6 |
|
7 |
% patch libinput-1.13.2.ebuild < path/to/the-patch-content.patch |
8 |
|
9 |
Then you can run ebuild .. digest. |
10 |
|
11 |
There is a chance the patch won't apply, because I didn't attach it. |
12 |
In this case I think it's quicker if you "read" the patch yourself, find |
13 |
the location what the patch is about, and make the change (as indicated |
14 |
by the lines prefixed with - (removed) and + (added)). |
15 |
|
16 |
Does this help you? |
17 |
|
18 |
Fabian |
19 |
|
20 |
|
21 |
On 27-06-2019 12:41:34 +0100, Michael Fothergill wrote: |
22 |
> Many thanks again. |
23 |
> |
24 |
> OK I went into the ebuild directory for libinput. |
25 |
> |
26 |
> I then edited the ebuild file and added the code you gave at the end of the |
27 |
> file: |
28 |
> |
29 |
> src_install() { |
30 |
> meson_src_install |
31 |
> if use doc ; then |
32 |
> docinto html |
33 |
> dodoc -r "${BUILD_DIR}"/Documentation/. |
34 |
> fi |
35 |
> } |
36 |
> |
37 |
> pkg_postinst() { |
38 |
> udevadm hwdb --update --root="${ROOT%/}" |
39 |
> } |
40 |
> |
41 |
> --- a/dev-libs/libinput/libinput-1.13.2.ebuild |
42 |
> +++ b/dev-libs/libinput/libinput-1.13.2.ebuild |
43 |
> @@ -60,7 +60,7 @@ src_configure() { |
44 |
> $(meson_use doc documentation) |
45 |
> $(meson_use input_devices_wacom libwacom) |
46 |
> -Dtests=false # tests are restricted |
47 |
> - -Dudev-dir="$(get_udevdir)" |
48 |
> + -Dudev-dir="${EPREFIX}$(get_udevdir)" |
49 |
> ) |
50 |
> meson_src_configure |
51 |
> } |
52 |
> |
53 |
> I then ran |
54 |
> |
55 |
> ebuild libinput-1.13.2.ebuild digest |
56 |
> |
57 |
> and got an error message: |
58 |
> |
59 |
> mikef@fart:~/gentoo/usr/portage/dev-libs/libinput$ ebuild |
60 |
> libinput-1.13.2.ebuild digest |
61 |
> * ERROR: dev-libs/libinput-1.13.2::gentoo failed (depend phase): |
62 |
> * External commands disallowed while sourcing ebuild: --- |
63 |
> a/dev-libs/libinput/libinput-1.13.2.ebuild |
64 |
> * |
65 |
> * Call stack: |
66 |
> * ebuild.sh, line 623: Called source |
67 |
> '/home/mikef/gentoo/usr/portage/dev-libs/libinput/libinput-1.13.2.ebuild' |
68 |
> * libinput-1.13.2.ebuild, line 80: Called command_not_found_handle '---' |
69 |
> 'a/dev-libs/libinput/libinput-1.13.2.ebuild' |
70 |
> * ebuild.sh, line 88: Called die |
71 |
> * The specific snippet of code: |
72 |
> * die "External commands disallowed while sourcing ebuild: ${*}" |
73 |
> * |
74 |
> * If you need support, post the output of `emerge --info |
75 |
> '=dev-libs/libinput-1.13.2::gentoo'`, |
76 |
> * the complete build log and the output of `emerge -pqv |
77 |
> '=dev-libs/libinput-1.13.2::gentoo'`. |
78 |
> * The ebuild environment file is located at |
79 |
> '/home/mikef/gentoo/var/tmp/portage/dev-libs/libinput-1.13.2/temp/environment'. |
80 |
> * Working directory: |
81 |
> '/home/mikef/gentoo/var/tmp/portage/dev-libs/libinput-1.13.2/homedir' |
82 |
> * S: |
83 |
> '/home/mikef/gentoo/var/tmp/portage/dev-libs/libinput-1.13.2/work/libinput-1.13.2' |
84 |
> mikef@fart:~/gentoo/usr/portage/dev-libs/libinput$ |
85 |
> |
86 |
> Was I meant to add it to the existing code as I just did? |
87 |
> |
88 |
> Comments appreciated. |
89 |
> |
90 |
> Regards |
91 |
> |
92 |
> MF |
93 |
> |
94 |
> |
95 |
> read_char: errno==EILSEQ; invalid byte sequence for UTF-8: |
96 |
-- |
97 |
Fabian Groffen |
98 |
Gentoo on a different level |