Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 289305 Details for
Bug 384649
Fonts inheriting "xorg-2" eclass should update fonts.scale and fonts.dir also on uninstallation
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Update fonts.scale & fonts.dir on font removal.
Update-fontsscale--fontsdir-on-font-removal.patch (text/plain), 1.51 KB, created by
Michał Górny
on 2011-10-09 08:07:53 UTC
(
hide
)
Description:
Update fonts.scale & fonts.dir on font removal.
Filename:
MIME Type:
Creator:
Michał Górny
Created:
2011-10-09 08:07:53 UTC
Size:
1.51 KB
patch
obsolete
>From aca87f7cb10e7893c303668e5cfd17f740f8009f Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> >Date: Sun, 9 Oct 2011 10:01:39 +0200 >Subject: [PATCH] Update fonts.scale & fonts.dir on font removal. > >This way, user won't end up with invalid fonts in the listings (and thus >segfaulting xfontsel). > >Fixes: https://bugs.gentoo.org/show_bug.cgi?id=384649 >--- > xorg-2.eclass | 26 +++++++++++++------------- > 1 files changed, 13 insertions(+), 13 deletions(-) > >diff --git a/xorg-2.eclass b/xorg-2.eclass >index 173f7bf..f7dee80 100644 >--- a/xorg-2.eclass >+++ b/xorg-2.eclass >@@ -478,7 +478,11 @@ xorg-2_src_install() { > xorg-2_pkg_postinst() { > debug-print-function ${FUNCNAME} "$@" > >- [[ -n ${FONT} ]] && setup_fonts "$@" >+ if [[ -n ${FONT} ]]; then >+ create_fonts_scale >+ create_fonts_dir >+ font_pkg_postinst "$@" >+ fi > } > > # @FUNCTION: xorg-2_pkg_postrm >@@ -488,18 +492,14 @@ xorg-2_pkg_postinst() { > xorg-2_pkg_postrm() { > debug-print-function ${FUNCNAME} "$@" > >- [[ -n ${FONT} ]] && font_pkg_postrm "$@" >-} >- >-# @FUNCTION: setup_fonts >-# @DESCRIPTION: >-# Generates needed files for fonts and fixes font permissions >-setup_fonts() { >- debug-print-function ${FUNCNAME} "$@" >- >- create_fonts_scale >- create_fonts_dir >- font_pkg_postinst >+ if [[ -n ${FONT} ]]; then >+ # if we're doing an upgrade, postinst will do >+ if [[ ${EAPI} -lt 4 || -z ${REPLACED_BY_VERSION} ]]; then >+ create_fonts_scale >+ create_fonts_dir >+ font_pkg_postrm "$@" >+ fi >+ fi > } > > # @FUNCTION: remove_font_metadata >-- >1.7.7
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 384649
: 289305