Lines 125-130
Link Here
|
125 |
G2CONF="${G2CONF} --disable-maintainer-mode" |
125 |
G2CONF="${G2CONF} --disable-maintainer-mode" |
126 |
fi |
126 |
fi |
127 |
|
127 |
|
|
|
128 |
# Pass --disable-scrollkeeper when possible |
129 |
if grep -q "disable-scrollkeeper" configure; then |
130 |
G2CONF="${G2CONF} --disable-scrollkeeper" |
131 |
fi |
132 |
|
128 |
# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659) |
133 |
# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659) |
129 |
addwrite "$(unset HOME; echo ~)/.gnome2" |
134 |
addwrite "$(unset HOME; echo ~)/.gnome2" |
130 |
|
135 |
|
Lines 172-181
Link Here
|
172 |
# 1. The scrollkeeper database is regenerated at pkg_postinst() |
177 |
# 1. The scrollkeeper database is regenerated at pkg_postinst() |
173 |
# 2. ${ED}/var/lib/scrollkeeper contains only indexes for the current pkg |
178 |
# 2. ${ED}/var/lib/scrollkeeper contains only indexes for the current pkg |
174 |
# thus it makes no sense if pkg_postinst ISN'T run for some reason. |
179 |
# thus it makes no sense if pkg_postinst ISN'T run for some reason. |
175 |
if [[ -z "$(find "${D}" -name '*.omf')" ]]; then |
|
|
176 |
export SCROLLKEEPER_UPDATE="0" |
177 |
fi |
178 |
rm -rf "${ED}${sk_tmp_dir}" |
180 |
rm -rf "${ED}${sk_tmp_dir}" |
|
|
181 |
rmdir "${ED}/var/lib" 2>/dev/null |
182 |
rmdir "${ED}/var" 2>/dev/null |
179 |
|
183 |
|
180 |
# Make sure this one doesn't get in the portage db |
184 |
# Make sure this one doesn't get in the portage db |
181 |
rm -fr "${ED}/usr/share/applications/mimeinfo.cache" |
185 |
rm -fr "${ED}/usr/share/applications/mimeinfo.cache" |
Lines 197-202
Link Here
|
197 |
gnome2_gconf_savelist |
201 |
gnome2_gconf_savelist |
198 |
gnome2_icon_savelist |
202 |
gnome2_icon_savelist |
199 |
gnome2_schemas_savelist |
203 |
gnome2_schemas_savelist |
|
|
204 |
gnome2_scrollkeeper_savelist |
200 |
} |
205 |
} |
201 |
|
206 |
|
202 |
# @FUNCTION: gnome2_pkg_postinst |
207 |
# @FUNCTION: gnome2_pkg_postinst |
Lines 209-218
Link Here
|
209 |
fdo-mime_mime_database_update |
214 |
fdo-mime_mime_database_update |
210 |
gnome2_icon_cache_update |
215 |
gnome2_icon_cache_update |
211 |
gnome2_schemas_update |
216 |
gnome2_schemas_update |
212 |
|
217 |
gnome2_scrollkeeper_update |
213 |
if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then |
|
|
214 |
gnome2_scrollkeeper_update |
215 |
fi |
216 |
} |
218 |
} |
217 |
|
219 |
|
218 |
# @#FUNCTION: gnome2_pkg_prerm |
220 |
# @#FUNCTION: gnome2_pkg_prerm |
Lines 230-237
Link Here
|
230 |
fdo-mime_mime_database_update |
232 |
fdo-mime_mime_database_update |
231 |
gnome2_icon_cache_update |
233 |
gnome2_icon_cache_update |
232 |
gnome2_schemas_update |
234 |
gnome2_schemas_update |
233 |
|
235 |
gnome2_scrollkeeper_update |
234 |
if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then |
|
|
235 |
gnome2_scrollkeeper_update |
236 |
fi |
237 |
} |
236 |
} |