From 79e2dc33d3a1536718e0736302015ada5f6de54b Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 15 Sep 2007 18:16:55 +0000 Subject: install scim-bridge-qt3 only if KDE is present --- perl-install/lang.pm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 838aced53..4eed2a53a 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -5,6 +5,7 @@ use strict; use common; use utf8; use log; +use any; #- key: lang name (locale name for some (~5) special cases needing #- extra distinctions) @@ -531,6 +532,10 @@ my @IM_i18n_fields = ( #- XIM server; or a Qt plugin if exists) ); +my @sessions = any::sessions(); +my $is_kde = member('KDE', @sessions); +my $is_gtj = any { !/KDE/i } @sessions; + # keep the 'packages' field in sync with share/rpmsrate: my %IM_config = ( @@ -636,12 +641,12 @@ my %IM_config = XMODIFIERS => '@im=SCIM', default_for_lang => 'am ja ko vi zh_CN zh_TW', packages => { - generic => 'scim-bridge-qt3 scim-m17n scim-tables'), - am => 'scim-bridge-qt3 scim-tables'), - ja => 'scim-bridge-qt3 scim-anthy scim-input-pad scim-tomoe'), - ko => 'scim-bridge-qt3 scim-hangul'), - vi => 'scim-bridge-qt3 scim-m17n'), - zh => 'scim-bridge-qt3 scim-pinyin scim-tables scim-chewing'), + generic => join(' ', if_($is_kde, 'scim-bridge-qt3'), ' scim-m17n scim-tables'), + am => join(' ', if_($is_kde, 'scim-bridge-qt3'), ' scim-tables'), + ja => join(' ', if_($is_kde, 'scim-bridge-qt3'), ' scim-anthy scim-input-pad scim-tomoe'), + ko => join(' ', if_($is_kde, 'scim-bridge-qt3'), ' scim-hangul'), + vi => join(' ', if_($is_kde, 'scim-bridge-qt3'), ' scim-m17n'), + zh => join(' ', if_($is_kde, 'scim-bridge-qt3'), ' scim-pinyin scim-tables scim-chewing'), }, }, skim => { -- cgit v1.2.1