1 |
commit: 35943bda95329e610052831ff5245621a1b53638 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 28 21:11:23 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 28 22:37:48 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35943bda |
7 |
|
8 |
gnome-base/gnome-shell: fix and re-enable USE=gtk-doc support |
9 |
|
10 |
Turned out to be a meson-0.47 incompatibility, not gtk-doc |
11 |
|
12 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
13 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
14 |
|
15 |
.../files/3.28.3-fix-gtk-doc-meson.patch | 59 ++++++++++++++++++++++ |
16 |
gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild | 9 ++-- |
17 |
2 files changed, 65 insertions(+), 3 deletions(-) |
18 |
|
19 |
diff --git a/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..9948b163009 |
22 |
--- /dev/null |
23 |
+++ b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch |
24 |
@@ -0,0 +1,59 @@ |
25 |
+From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001 |
26 |
+From: Pascal Nowack <Pascal.Nowack@×××.de> |
27 |
+Date: Mon, 6 Aug 2018 14:21:02 +0200 |
28 |
+Subject: [PATCH] build: Fix build with meson >= 47.0 |
29 |
+ |
30 |
+With meson >= 47.0, building gnome-shell will fail |
31 |
+when --rebuild-types is used as an option for gtk-doc, |
32 |
+so stop using that option and bump the meson requirement. |
33 |
+ |
34 |
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191 |
35 |
+--- |
36 |
+ docs/reference/shell/meson.build | 3 +-- |
37 |
+ docs/reference/st/meson.build | 3 +-- |
38 |
+ meson.build | 2 +- |
39 |
+ 3 files changed, 3 insertions(+), 5 deletions(-) |
40 |
+ |
41 |
+diff --git a/docs/reference/shell/meson.build b/docs/reference/shell/meson.build |
42 |
+index 1469ed422..a32d6a58a 100644 |
43 |
+--- a/docs/reference/shell/meson.build |
44 |
++++ b/docs/reference/shell/meson.build |
45 |
+@@ -50,8 +50,7 @@ gnome.gtkdoc('shell', |
46 |
+ join_paths(meson.build_root(), 'src') |
47 |
+ ], |
48 |
+ scan_args: [ |
49 |
+- '--ignore-headers=' + ' '.join(private_headers + exclude_directories), |
50 |
+- '--rebuild-types' |
51 |
++ '--ignore-headers=' + ' '.join(private_headers + exclude_directories) |
52 |
+ ], |
53 |
+ install: true |
54 |
+ ) |
55 |
+diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build |
56 |
+index fe89b53d4..3e9e9ab7c 100644 |
57 |
+--- a/docs/reference/st/meson.build |
58 |
++++ b/docs/reference/st/meson.build |
59 |
+@@ -17,8 +17,7 @@ gnome.gtkdoc('st', |
60 |
+ ], |
61 |
+ scan_args: [ |
62 |
+ '--ignore-headers=' + ' '.join(private_headers), |
63 |
+- '--rebuild-sections', |
64 |
+- '--rebuild-types' |
65 |
++ '--rebuild-sections' |
66 |
+ ], |
67 |
+ install: true |
68 |
+ ) |
69 |
+diff --git a/meson.build b/meson.build |
70 |
+index 03b9d52a8..e33a76183 100644 |
71 |
+--- a/meson.build |
72 |
++++ b/meson.build |
73 |
+@@ -1,6 +1,6 @@ |
74 |
+ project('gnome-shell', 'c', |
75 |
+ version: '3.28.3', |
76 |
+- meson_version: '>= 0.42.0', |
77 |
++ meson_version: '>= 0.47.0', |
78 |
+ license: 'GPLv2+' |
79 |
+ ) |
80 |
+ |
81 |
+-- |
82 |
+2.17.0 |
83 |
+ |
84 |
|
85 |
diff --git a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild |
86 |
index d49823e4bdf..0a3ea629b3f 100644 |
87 |
--- a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild |
88 |
+++ b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild |
89 |
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
90 |
|
91 |
LICENSE="GPL-2+ LGPL-2+" |
92 |
SLOT="0" |
93 |
-IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin systemd telepathy" |
94 |
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager nsplugin systemd telepathy" |
95 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
96 |
?? ( elogind systemd )" |
97 |
|
98 |
@@ -110,9 +110,10 @@ DEPEND="${COMMON_DEPEND} |
99 |
dev-libs/libxslt |
100 |
>=dev-util/gdbus-codegen-2.45.3 |
101 |
dev-util/glib-utils |
102 |
+ gtk-doc? ( >=dev-util/gtk-doc-1.17 ) |
103 |
>=sys-devel/gettext-0.19.8 |
104 |
virtual/pkgconfig |
105 |
-" #gtk-doc? ( >=dev-util/gtk-doc-1.17 ) |
106 |
+" |
107 |
|
108 |
PATCHES=( |
109 |
# Patches from gnome-3-26 branch on top of 3.26.2 |
110 |
@@ -121,6 +122,8 @@ PATCHES=( |
111 |
"${FILESDIR}"/${PV}-defaults.patch |
112 |
# Fix automagic gnome-bluetooth dep, bug #398145 |
113 |
"${FILESDIR}"/${PV}-optional-bluetooth.patch |
114 |
+ # Fix gtk-doc build with >=meson-0.47 |
115 |
+ "${FILESDIR}"/${PV}-fix-gtk-doc-meson.patch |
116 |
) |
117 |
|
118 |
src_prepare() { |
119 |
@@ -135,7 +138,7 @@ src_configure() { |
120 |
local emesonargs=( |
121 |
$(meson_use bluetooth) |
122 |
$(meson_use nsplugin browser_plugin) |
123 |
- #$(meson_use gtk-doc gtk_doc) # fails in gtkdoc-scangobj call with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer python-based gtk-doc to work |
124 |
+ $(meson_use gtk-doc gtk_doc) |
125 |
-Dman=true |
126 |
$(meson_use networkmanager) |
127 |
$(meson_use systemd) # this controls journald integration only as of 3.26.2 (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session) |