summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/lang.pm15
3 files changed, 15 insertions, 6 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 1927faba8..3912e169b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- localedrake:
+ o install scim-bridge-qt4 if KDE4 is installed
+
Version 10.4.197 - 15 September 2007, by Thierry Vignaud
- diskdrake:
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 88702bfba..bfb5a2ecb 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- localization:
+ o install scim-bridge-qt4 if KDE4 is installed
+
Version 10.4.197 - 15 September 2007, by Thierry Vignaud
- localization:
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index c3767ad33..443060fa8 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -534,8 +534,11 @@ my @IM_i18n_fields = (
my @sessions = any::sessions();
my $is_kde = member('KDE', @sessions);
+my $is_kde4 = member('KDE', @sessions);
my $is_gtk = any { !/KDE/i } @sessions;
+my @scim_bridges_qt_packages = (if_($is_kde, 'scim-bridge-qt3'), if_($is_kde4, 'scim-bridge-qt4'));
+
# keep the 'packages' field in sync with share/rpmsrate:
my %IM_config =
(
@@ -631,12 +634,12 @@ my %IM_config =
XMODIFIERS => '@im=SCIM',
default_for_lang => 'am ja ko vi zh_CN zh_TW',
packages => {
- generic => [ qw(scim-m17n scim-tables), if_($is_kde, 'scim-bridge-qt3') ],
- am => [ 'scim-tables', if_($is_kde, 'scim-bridge-qt3') ],
- ja => [ qw(scim-anthy scim-input-pad scim-tomoe), if_($is_kde, 'scim-bridge-qt3') ],
- ko => [ 'scim-hangul', if_($is_kde, 'scim-bridge-qt3') ],
- vi => [ 'scim-m17n', if_($is_kde, 'scim-bridge-qt3') ],
- zh => [ qw(scim-pinyin scim-tables scim-chewing), if_($is_kde, 'scim-bridge-qt3') ],
+ generic => [ qw(scim-m17n scim-tables), @scim_bridges_qt_packages ],
+ am => [ 'scim-tables', @scim_bridges_qt_packages ],
+ ja => [ qw(scim-anthy scim-input-pad scim-tomoe), @scim_bridges_qt_packages ],
+ ko => [ 'scim-hangul', @scim_bridges_qt_packages ],
+ vi => [ 'scim-m17n', @scim_bridges_qt_packages ],
+ zh => [ qw(scim-pinyin scim-tables scim-chewing), @scim_bridges_qt_packages ],
},
},
skim => {