diff options
author | Manuel Rüger <mrueg@gentoo.org> | 2014-11-18 13:47:24 +0000 |
---|---|---|
committer | Manuel Rüger <mrueg@gentoo.org> | 2014-11-18 13:47:24 +0000 |
commit | ef02bde2dadad45d050393200d0fc85000679e03 (patch) | |
tree | 9a829f7abf14f18e4eb3a3fd3d69961186d15f02 /kde-base | |
parent | Cleanup unused patches. (diff) | |
download | historical-ef02bde2dadad45d050393200d0fc85000679e03.tar.gz historical-ef02bde2dadad45d050393200d0fc85000679e03.tar.bz2 historical-ef02bde2dadad45d050393200d0fc85000679e03.zip |
Cleanup unused patches.
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/kajongg/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kajongg/Manifest | 23 | ||||
-rw-r--r-- | kde-base/kajongg/files/kajongg-4.13.0-cmake.patch | 25 | ||||
-rw-r--r-- | kde-base/kdepasswd/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kdepasswd/Manifest | 23 | ||||
-rw-r--r-- | kde-base/kdepasswd/files/kdepasswd-4.13.3-use-accountsservice.patch | 104 | ||||
-rw-r--r-- | kde-base/pykde4/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/pykde4/Manifest | 23 | ||||
-rw-r--r-- | kde-base/pykde4/files/pykde4-4.13.3-pyqt4-4.11.patch | 14 |
9 files changed, 18 insertions, 212 deletions
diff --git a/kde-base/kajongg/ChangeLog b/kde-base/kajongg/ChangeLog index 181ca44913bd..672fc2c6807e 100644 --- a/kde-base/kajongg/ChangeLog +++ b/kde-base/kajongg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kajongg # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/ChangeLog,v 1.167 2014/11/16 12:21:34 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/ChangeLog,v 1.168 2014/11/18 13:47:21 mrueg Exp $ + + 18 Nov 2014; Manuel Rüger <mrueg@gentoo.org> + -files/kajongg-4.13.0-cmake.patch: + Cleanup unused patches. *kajongg-4.14.3 (16 Nov 2014) diff --git a/kde-base/kajongg/Manifest b/kde-base/kajongg/Manifest index feee748e0f85..fcf4d3d514d9 100644 --- a/kde-base/kajongg/Manifest +++ b/kde-base/kajongg/Manifest @@ -1,29 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX kajongg-4.13.0-cmake.patch 524 SHA256 7e018126298f45f4cfb28128b1581d53901e89e7d43af9c7d2990bdf25788b66 SHA512 cb1ae7254756f28f748238f9a41c4eb76113ba6d058bd3ce624fff9108bc801541117f122d1fe9277a70dc8438b7f34f07f346af0f9863bf57c446763d6acefd WHIRLPOOL 34a490f10876a390b946d49b557b7f6c434df6ebadcfb3b378c929a55d79ab6343ea6229fa4091951cd4304f3de890e0f23cd90c32c2478dc08f17153fce3701 DIST kajongg-4.12.5.tar.xz 2457508 SHA256 a080702bd39a9eeb628bbe5084de53c90317bc9dd92345be880c1b7937c9c18f SHA512 69eb65f065e1e89318b468bd63f2d2168111a6519c35c02e0d7948e26a3d92f3400b9d38c2914211e8f7a6bd2f222d508c5b2afebfc12b87988143549bddab5c WHIRLPOOL 75c22727212752381e17456f447fe517fcd2a8314ef9039f9b0363fcbc09391627250dddb146b31627c7022a26840241c0b64086f8b985c8ba1b20896cf6d8c0 DIST kajongg-4.14.2.tar.xz 2510640 SHA256 79be4063a300b093d19a6b7e883d3f759e6442e2cf6f4f73e7024eda0e7e955f SHA512 7efb8e3e8c0029d260a99ee4c3b64fa4fe01837eb005666de9993632509be22164653240b9ea2fd6f03f038b5b1a806af688087e60a26aad351af68781b992fc WHIRLPOOL 482e2b45724cf9045b59027155b672bfc98b952e33e8654a821549c070c8c00d5e4ef00734adeb875c03ac4ff8f4824e0537bb7289b48c17c824f5c96828e657 DIST kajongg-4.14.3.tar.xz 2510564 SHA256 d6e9f2819124e4f1c27666b2ca944df2514327c8eb84e1e04b6f891e74d88eb8 SHA512 03b628b898ce29c695a990cf6857e9050af8a8503b4b50ebff14ee697952d47210110a53b5beb6e75791738a12618b58a1f9295285d58c28bfdccd22c1454857 WHIRLPOOL e202b4b5591777ac767ada4e0a7b1470064c4e5b5661aedf5881fe302784706d610b60533b8b77c5a3729e29ab327f3f84b9284cd2ec3bced501cf1b576fc275 EBUILD kajongg-4.12.5.ebuild 887 SHA256 26d46e1bc82a8fa05fcc7d2a0f7fc0c2313463f78901de497a863a3af6cfb38e SHA512 bb183e8df595bb5cd2ce6d6c170d196eb9cd17c87aa1395a256fec46ef8dcb5e19ed5753d100c1990350f24fe76d8f5910ef35ac830a161f67ebf7a9aac5458f WHIRLPOOL f2b3aa39c4b135ed9ea564074d9c653f39a93b4a0e0ee29b7a64803f3fa16c8cc2236f94eb4e9a4adbab3ccc320237c46932a808f544c0cd838f460ede906433 EBUILD kajongg-4.14.2.ebuild 893 SHA256 a113f10fa2fc280f1ae7cc6b570d2d62acccff54acd8ae5f9fb19ee82400b7cc SHA512 3e0911a9cbe801e6b060e2acda6de16575f860f15fa29401c3abde7cc95e031021b6fead88e8481d9bd9285f0a086f95bff78083800fd09dcb879e90a29a085e WHIRLPOOL c570dfc5e00be607055e2cc01f6c45873237ba5d93965e19298c4821aa5105fd27fb5864db57909f5bf3a97b24a3f0e1847c11fe2d7baed3bdff389f09450dd7 EBUILD kajongg-4.14.3.ebuild 888 SHA256 0ca34ff470d2c2cb7dc4083f40b4e40c9c529126cc75286bea82377f50f8a4a8 SHA512 02551e654d2cde6bf2eead1a54db85fad7c9cbc57f378d9232204a8d9e12405b916838ba88aaf5d7ec7815d854edbbcd5bb1d8285945a257523d2f23fe9affff WHIRLPOOL 6b7822cc889f574ed376f28c80f0d09c79d09a93b82a7b2745a2c25b98307cf94f92f9add4c467474ba8ffdb8221f5fb95196afe77ca89859517bc0da8b3e0ac -MISC ChangeLog 19735 SHA256 b22f67a8562574cc3ae8e9502ea47071750e5eb4bc1b3e19ad2fe3141699ac7a SHA512 8d8433192604a01c3de1fdf0f0c490377156a5abe9dc9197e3713c934041ab60ddd2bb42a8417db6a43b8c37658808c3540e3279fe684e7ebea0f096f85deea4 WHIRLPOOL b4529f2a776f2d07387ea3413ff98100f69db2f141bf36cf6e0f7c951fd831486a90a841508c445ec2c770ad295ffa7204f6fe1366ad53f4a3c18d884541fb19 +MISC ChangeLog 19846 SHA256 7174c7f3cb01c6f27b5e234573981e25733e025bd30142343b76ee6228dfdace SHA512 9e4c6ba4939be50adeb97cd85d546a5bfdd6432d399c761a4413be64357a418bab70674a8b87611c72344556f598afc570c4998c2a5768e515436d87280eb10f WHIRLPOOL 2bf1d99ad10e165c5a426c2d6b85da82c9e31da4552caeffb692db626b140e6d7939e13cc4148449fff0eba769d4c38030dab4bbd789b7377bd2f6d2310bd66c MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJUaJctAAoJEOf+E+/4L5LmMqgP/1yiGd3Q0LQjc8YrnNfONbNo -FaU2jHHzDwCvpa7JpJqUQ0hhTXKSPBI1fCrdwk+6zHV0Z2ft2p0qkU+cWtG7yAMi -SmuNX+iRse4a74Jz25ggjp3zJ9HCybBaWf92eAtvbJxL8+TYJ3mF+yc9tYqUb3o+ -DHQYfjOasFkuJuZcwN8PqwlyF3gDhL8h/XgIZp5Pl09smgt2MuSG0QhcJgBEVJfh -nlcBiLh/oNKBaWucTNlQQKdb9auKK9atbyjG2BvRL7eLUChn0K1hkPZHOEKW7xXp -e41+Xh2IlTpAkboCz4jSxakOr/8fNRjCTjU4K20TPuUBaekun11Agb22653TxBA2 -t9xDRGeCAQkUS5rSCMs+ep8qVFbP6KQxQmSN9jG8IrkjcWv2IjQcolqdDMgkLH4q -r2cEmL2MWn/Xb/qVggLWqiRadEvdsBwFFLmJCaQUJUIHfC1gedbfJJDRQfA9E56v -H8hY4yZv+fHs09hF/2VSJyUygrsTLxHwISR6+G9IyjSpr7ChDInQCWO8k18XfCkz -s4Tcp54FvYFLIPzY/6ymdAzmAtFwmBI9heUuN49dcLlXa683ydVrB1FkuWbamVMR -RgwbNwCMR8aZS6gtMQ0yqTfXbYHP/8NnPoV57sVUA+XTfCNcBzujjIZbJdpVY5Ot -bhdkIop1TkoqqTQPIQ7m -=+tne ------END PGP SIGNATURE----- diff --git a/kde-base/kajongg/files/kajongg-4.13.0-cmake.patch b/kde-base/kajongg/files/kajongg-4.13.0-cmake.patch deleted file mode 100644 index fe6fc09f9299..000000000000 --- a/kde-base/kajongg/files/kajongg-4.13.0-cmake.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 985bf653088e53483722009f6277dd439423fbfa -Author: Wolfgang Rohdewald <wolfgang@rohdewald.de> -Date: Wed May 21 08:06:33 2014 +0200 - - CMakeLists.txt: add missing .py files - - BUG: 335057 - FIXED-IN: 4.13.2 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b241377..ea51da1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -74,6 +74,11 @@ src/wall.py - src/uiwall.py - src/visible.py - src/log.py -+src/qstring.py -+src/qt.py -+src/qt4.py -+src/qt5.py -+src/configdialog.py - src/util.py) - - IF(NOT PYQT4_FOUND) diff --git a/kde-base/kdepasswd/ChangeLog b/kde-base/kdepasswd/ChangeLog index 50da32ac20c0..42ef893e94be 100644 --- a/kde-base/kdepasswd/ChangeLog +++ b/kde-base/kdepasswd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdepasswd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.333 2014/11/16 12:21:22 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.334 2014/11/18 13:43:11 mrueg Exp $ + + 18 Nov 2014; Manuel Rüger <mrueg@gentoo.org> + -files/kdepasswd-4.13.3-use-accountsservice.patch: + Cleanup unused patches. *kdepasswd-4.14.3 (16 Nov 2014) diff --git a/kde-base/kdepasswd/Manifest b/kde-base/kdepasswd/Manifest index 2113046e00a0..b7bc1871ab56 100644 --- a/kde-base/kdepasswd/Manifest +++ b/kde-base/kdepasswd/Manifest @@ -1,29 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX kdepasswd-4.13.3-use-accountsservice.patch 3436 SHA256 fa1de0d28136d1cb47fff77a67837e0c8278478ea8755177303aaf8bf09105ea SHA512 b0071e6dff074f3d7b44c0f0088ae20803ba780227f09b0700e2e15973dd385bba86336eaf071b67d3a0b9e7c338af27a0bd1a1ffff2413e2c008c8c222fedb6 WHIRLPOOL 35aeb274dbb3ff057fd96862e2cc26a949b30066b9696ac65657ff392fb80869247590cc8cc5a48725ba18e0cd01b1ea6bca2b732e31fe1779ebfbf149f14bd1 DIST kde-baseapps-4.12.5.tar.xz 2533496 SHA256 577f89eb4a0301f6e1e4efb6ee9f983c5b940e9effd0e540e58bc820fd36d078 SHA512 700dd91196d9c8a0e20e8890d71e163fbe2cb06bd0d0afea1cb4a9565ea63660fd6284c049d19d3de874f22009cf8be72def53b4ec97d5314b9ae5f97ea37d94 WHIRLPOOL f28190d028f9c47b5fdadffb2a421f3dd527de1227493b585e623cedee5777a8059b15464aa0c0dbabd073b130fd7de5cdc41cb6f80fbe93dbf368c1afbd99bf DIST kde-baseapps-4.14.2.tar.xz 2548072 SHA256 dfe3728522be0d10b1b79f54fe06b26be89b62cc88025d394c5750a31a26defe SHA512 511f97e56363afd8cf31256770f6df3e73fe62a56a927f6d1a5436b4cea61e37e16511428c23bce6f7c1d0cad74021ea7150432a082d2943d3643d08c4424e23 WHIRLPOOL 93a55654f6f2d26b2d5fcff5a860e14500211ad760ee686997ea6d37b562a490ad6a30a4eedb198eac632256a2e2fce93c0b22b2c3529bc92e71e6c6591a90ba DIST kde-baseapps-4.14.3.tar.xz 2548152 SHA256 125baf42a7ab8c255b5829d12837f54c1791498f79593a9b09a9e55344ade6db SHA512 d422c1ee5cd2e1dc15b5baa2199bb85441196bc3048b9bfa443f898c3a1cfbc7f66087edf016fb594b9e48340517beef54b4429b4fde664374e75486c7cb0f9e WHIRLPOOL b22a98d140bb66ea47aeb5607e606c7a531c82787e27204f5eabb7d29d763b2bfe1456d85242d3e05e7ab4d2366fc622ef1cc624dd1954e276fb36c49840998a EBUILD kdepasswd-4.12.5.ebuild 489 SHA256 4e6a4077b4d860da25f7852b97479fbf7dbb5d935d0bf864ef1e64632586d7bb SHA512 25244b8bc9089fa518c9fcc444a64434ba0297bc50147668646bb7184c53e9de3b21b46a126cd5772c5187224ad38a999a0c488b8065c2c23b894d9d7a72b62d WHIRLPOOL a11e052142c97b146474aee746d6845034b23a70591674e64dcd3f86c69a8788f7b62fd19a50ec4f2f74b5c5af01d82da6b1121209c27fd9b8053f59f8940d2e EBUILD kdepasswd-4.14.2.ebuild 525 SHA256 7306c2c99aee5c183ab5999ac1f0a5fc599c08664a58d771b3fbd28c3daaf1e0 SHA512 a35af45da4ca4c0952eef7c8a771c28aee529d777ea0b247eb188cb17f7361f45bcd2594b55289440d5b8a784e75283f7af9a0019561fe87a1cfe20b30f337c4 WHIRLPOOL f92425921855a01e9b516cda6ef165e1aa37d5f4688bf4960e5ea9bca679dc6c9c9f41c1516560362999677b779663d646144daac50ba6c7871c775c04fd611a EBUILD kdepasswd-4.14.3.ebuild 521 SHA256 62b55037d61aa644fb20d79e05a4f24ea466118c724b4f57a11b76f482f99464 SHA512 430d479a5997fa420dbc06c657b36b322a7f908d48444772559b642e0529ce170eecb9c800cc3714181b81f4f90fe399a4383b81afa34d377569943ba018cf4a WHIRLPOOL c5ed3e206e3c0f2f70ed07ac3ce892bb28f40416de4146d51eed06a13bf8eac2a0f1421727445148f78ffd261d0b72dd95abae1ee9c62cda65ce7a644e8462af -MISC ChangeLog 40256 SHA256 9cc7a43b523c80c062a0b926e01935e90df5269f0fc0e5f627fd456ae2b4b1d1 SHA512 0d5e73d466fbaa63d1180d4e47f2edfe4fa62f780c4a53b237855a98122a43d0f29cbbcd1d5d3f99f56b3260084bdaf900800d864aaac31bfea3c0ba46410f20 WHIRLPOOL b0c97fb376b4296e73b6453d9ad5d3559d7c67ea1b4353bc12db3f31939a08869c182d8a137641e325052f3a381f8a0b9628844d0e6f7aed0e5fd075e5146e11 +MISC ChangeLog 40383 SHA256 eb3cc9260b0f6bf91c82d3a2e6ed4cd2608f06094117c4261445b388d240c0df SHA512 a94f76977305da5f08d79ea7c686fca6ed341124028166036a35da5085a7a3f74c31fd79c79811c53810315113e0868f080d1c0d62d10936259fbe169062dbb5 WHIRLPOOL 0676133bf86d496cfd81a3dc73cf3f8d4b3a30fa18ec01ad05332fa6c8f23bf1d155d7c27839356bcb934d1f7414ee17180c650ef8e417537ab342796958dd4a MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJUaJc8AAoJEOf+E+/4L5LmsaoQAJGz4BrWkLjRk0L+hP3+/sky -CSNdj8o01zVnVD37tSJpe6VnUNndohycEWLiYM0qbYpfmpu6TEfYOxq1VnRHFzQP -LucOJlvQ1YMJXLj9aVnOLKP4RmjjODRMjBO8wOoh+VTMhFduHtfhs4076lPOesRI -LQN5PWVRCnEZW32Ft0s4Z1kOg4Se7gt5XcObxqZf3s4P0ihiwXDTjkmb1CSiJ5FF -k9J/+WQGMLqQboY5N1SoUbqNtsdA6ENwsivBTDIL6okxYYaHQkkmGgowow9pJCRY -kGsc0QzcZ4eP+YBa0QsLPzYy+G5noTA67Y1XOXsANFLyqHvYHvJNtSP2vs+Lbes7 -plvnhN+qXP1QjvrvBHTkH9L2ZhS3AktOp4wLrnwyTC+1HK9XNLmVXunSpy3Zzsx6 -tfD9O+/51bG5v7I38wkb+ODxfphHrB9t5HPsYYMBUVWV9gKAi+Kl+gzjp26jBAfO -2l5GHN4hmEDaiJr0eBhjNanhrrabk1LiteTB++cgjorwB1dUUJfy1MNVZn13DXSD -9Tuw+h5409ku4wCHdJf4dupOcN9/a1wQbvnkymCwzrnT+CehTF0p914T15XUS1nn -YQ1XqPCtswMmQQyZ/dBNH64UfuQQVhhKgsXzgcKD9SLxLiA+0ytESJTjyH/dBkCu -KGXTkJxSmZI5+9yZ8MHD -=tps/ ------END PGP SIGNATURE----- diff --git a/kde-base/kdepasswd/files/kdepasswd-4.13.3-use-accountsservice.patch b/kde-base/kdepasswd/files/kdepasswd-4.13.3-use-accountsservice.patch deleted file mode 100644 index 5a89d4d809db..000000000000 --- a/kde-base/kdepasswd/files/kdepasswd-4.13.3-use-accountsservice.patch +++ /dev/null @@ -1,104 +0,0 @@ -Use accountsservice instead of calling chfn directly. - -This avoids a potential error or crash when changing user account information. -Backported 77275f50241eb2f4e38051152074c379fa96fe84 and -23bbe79912ec21ded8fdfc595935f48a6d2298ea from Plasma 5. - -Gentoo bug #380899 -KDE bug #156396 - ---- a/kdepasswd/kcm/CMakeLists.txt -+++ b/kdepasswd/kcm/CMakeLists.txt -@@ -1,7 +1,6 @@ - add_subdirectory(pics) - - set(kcm_useraccount_PART_SRCS -- chfnprocess.cpp - main.cpp - chfacedlg.cpp) - ---- a/kdepasswd/kcm/main.cpp -+++ b/kdepasswd/kcm/main.cpp -@@ -49,7 +49,6 @@ - - #include "settings.h" - #include "pass.h" --#include "chfnprocess.h" - #include <KPluginFactory> - #include <KPluginLoader> - -@@ -181,36 +180,27 @@ void KCMUserAccount::save() - /* Save realname to /etc/passwd */ - if ( _mw->leRealname->isModified() ) - { -- KPasswordDialog dlg( _mw ); -- dlg.setPrompt(i18n("Please enter your password in order to save your settings:")); -- if ( !dlg.exec() ) -- { -- KMessageBox::sorry( this, i18n("You must enter " -- "your password in order to change your information.")); -- return; -- } -- -- ChfnProcess *proc = new ChfnProcess(); -- int ret = proc->exec(dlg.password().toLocal8Bit() , _mw->leRealname->text().toLocal8Bit() ); -- if ( ret ) -- { -- if ( ret == ChfnProcess::PasswordError ) -- KMessageBox::sorry( this, i18n("You must enter a correct password.")); -- -- else -- { -- KMessageBox::sorry( this, i18n("An error occurred and your name has " -- "probably not been changed. The error " -- "message was:\n%1", QString::fromLocal8Bit(proc->error()))); -- kDebug() << "ChfnProcess->exec() failed. Error code: " << ret -- << "\nOutput:" << proc->error() << endl; -- } -- -- delete proc; -- return; -- } -- -- delete proc; -+ // save icon file also with accountsservice -+ QDBusInterface ainterface("org.freedesktop.Accounts", -+ "/org/freedesktop/Accounts", -+ "org.freedesktop.Accounts", -+ QDBusConnection::systemBus()); -+ QDBusReply<QDBusObjectPath> reply = ainterface.call("FindUserById", qlonglong(_ku->uid())); -+ if (reply.isValid() && !reply.error().isValid()) { -+ QDBusInterface uinterface("org.freedesktop.Accounts", -+ reply.value().path(), -+ "org.freedesktop.Accounts.User", -+ QDBusConnection::systemBus(), -+ this); -+ -+ QString name = _mw->leRealname->text(); -+ QDBusReply<void> ureply = uinterface.call("SetRealName", name); -+ if (!ureply.isValid() || ureply.error().isValid()) { -+ kDebug() << ureply.error().message(); -+ KMessageBox::error( this, i18n("There was an error setting the name: %1" , -+ name) ); -+ } -+ } - } - #endif - -@@ -243,10 +233,12 @@ void KCMUserAccount::save() - } - } - else { // delete existing image -- if ( !KIO::NetAccess::del(KCFGUserAccount::faceFile(), this) ) { -- KMessageBox::error( this, i18n("There was an error deleting the image: %1" , -- KCFGUserAccount::faceFile()) ); -- } -+ if (QFile::exists(KCFGUserAccount::faceFile())) { -+ if ( !KIO::NetAccess::del(KCFGUserAccount::faceFile(), this) ) { -+ KMessageBox::error( this, i18n("There was an error deleting the image: %1" , -+ KCFGUserAccount::faceFile()) ); -+ } -+ } - } - - /* Save KDE's homebrewn settings */
\ No newline at end of file diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog index 827021da91a6..84904d34d034 100644 --- a/kde-base/pykde4/ChangeLog +++ b/kde-base/pykde4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/pykde4 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.305 2014/11/16 12:21:24 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.306 2014/11/18 13:39:00 mrueg Exp $ + + 18 Nov 2014; Manuel Rüger <mrueg@gentoo.org> + -files/pykde4-4.13.3-pyqt4-4.11.patch: + Cleanup unused patches. *pykde4-4.14.3 (16 Nov 2014) diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest index 535d4b7f69ec..4416dddd541a 100644 --- a/kde-base/pykde4/Manifest +++ b/kde-base/pykde4/Manifest @@ -1,9 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX kpythonpluginfactorywrapper.c-r1 1255 SHA256 f89773e5b44515093a0434a2c8925097d0dc358b58fa11a125e732d191727576 SHA512 aa167083a56dc0f7d03c282cc4adec062f56d610ed39c55fbe1dea918d08427e86da392b25b0982c7db6c69adeb342bd6e53b290f24c1de028d9f945e0df1229 WHIRLPOOL 96a08f80bc88cf1d278dc7980a585d8e7b29945a6a9df1cdf6d685434996f861cc9b50a849848415298953a922892e7096d32b2d37aa8edc47755b9506d6b77d AUX pykde4-4.10.1-arm-sip.patch 630 SHA256 0697830f7207838640e3f47b13c5996260b7e1c742e965dff0ed6e2cfe66ffa2 SHA512 8d976e65cea346a7bf3b8af1e8d3fc8b59fbabd05515daa63b13943317b8d8b1f99e39fdb07c43d64017dafea94def1b6c4c95aefa37fe2ca025f93f28e67741 WHIRLPOOL d6d8a7d259afc2cae26dd905d72721523868142817edee868300a7a4f98311bce844739bb42b09ab0a91f2cb81a15db83a162b1d8deacfadf33c55df62ce40ab -AUX pykde4-4.13.3-pyqt4-4.11.patch 560 SHA256 bc0084342c177b3dce7196a9be4bb159adba5b548d2601cc8537402153fba865 SHA512 aa8e65b87196425b1be52e5a3d002e07de74fda0e02e7b73a0db4ed3b6b67e814f702c21905baeea55afb0de356eb54c29590d691300de8ea4a46e82f25dfb85 WHIRLPOOL f50c59fbbd2a1d97d5427b2ae130d953c4710a1c072424dd412f741a723f8c07c31c7634bfc242655b1dd624221dc55721b5b36c16f8a01883bd7857c4b9cbe3 AUX pykde4-4.14.0-arm-sip.patch 656 SHA256 625d9bb89212243d7c4e0d83464bd30f3f941789e01f0c04d5f799ef7afdfc41 SHA512 7c77099f6e96d80a730aca18dbfbdc4c722b8cb45f7193087e035f1fe12d83716209d09fb84e25dfa97fc54ad1957e514cf829f41ed173d95f4dd68d3ebbe62a WHIRLPOOL 5c76d96a07d0e87a56fbb253236ba9f6774148fc8e12ec0452c9487535aa2172811f426eecdc7bd3abf63a85f8e67609e234911ccfeea56412b80b7267ce8b6d DIST pykde4-4.12.5.tar.xz 2005104 SHA256 f03649015070ad9a2c6b0015af0c9972503012b3fe7f3d9b0c6d06fd3f479554 SHA512 b26ef3cac39e03141dc739bba03d8be4a095f74b31de0296fc1991e9cf60013a43bb03a4fb5a8673fc98d4824a5a10ed6fd18261d1b23bcf74059d28c780b834 WHIRLPOOL f176ccb420abee5768836bdab650152a335f06cc72b21bb559192c04a08f0ebc04c3d08c2150291ab2d93b931846cf4a0fcbb0bad7af8b39994aa011b216774c DIST pykde4-4.14.2.tar.xz 2006424 SHA256 fb31551e54ab6f321e6d318664e8e4e8031003de0fd688d63971edca888ff7a2 SHA512 a9415a1f10ea4853ddbc80c5b9e147c015e4f47ba19f8c2d6e8ff029729b74a6f3c637d0295b45c6cc50ad2d30490421599b8f70549e01335ee8ffc6b6346bf5 WHIRLPOOL 0a7e5727879b9c61d82e7c7fe244f0f718005c9ab38f38835cc14effadd861ce7b6896a950d8fb77e2fa3767a06d570884db02780d2bf788e8ef13832cb4f8c0 @@ -11,22 +7,5 @@ DIST pykde4-4.14.3.tar.xz 2006504 SHA256 7fb9d7b5ed03d531243ebd67939baf30933452d EBUILD pykde4-4.12.5.ebuild 4297 SHA256 5aef84bf386fe13ef85edc339e88359028901d86dd7805276ce17f937592ea50 SHA512 04826db535c19e69e29a97b03fefac295cb334caf8878d74125f7a3cfa311443655f2188223e217b2429845600af087cff4708fa913c5b708e3ea6dba6bcbc41 WHIRLPOOL 1d232fd64914d2ff2b7c3e5826259da5a2347d75ed5ad03c273b9d4319f437ff4897366bb894d070b2f419c23404dd5d96a83189c4fc29eab0409d5165b52f43 EBUILD pykde4-4.14.2.ebuild 4366 SHA256 b8f6628d1e802e1dd963b66f13607dfeedbdbb6cac6421b3efe9eca0be0540d1 SHA512 6c9854f9c68f44bc4ca0b6756d1db6b2229c3d9d09166a9d0b32509d9f8e08b996af237e20aa1179d0200e5645bc86f05b943ce9c87727035aa405206c927309 WHIRLPOOL 6ce2a14d6af225d33f0dcdaccbc75eda1cb2a4076422d6796e6784702644911baa7fdd2c49b2dfee2f815e8777d59f26371539703bb218dd61baa626d1aabde4 EBUILD pykde4-4.14.3.ebuild 4362 SHA256 c088deca9454d4798a656fb99e598861671bca82fb6e13ad7bb8de1e49838005 SHA512 638663d9487f29d20f0bcf5180ff39d784a2c5bdd4a68ad35d4eb1c08f0b5da989bd7fa2e2958def4028d8bbe7e08cf8defd1970319188adae32f8ff1f7ce98e WHIRLPOOL c81dfcbe12eb6230fe51c53e2f205ce946db589f3d74ad6209a1494a82fd5c1e1206ab77f0379e397fefc095c379e9dc547bbb3f465996b6a4b734fa5faff0d9 -MISC ChangeLog 38997 SHA256 3ff4cabb4fb154f1651fe3fc85f8bb09e36a41ad998f8aa26e3166daef2c9fb2 SHA512 88bafa4f1c8e5e91156b26521722a33d8b4a253881ae072285ebb877e4e6ed6b3de3b6e69b1f99aef698c01f577360bc4e59e897956d8c5ff9ebfd451d192402 WHIRLPOOL a78ab2fe62c7153502e25a833fe74258d835d2d04645d50d0d10b0756f721967c3330bb68dddc40f106767b14e11771b7dd130b5f5ec8b981552e304a240d668 +MISC ChangeLog 39112 SHA256 a90fde731a21435400638afcb1e2621841d4ac25b2dd1ec0d3b8cd600e68faa6 SHA512 ef4712c7d18852d82e8b2e6df8cb535d72a3c1809f2c3f1d2e8b1f751bcaf3b8cd70295a9cf3384ae7be34ae9e73a2868973720dcacdf89ca41d77cdae799ded WHIRLPOOL 8531f0fc6f5eff44e6573410c8f75c4bc01ac0b9e75edb0ac33443798915dd8c778d7a166cc7531bb917f90ac3741ee7d78e0eaa0075dea748c7d820d3d53713 MISC metadata.xml 382 SHA256 25b7cd412982aad7c20c6c613ee3d70ea82528fbd674476db1640d71174b27dd SHA512 1d90dac63896b5c49aac8d7ed5bffc81036ba7543c8674618da986ebd69abc45d5d7e2d0a33e39f34a2572b7942718338d26dbc0068b9671cfe260a18ec19563 WHIRLPOOL 04e9b0a99f7008c67727a2491115c18be708ff0e20a56ea677a8223f17e47c9e2f3e0385c5b0ceb9b6dfb755602d46c3d2db37e8ad1cafe9dad8d6d3cb15e37e ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJUaJdlAAoJEOf+E+/4L5LmtsoQAJisWcWlh0eNDOwCdVzyCWsD -cTgC1gEyTx6+KBGVEV1T/oPFlsGUTs7J9mcHA2PEdvlb81JQIiK6OqMoBe77+EHh -0p6kHsJJ2zpwdLZLUJ17bvxa6idYxWgqc/BrAJA65wgSOIL/Bp/DIUN5H5396s7f -XXbaoOPF/qBVZ3zQ2A8EU3eaOR7LiPt2m3u9+D/CVal10UJOi0WpYQXypMw7zspO -+I62VyAEV1+tvNgLOJQlA9j9bFA/wbNoiiJ9lthR4v8OpnjmmDcHu/0WTDnJ5mTq -Ep7+SRGJAbUQPsmucmkPhU6tqwT2dKOa97wmFzXYx20eHMJL++jrrIfVZ4a0A1SA -ZBWW2DeUkylucx69jCk46+JRRLR7GlJeHKvOt+gEhG112Z9sjCYuaeG4GUr8xkSX -7Cyt28hyW5hzNYZenkBiLGWVpuJ6StrxpwhncDQqrv7QUecE5wt/SxLMOdnxx0Fm -v8wdR7Ep+6nktTeMvTPAGPMQLSPGTuCXp72O7q5tlo+sXrKlzo3kqf5gXQ5bqG5n -1iudo0RbCCYhapYnkLUO2kBxuNVqe9BbwEKbmStMQHA5slcuod5DDmPrSw+GCo4o -rqlpsa4qgFNsIl4ktXPQFQItRrlKzLMTqGJbAqfXb/zSbm72dF0egCbBISSGtlpV -FAbBwSBFqDAV4HKw0xoE -=iKpu ------END PGP SIGNATURE----- diff --git a/kde-base/pykde4/files/pykde4-4.13.3-pyqt4-4.11.patch b/kde-base/pykde4/files/pykde4-4.13.3-pyqt4-4.11.patch deleted file mode 100644 index 8c322ef2b310..000000000000 --- a/kde-base/pykde4/files/pykde4-4.13.3-pyqt4-4.11.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.kde.org/show_bug.cgi?id=332223 - -diff -up pykde4-4.12.3/sip/phonon/backendcapabilities.sip.sip4_15_5 pykde4-4.12.3/sip/phonon/backendcapabilities.sip ---- pykde4-4.12.3/sip/phonon/backendcapabilities.sip.sip4_15_5 2014-01-18 13:18:35.000000000 -0600 -+++ pykde4-4.12.3/sip/phonon/backendcapabilities.sip 2014-03-16 16:56:36.865132943 -0500 -@@ -26,7 +26,7 @@ namespace Phonon - { - namespace BackendCapabilities - { --class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/ -+class Notifier : QObject /NoDefaultCtors,PyQtNoQMetaObject/ - { - - signals: |