diff options
| -rw-r--r-- | kde-base/systemsettings/Manifest | 3 | ||||
| -rw-r--r-- | kde-base/systemsettings/files/10_xklavier_adaptor_fix.patch | 11 | ||||
| -rw-r--r-- | kde-base/systemsettings/systemsettings-4.2.96.ebuild | 8 |
3 files changed, 20 insertions, 2 deletions
diff --git a/kde-base/systemsettings/Manifest b/kde-base/systemsettings/Manifest index 39c5be2d95e..784f8371371 100644 --- a/kde-base/systemsettings/Manifest +++ b/kde-base/systemsettings/Manifest @@ -1,7 +1,8 @@ +AUX 10_xklavier_adaptor_fix.patch 414 RMD160 1e4d10516244363c719e93570784b3014e6f6dca SHA1 481983c93111c241ce7a42531cf3976be1325285 SHA256 5bbc6885c527b385ad445983fa57f76464170af6c1408d1f43c04f1f31588416 AUX 20_use_dejavu_as_default_font.patch 680 RMD160 d3e9b72f35d712ff4b860084e41abdb14efacd2f SHA1 e0779bcc90200bb728b3382c161e473559de3f9b SHA256 dc1aaa0d6f76e3425079b9bc6e9254137b063ee24c06588abc9ed3542c5d9c3a DIST kdebase-workspace-4.2.96.tar.bz2 62237744 RMD160 e6027a117745f54f0796497e2701f6839b7db308 SHA1 ffbd3e9e25eb3c4d1c41ff5856d7e27c260ceb95 SHA256 13347d08af1a221091c4501a1e0555bfd7774ca0ed951e96a3431d025011d64e DIST kdebase-workspace-4.3.60.tar.lzma 61015715 RMD160 9725f4e755781b1bdcb9b294e074cfdcc7982eef SHA1 fb557e49aff7815e468cde9aff544fe7213635ce SHA256 6c0d6782e6f2b48cf058561d0c3d8b2f3cd6781c86cc5fb580a68f407a7f5413 -EBUILD systemsettings-4.2.96.ebuild 1904 RMD160 96a733760198a64dbb54821833b0a5e499272af0 SHA1 74173e3921afa9e2cfc1b6b2c437ad99925ab17f SHA256 5a61c06ebe7caf440c91fdde0e2c487b8b11c6231041af78671032ff838d5700 +EBUILD systemsettings-4.2.96.ebuild 2015 RMD160 828db6cd135dfca49e5307d28192fbe0bf275bd1 SHA1 0e9d712f525829d26eb412d241758172e9e58551 SHA256 bb4c129e713b2c3e23926046771df431ab3e7f9fedcf9f873838e041151db21b EBUILD systemsettings-4.3.60.ebuild 1904 RMD160 96a733760198a64dbb54821833b0a5e499272af0 SHA1 74173e3921afa9e2cfc1b6b2c437ad99925ab17f SHA256 5a61c06ebe7caf440c91fdde0e2c487b8b11c6231041af78671032ff838d5700 EBUILD systemsettings-4.3.9999.ebuild 1862 RMD160 5e3d68eb73920af149b282f8955a5dd36c89ca27 SHA1 95885dfa2a88d6683ed9bdf4d05f3a8f5ef2095e SHA256 52558b1f967f334cd52f4f03323da9d5135cd469a08ea88fe4298312225a401c EBUILD systemsettings-9999.ebuild 1862 RMD160 5e3d68eb73920af149b282f8955a5dd36c89ca27 SHA1 95885dfa2a88d6683ed9bdf4d05f3a8f5ef2095e SHA256 52558b1f967f334cd52f4f03323da9d5135cd469a08ea88fe4298312225a401c diff --git a/kde-base/systemsettings/files/10_xklavier_adaptor_fix.patch b/kde-base/systemsettings/files/10_xklavier_adaptor_fix.patch new file mode 100644 index 00000000000..f52e4ab3bfd --- /dev/null +++ b/kde-base/systemsettings/files/10_xklavier_adaptor_fix.patch @@ -0,0 +1,11 @@ +--- kcontrol/kxkb/xklavier_adaptor.cpp.old 2009-07-20 01:25:48.780492221 +0300 ++++ kcontrol/kxkb/xklavier_adaptor.cpp 2009-07-20 01:26:02.047358319 +0300 +@@ -222,7 +222,7 @@ + kDebug() << "Xklavier initialized"; + priv->config = xkl_config_registry_get_instance(priv->engine); + +- xkl_config_registry_load(priv->config); ++ xkl_config_registry_load(priv->config,false); + + void *userData = priv; + diff --git a/kde-base/systemsettings/systemsettings-4.2.96.ebuild b/kde-base/systemsettings/systemsettings-4.2.96.ebuild index 23b418d205b..9d6fd82d1f8 100644 --- a/kde-base/systemsettings/systemsettings-4.2.96.ebuild +++ b/kde-base/systemsettings/systemsettings-4.2.96.ebuild @@ -52,7 +52,9 @@ KMEXTRACTONLY=" plasma/ " -PATCHES=( "$FILESDIR/20_use_dejavu_as_default_font.patch" ) +PATCHES=( + "$FILESDIR/20_use_dejavu_as_default_font.patch" + ) src_unpack() { if use handbook; then @@ -69,6 +71,10 @@ src_prepare() { systemsettings/CMakeLists.txt \ || die "Failed to fix systemsettingsrc install location" + if has_version ">=x11-libs/libxklavier-4.0"; then + epatch "${FILESDIR}"/10_xklavier_adaptor_fix.patch + fi + kde4-meta_src_prepare } |