commit: 35943bda95329e610052831ff5245621a1b53638 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Thu Feb 28 21:11:23 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Thu Feb 28 22:37:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35943bda
gnome-base/gnome-shell: fix and re-enable USE=gtk-doc support Turned out to be a meson-0.47 incompatibility, not gtk-doc Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> .../files/3.28.3-fix-gtk-doc-meson.patch | 59 ++++++++++++++++++++++ gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild | 9 ++-- 2 files changed, 65 insertions(+), 3 deletions(-) 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 new file mode 100644 index 00000000000..9948b163009 --- /dev/null +++ b/gnome-base/gnome-shell/files/3.28.3-fix-gtk-doc-meson.patch @@ -0,0 +1,59 @@ +From 9f4aa6ebf2193bb19dd8012de7699fce35681078 Mon Sep 17 00:00:00 2001 +From: Pascal Nowack <pascal.now...@gmx.de> +Date: Mon, 6 Aug 2018 14:21:02 +0200 +Subject: [PATCH] build: Fix build with meson >= 47.0 + +With meson >= 47.0, building gnome-shell will fail +when --rebuild-types is used as an option for gtk-doc, +so stop using that option and bump the meson requirement. + +https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/191 +--- + docs/reference/shell/meson.build | 3 +-- + docs/reference/st/meson.build | 3 +-- + meson.build | 2 +- + 3 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/docs/reference/shell/meson.build b/docs/reference/shell/meson.build +index 1469ed422..a32d6a58a 100644 +--- a/docs/reference/shell/meson.build ++++ b/docs/reference/shell/meson.build +@@ -50,8 +50,7 @@ gnome.gtkdoc('shell', + join_paths(meson.build_root(), 'src') + ], + scan_args: [ +- '--ignore-headers=' + ' '.join(private_headers + exclude_directories), +- '--rebuild-types' ++ '--ignore-headers=' + ' '.join(private_headers + exclude_directories) + ], + install: true + ) +diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build +index fe89b53d4..3e9e9ab7c 100644 +--- a/docs/reference/st/meson.build ++++ b/docs/reference/st/meson.build +@@ -17,8 +17,7 @@ gnome.gtkdoc('st', + ], + scan_args: [ + '--ignore-headers=' + ' '.join(private_headers), +- '--rebuild-sections', +- '--rebuild-types' ++ '--rebuild-sections' + ], + install: true + ) +diff --git a/meson.build b/meson.build +index 03b9d52a8..e33a76183 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,6 +1,6 @@ + project('gnome-shell', 'c', + version: '3.28.3', +- meson_version: '>= 0.42.0', ++ meson_version: '>= 0.47.0', + license: 'GPLv2+' + ) + +-- +2.17.0 + diff --git a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild index d49823e4bdf..0a3ea629b3f 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"; LICENSE="GPL-2+ LGPL-2+" SLOT="0" -IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin systemd telepathy" +IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager nsplugin systemd telepathy" REQUIRED_USE="${PYTHON_REQUIRED_USE} ?? ( elogind systemd )" @@ -110,9 +110,10 @@ DEPEND="${COMMON_DEPEND} dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1.17 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig -" #gtk-doc? ( >=dev-util/gtk-doc-1.17 ) +" PATCHES=( # Patches from gnome-3-26 branch on top of 3.26.2 @@ -121,6 +122,8 @@ PATCHES=( "${FILESDIR}"/${PV}-defaults.patch # Fix automagic gnome-bluetooth dep, bug #398145 "${FILESDIR}"/${PV}-optional-bluetooth.patch + # Fix gtk-doc build with >=meson-0.47 + "${FILESDIR}"/${PV}-fix-gtk-doc-meson.patch ) src_prepare() { @@ -135,7 +138,7 @@ src_configure() { local emesonargs=( $(meson_use bluetooth) $(meson_use nsplugin browser_plugin) - #$(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 + $(meson_use gtk-doc gtk_doc) -Dman=true $(meson_use networkmanager) $(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)
