1 |
commit: 77e589717e3fe5788ef0030d5cc4a2517670cc9a |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 30 13:07:37 2020 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 30 13:07:56 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77e58971 |
7 |
|
8 |
www-client/netsurf: fix build with USE="fbcon svg -svgtiny". |
9 |
|
10 |
The build system for netsurf only does the pkg-config magic needed to |
11 |
find librsvg's headers when it's building the GTK targets (and not |
12 |
when it's building the framebuffer target). As a result, building the |
13 |
framebuffer target can fail if you have USE="svg -svgtiny" set. This |
14 |
commit disables librsvg while building and installing the framebuffer |
15 |
target. Thanks are due to ernsteiswuerfel for the extensive testing |
16 |
on bug 728994. |
17 |
|
18 |
Bug: https://bugs.gentoo.org/728994 |
19 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
20 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
21 |
|
22 |
www-client/netsurf/netsurf-3.10-r1.ebuild | 28 +++++++++++++++++++++++----- |
23 |
1 file changed, 23 insertions(+), 5 deletions(-) |
24 |
|
25 |
diff --git a/www-client/netsurf/netsurf-3.10-r1.ebuild b/www-client/netsurf/netsurf-3.10-r1.ebuild |
26 |
index 1ac3219ccb8..62dea848e93 100644 |
27 |
--- a/www-client/netsurf/netsurf-3.10-r1.ebuild |
28 |
+++ b/www-client/netsurf/netsurf-3.10-r1.ebuild |
29 |
@@ -97,7 +97,15 @@ _emake() { |
30 |
} |
31 |
|
32 |
src_compile() { |
33 |
- use fbcon && _emake TARGET=framebuffer |
34 |
+ # The build system only runs pkg-config to find librsvg's include |
35 |
+ # dir for the gtk targets. So if you try to build the framebuffer |
36 |
+ # target with NETSURF_USE_RSVG=YES, the build crashes on failing to |
37 |
+ # find rsvg.h. To work around that, we set NETSURF_USE_RSVG=NO. It |
38 |
+ # might be possible to fall back to svgtiny with USE="svg -svgtiny" |
39 |
+ # if svgtiny works in a framebuffer, but then our (R)DEPEND would |
40 |
+ # need some mangling to ensure that svgtiny is installed. |
41 |
+ use fbcon && _emake NETSURF_USE_RSVG=NO TARGET=framebuffer |
42 |
+ |
43 |
use gtk2 && _emake TARGET=gtk2 |
44 |
use gtk && _emake TARGET=gtk3 |
45 |
} |
46 |
@@ -111,19 +119,29 @@ src_install() { |
47 |
-i "${WORKDIR}"/*/utils/git-testament.pl || die |
48 |
|
49 |
if use fbcon ; then |
50 |
- _emake TARGET=framebuffer DESTDIR="${D}" install |
51 |
+ # See earlier comments about rsvg.h. |
52 |
+ _emake NETSURF_USE_RSVG=NO TARGET=framebuffer DESTDIR="${D}" install |
53 |
elog "framebuffer binary has been installed as netsurf-fb" |
54 |
- make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser" |
55 |
+ make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-fb \ |
56 |
+ NetSurf-framebuffer \ |
57 |
+ netsurf \ |
58 |
+ "Network;WebBrowser" |
59 |
fi |
60 |
if use gtk2 ; then |
61 |
_emake TARGET=gtk2 DESTDIR="${D}" install |
62 |
elog "netsurf gtk2 version has been installed as netsurf-gtk2" |
63 |
- make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-gtk2 NetSurf-gtk2 netsurf "Network;WebBrowser" |
64 |
+ make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-gtk2 \ |
65 |
+ NetSurf-gtk2 \ |
66 |
+ netsurf \ |
67 |
+ "Network;WebBrowser" |
68 |
fi |
69 |
if use gtk ; then |
70 |
_emake TARGET=gtk3 DESTDIR="${D}" install |
71 |
elog "netsurf gtk3 version has been installed as netsurf-gtk3" |
72 |
- make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser" |
73 |
+ make_desktop_entry "${EPREFIX}"/usr/bin/netsurf-gtk3 \ |
74 |
+ NetSurf-gtk3 \ |
75 |
+ netsurf \ |
76 |
+ "Network;WebBrowser" |
77 |
fi |
78 |
|
79 |
insinto /usr/share/pixmaps |