| 1 |
commit: 22cfda9c891082e0ecb003d15fe364ff2c8e0c0d |
| 2 |
Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 10 18:35:18 2017 +0000 |
| 4 |
Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 10 18:35:18 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=22cfda9c |
| 7 |
|
| 8 |
gnome-meson.eclass Many fixes |
| 9 |
|
| 10 |
Fix the installations of docs, show warning message for the overl- |
| 11 |
ay. |
| 12 |
|
| 13 |
eclass/gnome-meson.eclass | 33 +++++++++++++++++++-------------- |
| 14 |
1 file changed, 19 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/gnome-meson.eclass b/eclass/gnome-meson.eclass |
| 17 |
index 0e2466cb..3f013a18 100644 |
| 18 |
--- a/eclass/gnome-meson.eclass |
| 19 |
+++ b/eclass/gnome-meson.eclass |
| 20 |
@@ -28,26 +28,26 @@ esac |
| 21 |
# Prepare environment for build, fix build of scrollkeeper documentation, |
| 22 |
# run elibtoolize. |
| 23 |
gnome-meson_src_prepare() { |
| 24 |
+ # FIXME add gtk-doc stuff if needed |
| 25 |
xdg_src_prepare |
| 26 |
|
| 27 |
# Prevent assorted access violations and test failures |
| 28 |
gnome2_environment_reset |
| 29 |
- |
| 30 |
- # Disable all deprecation warnings |
| 31 |
- gnome2_disable_deprecation_warning |
| 32 |
} |
| 33 |
|
| 34 |
# @FUNCTION: gnome-meson_src_configure |
| 35 |
# @DESCRIPTION: |
| 36 |
# Gnome specific configure handling |
| 37 |
gnome-meson_src_configure() { |
| 38 |
- #FIXME: handle gtk-doc |
| 39 |
- |
| 40 |
- #FIXME is this still valid ? |
| 41 |
# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659) |
| 42 |
addpredict "$(unset HOME; echo ~)/.gnome2" |
| 43 |
|
| 44 |
- |
| 45 |
+ #FIXME are these valid/needed |
| 46 |
+ # "-Dgtk-doc=no" |
| 47 |
+ # "-Dmaintainer-mode=no" |
| 48 |
+ # "-Dschemas-install=no" |
| 49 |
+ # "-Dupdate-mimedb=no" |
| 50 |
+ # "-Dcompile-warnings=minimum" |
| 51 |
local emesonargs=( |
| 52 |
"$@" |
| 53 |
) |
| 54 |
@@ -67,21 +67,19 @@ gnome-meson_src_compile() { |
| 55 |
# Gnome specific install. Handles typical GConf and scrollkeeper setup |
| 56 |
# in packages and removal of .la files if requested |
| 57 |
gnome-meson_src_install() { |
| 58 |
- # we must delay gconf schema installation due to sandbox |
| 59 |
- export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" |
| 60 |
- |
| 61 |
- unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL |
| 62 |
- |
| 63 |
+ # install docs |
| 64 |
+ default |
| 65 |
|
| 66 |
- # Since eapi6 this is handled by default on its own plus MAINTAINERS and HACKING |
| 67 |
# files that are really common in gnome packages (bug #573390) |
| 68 |
local d |
| 69 |
for d in HACKING MAINTAINERS; do |
| 70 |
[[ -s "${d}" ]] && dodoc "${d}" |
| 71 |
done |
| 72 |
|
| 73 |
+ # Make sure this one doesn't get in the portage db |
| 74 |
+ rm -fr "${ED}/usr/share/applications/mimeinfo.cache" |
| 75 |
+ |
| 76 |
# Delete all .la files |
| 77 |
- |
| 78 |
case "${GNOME2_LA_PUNT}" in |
| 79 |
yes) prune_libtool_files --modules;; |
| 80 |
no) ;; |
| 81 |
@@ -131,6 +129,13 @@ gnome-meson_pkg_postinst() { |
| 82 |
if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then |
| 83 |
gnome2_giomodule_cache_update |
| 84 |
fi |
| 85 |
+ |
| 86 |
+ # This should only be in the overlay |
| 87 |
+ ewarn "**************************************************************" |
| 88 |
+ ewarn "This is the *experimental* Gentoo GNOME Overlay" |
| 89 |
+ ewarn "Please report bugs at #gentoo-desktop @ FreeNode" |
| 90 |
+ ewarn "Do NOT go to upstream with bugs without checking with us first" |
| 91 |
+ ewarn "**************************************************************" |
| 92 |
} |
| 93 |
|
| 94 |
# # FIXME Handle GConf schemas removal |
Archives