Fix kdeenablefinal build, bug 395979

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64
RepoMan-Options: --force

diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index cc9a39c123de7b9cfbd03182047b16556690cf17..0f13809d0c9864a2d3f2b655796028603e95fadb 100644 (file)
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/systemsettings
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.127 2011/12/18 19:46:27 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.128 2011/12/25 13:44:59 dilfridge Exp $
+
+  25 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  systemsettings-4.7.3-r1.ebuild,
+  +files/systemsettings-4.7.3-enablefinal.patch, systemsettings-4.7.4.ebuild:
+  Fix kdeenablefinal build, bug 395979
 
   18 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -systemsettings-4.6.5.ebuild:

diff --git a/kde-base/systemsettings/Manifest b/kde-base/systemsettings/Manifest
index a43dd664161b3033bfb62c0767edb5ab5dadd5ab..54320922c9baa5aa3203a5f51cfb2e6a988add4d 100644 (file)
--- a/kde-base/systemsettings/Manifest
+++ b/kde-base/systemsettings/Manifest
@@ -2,30 +2,31 @@
 Hash: SHA512
 
 AUX systemsettings-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
+AUX systemsettings-4.7.3-enablefinal.patch 1378 RMD160 e868f769ccc6d5c8d7dfa1b842d2bcea5fe255cf SHA1 e2a1a768279f23f93bd5ed8e101ab23956c556f3 SHA256 9bac73e4a1643d1c71f99ae6ea68b157839eadd70513187def54a0bbfebad3e1
 AUX systemsettings-4.7.3-fix-keyboard-layout-switch.patch 3944 RMD160 df7141b0096e93cadad539108d2ede2d1e751ba0 SHA1 1de7289c0d986196604f093d3a3fb71038b0a03a SHA256 0d3ab5f702853c2537a9f932308b1103678b8d676cf84ec42dff940f64736fc9
 DIST kde-workspace-4.7.3.tar.bz2 20556738 RMD160 c7298c81c978a722f54e033afe169111d2dfd438 SHA1 f3ed24e3e70671033718a5139cb61d0d7e2e709e SHA256 7403fc5ff78de55b1f9b6a1116001be3ad7906720521959d1f5de8c86677ac5e
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 EBUILD systemsettings-4.6.3.ebuild 2133 RMD160 5d5c18a1bf6476c9d67896e7ce3f25f4d2edb246 SHA1 db68165d7be88738be36d119b9ee4caecfe4928c SHA256 3f6ac90a9a857e5d337a804a8fd40b4dbecf1b90ce4d4010c21f7d0db409ec8b
-EBUILD systemsettings-4.7.3-r1.ebuild 2211 RMD160 0139e10517b2d3fa0dc4a7bbb2080eb00e40b62e SHA1 20dcd3abde47a772b886fd2566a4a5477f5e9a8a SHA256 00c8f045e2ef530a1058270d0e9ffe71c7546de70845805ba852afdecddb3bc1
+EBUILD systemsettings-4.7.3-r1.ebuild 2249 RMD160 9f19475070cd8f0854e1dc6e7912f4417935c628 SHA1 ec9e8600e7d61a4d22fb0d0cd3fe8df4c67099a4 SHA256 42161859f83d6ad1e809be1a2b0a597b44c7cfdbd6d7de30a7f3c364a9303dd8
 EBUILD systemsettings-4.7.3.ebuild 2151 RMD160 ba82aba86d1a95a3ad75ddb1f24ad1517afcabc7 SHA1 5b51ba29af6779bbf3290b37f15b86c2b27524b2 SHA256 889f1655fda94e819581dae06cf1ff11ae80fb7945a016489cba866edb682007
-EBUILD systemsettings-4.7.4.ebuild 2151 RMD160 ad00339ebaba6bef7e2b8655adffba2f6367c3cd SHA1 cf0700dbad3183263b0c2c8ecfa3e3ad18f15a0b SHA256 a00ebe980227f904a7064d8736635e294582f5a98edaf59b38008dfee2f4787d
-MISC ChangeLog 18579 RMD160 0bdf4cce418a20ca8fccef36f76089afe0b0e67e SHA1 c14c6ed46fde4971e882f56e4a34bc3487915ee1 SHA256 a5e5e630b62531179b23ea5d5ec4bd301d65136315a3fefa8d4c587e2cc99ffd
+EBUILD systemsettings-4.7.4.ebuild 2200 RMD160 8e520f124288123e4c74cc5ea04233192ddc2d53 SHA1 beb5ab698d74f13026a4d60d0e6f661c6ddce5e4 SHA256 76655a9d450f59161b592eabf99742e83ae0bfa5d4b214900185ea9ae3521bd2
+MISC ChangeLog 18788 RMD160 264911b6859ba1453affb10b3b6dd60bd4787bc0 SHA1 2c5c5e934d01a41049c070fadef01209108dc5d6 SHA256 0a0d3d116249e9f16de7d3099a942c9d5de013732769caca6c98ab5129ab3bc9
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO7kOUAAoJENwGBM22xffefF8P/3mtQkxte8tD9MYSY5qHBz7i
-YB/GC6HixiogV5XgDsV4F8Bva+6sUjeGGUhnYZhBWh3n9Xptf0vQHuc/+nlxFyB+
-fmJvuUQJgl2u8OHiUZ9u/qqeES7LC2PP5eB3ntpjsoIeSgm5EheA0rrh/DWUDYwL
-9U7yX4cTUBasC3dYzq/61JkPPR11e8ziOHEX3pq2MAPq82QFsg0tTN4K7LZyOc7C
-SM16dm/8H6gmEdPAwxbUSpNTcHs0puv9iVmo/vNL9TMJE4GgSocxjm92eoZP34Yb
-zZzH3Nepy5f65ooHskRfMkm5kXJH8L7pagfTJYQ3ndjNnFDOTdtbigsMWmMJj217
-JOxpV45dvwflhvTEymzpYa+UmFOg14g49q7BQVevoFUsXPaz18eZyd3OSy/QV26Q
-srHb6wjcftG7nOpKMqEP1bd7sNJ7zW3kQVUwiv0sTMPm0yY8HmrwFmr0knOjPP2g
-ELLa7aaQXfaH7pzp8bWCU6fI/0ZBnvi6PrmATZARoQeO2a6E9L/R23QLYKu73akT
-61qf/2reSAgP3ouXJrjH4YcDKUTPLxIy1E8q53bWBiB96H3mMVaOdBzkcUVZT2TZ
-SQEW0VLTqL9YlA0GzNl1vn7pP36ja8AKKSo4i9XqO+hv21h/AdI6+tSqxpu1qUtu
-2+q9KRDy4G9p9UU3iiFL
-=hmbm
+iQIcBAEBCgAGBQJO9yltAAoJEEb+UGWnxTyHZPYP/jNzLZPK+UPZEt9STD32/ZNv
+LPda6kJ3jTzhPhUIzuZu9ozsZf0JoLocrv0uV3bedUu6BUZj2Nb7fu1w3jzP/yFZ
+NrZR5Mn9hD4Uvuc7/vuRVLvxLpSztw5vuas7IjjZgTb+XyC/2rHWNR4AIeRMSEjS
+F9b3UcGq41W7p8wmZjYKsEtbtm9OrlmB/qmmRWNGPhF+dRvOYICDlHwTk/s7ySO+
+QuPGESu6ZVFGYPu7Xp+jdavkzM3MV3pAsikakbw47kXIACFVpj2BGhJhMCP/7wa7
+XaUgnBiOX+Y5hW9zKz8dPac7LorSRgWPjUmW5wrU8TtCN1e8juvjXy8uhfaqvYlz
+la3EDTRatp9e6TGg4ihDPwZ30J+9PaVlAjvRhFfVBoSPPoVAHxzCtSD7TxpSgjO6
+B5HL5MePD0MoGLhIjhYcSyQf8fLrXTSzQFdSVQzDy9dADjaVMXKJQnXKWgqgW0k5
+mE+ul9dwd0x/ca1+zRMpRPYBHdmnvy/T7M0aNUsqdn6EEYkW1hmP3oidql0RiHzw
+Ajg4JEUrH5iF2jy924KdOVcQTGRXSn+IY7nSh2WrYOUkkda/dwcuZhpMNFUrEkR8
+wAu1u4otBcK3KYqNJN8tZZyIqN1mgbn00TN58pqumZiGEuTZc8+9iQSjimu4Wf5Q
+BwC6r4xvLza6Af42ysbo
+=EPgm
 -----END PGP SIGNATURE-----

diff --git a/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch b/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch
new file mode 100644 (file)
index 0000000..c57f197
--- /dev/null
+++ b/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch
@@ -0,0 +1,30 @@
+diff -U2 -rxi kde-workspace-4.7.3.orig/kcontrol/keyboard/keyboard_config.cpp kde-workspace-4.7.3/kcontrol/keyboard/keyboard_config.cpp
+--- kde-workspace-4.7.3.orig/kcontrol/keyboard/keyboard_config.cpp     2011-05-20 22:32:06.000000000 +0200
++++ kde-workspace-4.7.3/kcontrol/keyboard/keyboard_config.cpp  2011-12-25 12:46:50.529622540 +0100
+@@ -25,5 +25,5 @@
+ 
+ static const char* SWITCHING_POLICIES[] = {"Global", "Desktop", "WinClass", "Window", NULL };
+-static const char* LIST_SEPARATOR = ",";
++#define LIST_SEPARATOR ","
+ //static const char* DEFAULT_LAYOUT = "us";
+ static const char* DEFAULT_MODEL = "pc104";
+@@ -183,2 +183,4 @@
+       return layouts.mid(layoutLoopCount, layouts.size());
+ }
++
++#undef LIST_SEPARATOR
+diff -U2 -rxi kde-workspace-4.7.3.orig/kcontrol/keyboard/layout_memory_persister.cpp kde-workspace-4.7.3/kcontrol/keyboard/layout_memory_persister.cpp
+--- kde-workspace-4.7.3.orig/kcontrol/keyboard/layout_memory_persister.cpp     2011-05-20 22:32:06.000000000 +0200
++++ kde-workspace-4.7.3/kcontrol/keyboard/layout_memory_persister.cpp  2011-12-25 12:46:05.173189572 +0100
+@@ -42,5 +42,5 @@
+ static const char* LAYOUTS_ATTRIBUTE = "layouts";
+ 
+-static const char* LIST_SEPARATOR = ",";
++#define LIST_SEPARATOR ","
+ 
+ static const char* REL_SESSION_FILE_PATH = "/session/keyboard/layout_memory.xml";
+@@ -259,2 +259,4 @@
+       return !windowMode;
+ }
++
++#undef LIST_SEPARATOR

diff --git a/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild b/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild
index 2ed530b0a8e02a0c879dca12ae3b5ffbf40e3df4..f655fbefec5bc0d078f12916915de24c4480ff25 100644 (file)
--- a/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild,v 1.2 2011/12/13 19:26:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild,v 1.3 2011/12/25 13:44:59 dilfridge Exp $
 
 EAPI=4
 
@@ -60,6 +60,7 @@ add_blocker kdeaccessibility-colorschemes '<4.6.50'
 PATCHES=(
        "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
        "${FILESDIR}/${P}-fix-keyboard-layout-switch.patch"
+       "${FILESDIR}/${P}-enablefinal.patch"
 )
 
 src_unpack() {

diff --git a/kde-base/systemsettings/systemsettings-4.7.4.ebuild b/kde-base/systemsettings/systemsettings-4.7.4.ebuild
index 0eb4472cbb41acc5945355946b8adcca6b46c6e9..139f86b49253abafb5b6fd3eece1c24252067255 100644 (file)
--- a/kde-base/systemsettings/systemsettings-4.7.4.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.4.ebuild,v 1.1 2011/12/11 18:52:33 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.4.ebuild,v 1.2 2011/12/25 13:44:59 dilfridge Exp $
 
 EAPI=4
 
@@ -57,7 +57,10 @@ KMEXTRACTONLY="
 
 add_blocker kdeaccessibility-colorschemes '<4.6.50'
 
-PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" )
+PATCHES=(
+       "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+       "${FILESDIR}/${PN}-4.7.3-enablefinal.patch"
+)
 
 src_unpack() {
        if use handbook; then