From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A97C1139083 for ; Sun, 10 Dec 2017 18:38:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1C94E0F9C; Sun, 10 Dec 2017 18:38:02 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9DDEAE0F9C for ; Sun, 10 Dec 2017 18:38:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D79E133BF01 for ; Sun, 10 Dec 2017 18:38:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B3E3AE77 for ; Sun, 10 Dec 2017 18:37:59 +0000 (UTC) From: "Sobhan Mohammadpour" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sobhan Mohammadpour" Message-ID: <1512930918.22cfda9c891082e0ecb003d15fe364ff2c8e0c0d.sobhan@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: eclass/ X-VCS-Repository: proj/gnome X-VCS-Files: eclass/gnome-meson.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sobhan X-VCS-Committer-Name: Sobhan Mohammadpour X-VCS-Revision: 22cfda9c891082e0ecb003d15fe364ff2c8e0c0d X-VCS-Branch: master Date: Sun, 10 Dec 2017 18:37:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6b32370a-801e-41da-a1e1-d11cdb9f4355 X-Archives-Hash: 7707ee26b1df29f7e0be30ed707df7f6 commit: 22cfda9c891082e0ecb003d15fe364ff2c8e0c0d Author: Sobhan Mohammadpour gentoo org> AuthorDate: Sun Dec 10 18:35:18 2017 +0000 Commit: Sobhan Mohammadpour gentoo org> CommitDate: Sun Dec 10 18:35:18 2017 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=22cfda9c gnome-meson.eclass Many fixes Fix the installations of docs, show warning message for the overl- ay. eclass/gnome-meson.eclass | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/eclass/gnome-meson.eclass b/eclass/gnome-meson.eclass index 0e2466cb..3f013a18 100644 --- a/eclass/gnome-meson.eclass +++ b/eclass/gnome-meson.eclass @@ -28,26 +28,26 @@ esac # Prepare environment for build, fix build of scrollkeeper documentation, # run elibtoolize. gnome-meson_src_prepare() { + # FIXME add gtk-doc stuff if needed xdg_src_prepare # Prevent assorted access violations and test failures gnome2_environment_reset - - # Disable all deprecation warnings - gnome2_disable_deprecation_warning } # @FUNCTION: gnome-meson_src_configure # @DESCRIPTION: # Gnome specific configure handling gnome-meson_src_configure() { - #FIXME: handle gtk-doc - - #FIXME is this still valid ? # Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659) addpredict "$(unset HOME; echo ~)/.gnome2" - + #FIXME are these valid/needed + # "-Dgtk-doc=no" + # "-Dmaintainer-mode=no" + # "-Dschemas-install=no" + # "-Dupdate-mimedb=no" + # "-Dcompile-warnings=minimum" local emesonargs=( "$@" ) @@ -67,21 +67,19 @@ gnome-meson_src_compile() { # Gnome specific install. Handles typical GConf and scrollkeeper setup # in packages and removal of .la files if requested gnome-meson_src_install() { - # we must delay gconf schema installation due to sandbox - export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" - - unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL - + # install docs + default - # Since eapi6 this is handled by default on its own plus MAINTAINERS and HACKING # files that are really common in gnome packages (bug #573390) local d for d in HACKING MAINTAINERS; do [[ -s "${d}" ]] && dodoc "${d}" done + # Make sure this one doesn't get in the portage db + rm -fr "${ED}/usr/share/applications/mimeinfo.cache" + # Delete all .la files - case "${GNOME2_LA_PUNT}" in yes) prune_libtool_files --modules;; no) ;; @@ -131,6 +129,13 @@ gnome-meson_pkg_postinst() { if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then gnome2_giomodule_cache_update fi + + # This should only be in the overlay + ewarn "**************************************************************" + ewarn "This is the *experimental* Gentoo GNOME Overlay" + ewarn "Please report bugs at #gentoo-desktop @ FreeNode" + ewarn "Do NOT go to upstream with bugs without checking with us first" + ewarn "**************************************************************" } # # FIXME Handle GConf schemas removal