diff options
| author |   Theo Chatzimichos <tampakrap@gentoo.org> | 2011-01-26 23:45:57 +0000 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2011-01-26 23:45:57 +0000 |
| commit | 081a6117fd1f5201dfbf056838a3aef104dd42bd (patch) | |
| tree | 50a3c842ff24ae9e5137560947877ba6f9176f14 /kde-base | |
| parent | whitespace (diff) | |
| download | historical-081a6117fd1f5201dfbf056838a3aef104dd42bd.tar.gz historical-081a6117fd1f5201dfbf056838a3aef104dd42bd.tar.bz2 historical-081a6117fd1f5201dfbf056838a3aef104dd42bd.zip | |
Add missing patch from kde overlay
Package-Manager: portage-2.2.0_alpha17/cvs/Linux x86_64
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdelibs/Manifest | 21 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch | 30 |
2 files changed, 31 insertions, 20 deletions
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 8e46dba9b4df..7b7dfffcfb8d 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -1,7 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3 +AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 RMD160 aa41988215dc8ede62c5f1e685eb24d597c1ec46 SHA1 b715c25a4bbfbaafaba2275057071efbb187523c SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9 AUX dist/02_gentoo_append_xdg_config_dirs.patch 919 RMD160 1406b23f317710bf039aa6020f55781b6f2c2f6a SHA1 cc589b31277e5bb6322df0240389fa8423d8d942 SHA256 e0be8da02ea48eb6ad4dcb0d723bf2a619cc7ed57dd41f456018116fb05162f6 AUX dist/23_solid_no_double_build.patch 838 RMD160 24bea0cd76edd2709edcdc654b74ebf1566e7ef7 SHA1 534aef07069b9b89ff3ff80619eb35f0fd588b61 SHA256 1ef6f6e7fe4b31b79126fd0cefaadab03f0e6a4bd9194fc8f4bee4750620c4ad AUX kdelibs-4.3.2-solaris-fileunix.patch 1703 RMD160 6a221210bb0660781dfaa8c0102ae86cc678f97f SHA1 36b525e32c1b86892a9975a69ca8467e595e85d7 SHA256 162cc6e14570f90e69811241ce07a4968e786cbed017fd22a8347371cdd7ffb8 @@ -31,20 +29,3 @@ EBUILD kdelibs-4.5.5.ebuild 9310 RMD160 ba1849123405f11822bfd11cfefcb081b03ad781 EBUILD kdelibs-4.6.0.ebuild 9501 RMD160 6ae74d103effad399d2a05d8caec2d2c4e182e1a SHA1 8a73f46691c9b02f02227cfb050b567d809fd71d SHA256 64599e1846b1b0a56305bb6e9cf54ba4da05b90dde2a55e8e4f60a4e7798f79b MISC ChangeLog 119301 RMD160 6542d7c3e886f5cb60cf055c547261abbbca5d7d SHA1 493e77d79033b7f7e576bc257ea74e5c19b17073 SHA256 998e5c04c103526c7397e852c55615632a333d55eb6d533fe51231db50694caf MISC metadata.xml 250 RMD160 1cf3a68b9ec97616d8ad515fba750a045cd261e5 SHA1 e13cc9329dd1557d621d84e042a3cfac56490548 SHA256 01ebccaddc9d829aec527fdcfd6d81dc72b5034d0eb59881838ecc10131c12a7 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iQIcBAEBCAAGBQJNQITrAAoJEOf+E+/4L5Lm33wP/3CQI70hpHu0oyebJF/NHkjT -zqqbMeJEg+zr3anom9sG56QdNVwlKDNoBBVSpRox0/b6ANJIdp02UY8dNHnsuk2I -1KkJSOFqM814Rgl3gml8uSfA4SyEiClQAKWXpLcelvjrxOCbLkIOfqsp/qdajugB -Dc/D9e9OEuhnA15foXSyceTFvMXbVXE+Euey36oZGsS2mywKY1+nPVM/n5nL3ncx -Qt1RDcBOUeEqgibYmWMdWL1aTH/lN9R5Zms/P3iqfU9k7PPhcVb1smb1KHi0Xtdp -B8t+mFWr+OxzSLlvi067Fxpt7enWVol1z4zg1t4Tz0aKdDPinpBzn0J7JpK7vU1a -NykSce3caVEUCQSpaG7hRJ4HszJNTrX6Xv+4Cp3EMx/Efiq8AmXMytTAsfN+j7wg -CMjaBmgwzXJAwBC4hBmlT0fe2RFxHAwuVTL6YpsdiY0ip/eqVAIWwDkJL2ofEyfr -+eslpc+mpTScYowRCV9Jw3t2aofuJDN9PdNYQ2YOPFyytP+Pr4bvxW1j9SqXzI+6 -NvPKsR06Uln2nQAYfBiJQvGlC4DsijOC1bJsfdColdTgGaPIxj3DhVenlBZnjJ5g -u3D3CwGpGDTt56LV0MXA/ePxjGGEdi3Hbz/RvD+peaN1R2tfvTLzjPEDHGpP+Yea -PvfhpFjOatCGPpF6se05 -=/JYa ------END PGP SIGNATURE----- diff --git a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch b/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch new file mode 100644 index 000000000000..3049b0a7a28c --- /dev/null +++ b/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch @@ -0,0 +1,30 @@ +Set up XDG_CONFIG_DIRS lookup in order: +1. custom XDG_CONFIG_DIRS from env +2. kdeprefix xdg config dirs +3. /etc/xdg + +Index: kdecore/kernel/kstandarddirs.cpp +=================================================================== +--- kdecore/kernel/kstandarddirs.cpp (revision 1014759) ++++ kdecore/kernel/kstandarddirs.cpp (working copy) +@@ -1664,16 +1664,13 @@ + { + tokenize(xdgdirList, xdgdirs, QString(QChar(KPATH_SEPARATOR))); + } +- else +- { +- xdgdirList.clear(); +- xdgdirList.append(QString::fromLatin1("/etc/xdg")); ++ + #ifdef Q_WS_WIN +- xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg")); ++ xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg")); + #else +- xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg")); ++ xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg")); + #endif +- } ++ xdgdirList.append(QString::fromLatin1("/etc/xdg")); + + QString localXdgDir = readEnvPath("XDG_CONFIG_HOME"); + if (!localXdgDir.isEmpty()) |