summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-03-11 17:15:03 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-03-11 17:15:03 +0000
commitfd75b267096b1f93eea0ce6a59ab774a4262cdc6 (patch)
tree530b0b95b8c327f859c82ea90452dddc7230d9eb /kde-base
parentEbuild for rt61pci firmware, based on an ebuild by Davide Pesavento in bug 20... (diff)
downloadhistorical-fd75b267096b1f93eea0ce6a59ab774a4262cdc6.tar.gz
historical-fd75b267096b1f93eea0ce6a59ab774a4262cdc6.tar.bz2
historical-fd75b267096b1f93eea0ce6a59ab774a4262cdc6.zip
Update the patch so it actualy apply.
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdelibs/ChangeLog6
-rw-r--r--kde-base/kdelibs/Manifest4
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.2.1-kcatalog.patch4
3 files changed, 9 insertions, 5 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index c6d1831cde87..fba41ca2107c 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdelibs
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.571 2009/03/11 14:47:59 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.572 2009/03/11 17:15:02 scarabeus Exp $
+
+ 11 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+ files/kdelibs-4.2.1-kcatalog.patch:
+ Update the patch so it actualy apply.
*kdelibs-4.2.1-r2 (11 Mar 2009)
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index c5342c7176e9..1ac4f7c40abc 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -20,7 +20,7 @@ AUX kdelibs-4.0.2-alsa-optional.patch 1742 RMD160 ea660d1148488fdac27970587535ec
AUX kdelibs-4.0.3-CVS-2008-1670.patch 739 RMD160 348782a28e75435c4b36548879d2d8d243fc0436 SHA1 c08f374abc2f44cd1ece01881b510ef83241f186 SHA256 41e219e50b652800a2ca892e70baeb40ee6e7cf0f981d098dbdf2ca0926ddf5f
AUX kdelibs-4.1.1-cmake-modules.patch 2905 RMD160 d7043d4153927ab655c4d7630389024983c6b95a SHA1 9d232044bf51f98656a48092082a5aafcb9d4699 SHA256 8836e0c8267054b2dedcf1c879e57bde67ff83c1b824337dec81d96a3d69754e
AUX kdelibs-4.1.3-gcc4.1.patch 10046 RMD160 923b2d8d1b88651601d0fababac9251d37e84709 SHA1 86718c9abd5b68494136a83dc2d7bc696cc6612e SHA256 b6779f1bf29272ac160e559ab8315e8f7bad42e4f13a1092284e66849b5cc627
-AUX kdelibs-4.2.1-kcatalog.patch 1611 RMD160 6a2acc649e7f2cb08ca22ed8eecb6313cb32eb0f SHA1 7a0ad824246106d7ed3fbd310725fd4df0f31189 SHA256 3a1dbff55da070638233bcf6f91e16b70c4562a3b4a31f8e5529a5f3f960e248
+AUX kdelibs-4.2.1-kcatalog.patch 1653 RMD160 068c80e3818051df6ebe14a333b840545e8e67ff SHA1 2c6015e1f1357029b751187e698457daee3c9b59 SHA256 11951b308bd63ad87ec9e8c77579e8f6afbe87cea6f6cbda23b08809d98bf881
AUX kdelibs-4.2.1-qt4.5.patch 19805 RMD160 4a266bdbe3d9dcc088f7abbffc2b46714d57208a SHA1 9490015fb83982d0aeac3a1b7918fa4262957782 SHA256 2a3ffd511d25d8a4fc4a8e246e97245a78af7766a33c6baac382568da04dc791
DIST kde-3.5.9-seli-xinerama.tar.bz2 15150 RMD160 09f9dc74e52d1507a73d1140654021d2baedde3a SHA1 cb8eaba630ee7c8f93c634512d52a9d1603d5405 SHA256 769b0135b327b3274aa45d78ae882811073041fdbfd55267106b1a3f42115966
DIST kdelibs-3.5-patchset-14.tar.bz2 23248 RMD160 223ad8aa6d3dab3a6e23a89e00eaf2e90bab399e SHA1 5d50fff6b6a26d8abffa4dda7360b42e0fc29eac SHA256 50d1517fbb3b70890b1858533a77fb0e6e1e72612e155ebe5350e8fea7405273
@@ -39,5 +39,5 @@ EBUILD kdelibs-3.5.9.ebuild 6042 RMD160 5402e42899c0e55787f8b7f5650143dcbc4410d7
EBUILD kdelibs-4.2.1-r1.ebuild 6725 RMD160 8e6fd0382b60cdd150c89c94d3bf762112d1ce08 SHA1 dc471bf0cc1515f319cf53fd26a14970f57f106f SHA256 31b7846c08aca784f083f8d97e409f983a4259f73a4f52334fca0357b9d921ce
EBUILD kdelibs-4.2.1-r2.ebuild 6830 RMD160 970f72fc9206a57420d96d076817575b831f0f2e SHA1 efe5ca496bb7c27f1f46bba64946c6c82ad79884 SHA256 07dee0b36f7eb3f26f78fb8b53fc7406add5f3c59d0beb5741b477f3f5030afb
EBUILD kdelibs-4.2.1.ebuild 6570 RMD160 63363a2c262f23189f7a63ddf8f20a2915cc76ea SHA1 df38ba5ff222935f4d4f45a034ef6dd0b6f158f6 SHA256 1376a9c68399c7de53c7e0f02448b9e66882f11fe9b69d24f22d22ac4665bbf0
-MISC ChangeLog 94276 RMD160 e5c2bb0b83fab89036fb3e468993d574995db7ef SHA1 65ed12257876e22277dce50daa6f1b07fdec5c28 SHA256 6e8ee4b2073b0b14459cd4d8f56eed146596e4b85a37e4c32e464ce2305f347f
+MISC ChangeLog 94405 RMD160 15325673e28e980f5ace9a8fb4768dcccf317677 SHA1 a428994c42101d415de6ae239fb00a264b1dc2c6 SHA256 16af184760a459d1a1a7b0f78ea7380f9fea4626970e74a5a77ac892c88c8795
MISC metadata.xml 375 RMD160 0a16bbd99eb0c4f3d89dbede17c5d6feea41c6ba SHA1 531b56c08557857a57c7833d2bab42cdf879b9a8 SHA256 3b5a8f2ca27aa45532679f3ab64756b02a953c5c11e86d9539cec95bab292b9b
diff --git a/kde-base/kdelibs/files/kdelibs-4.2.1-kcatalog.patch b/kde-base/kdelibs/files/kdelibs-4.2.1-kcatalog.patch
index 40d4884645ae..f8cad2ce7c2b 100644
--- a/kde-base/kdelibs/files/kdelibs-4.2.1-kcatalog.patch
+++ b/kde-base/kdelibs/files/kdelibs-4.2.1-kcatalog.patch
@@ -1,7 +1,7 @@
Index: kcatalog.cpp
===================================================================
---- kcatalog.cpp (revision 938013)
-+++ kcatalog.cpp (working copy)
+--- kdecore/localization/kcatalog.cpp (revision 938013)
++++ kdecore/localization/kcatalog.cpp (working copy)
@@ -30,6 +30,24 @@
#include <locale.h>
#include "gettext.h"