diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2019-10-22 09:30:05 +0300 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2019-10-22 09:31:28 +0300 |
| commit | f34d22556e5419b8b85f5182c322266b13cf8b72 (patch) | |
| tree | 84046b6b378ac0370f96dc2e1c037d7033f4ee91 /gnome-base | |
| parent | dev-libs/antlr-c: EAPI 7 (diff) | |
| download | gentoo-f34d22556e5419b8b85f5182c322266b13cf8b72.tar.gz gentoo-f34d22556e5419b8b85f5182c322266b13cf8b72.tar.bz2 gentoo-f34d22556e5419b8b85f5182c322266b13cf8b72.zip | |
gnome-base/dconf: require <meson-0.52 to workaround build bug
meson-0.52 changes link_whole behaviour and dconf fails to build
due to that. Until we have a dconf patch, require older meson to
succeed build of this crucial package meanwhile.
Fix lack of BDEPEND in EAPI-7 dconf-0.32 ebuild while at it.
Bug: https://bugs.gentoo.org/698144
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/dconf/dconf-0.30.1.ebuild | 3 | ||||
| -rw-r--r-- | gnome-base/dconf/dconf-0.32.0-r1.ebuild | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gnome-base/dconf/dconf-0.30.1.ebuild b/gnome-base/dconf/dconf-0.30.1.ebuild index 86f125d97e94..e52bab8ebd0a 100644 --- a/gnome-base/dconf/dconf-0.30.1.ebuild +++ b/gnome-base/dconf/dconf-0.30.1.ebuild @@ -25,7 +25,8 @@ DEPEND="${RDEPEND} gtk-doc? ( >=dev-util/gtk-doc-1.15 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig -" + <dev-util/meson-0.52 +" # problem with meson-0.52+ https://gitlab.gnome.org/GNOME/dconf/issues/59 PATCHES=( "${FILESDIR}"/${PV}-bash-completion-dir.patch diff --git a/gnome-base/dconf/dconf-0.32.0-r1.ebuild b/gnome-base/dconf/dconf-0.32.0-r1.ebuild index 9d82cd9e4fe6..f4c1fa46b5c9 100644 --- a/gnome-base/dconf/dconf-0.32.0-r1.ebuild +++ b/gnome-base/dconf/dconf-0.32.0-r1.ebuild @@ -17,7 +17,8 @@ RDEPEND=" >=dev-libs/glib-2.44.0:2 sys-apps/dbus " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt @@ -25,7 +26,8 @@ DEPEND="${RDEPEND} gtk-doc? ( >=dev-util/gtk-doc-1.15 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig -" + <dev-util/meson-0.52 +" # problem with meson-0.52+ https://gitlab.gnome.org/GNOME/dconf/issues/59 PATCHES=( "${FILESDIR}"/0.30.1-bash-completion-dir.patch |