diff options
| -rw-r--r-- | kde-base/kdelibs/Manifest | 23 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch | 30 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-9999.ebuild | 10 |
3 files changed, 37 insertions, 26 deletions
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index d92db8af6fa..4411cb6ecbb 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.1-macos-unbundle.patch 4132 RMD160 da97df90e4eb45d362b862694037ba0e039dd375 SHA1 85735e3772c1293b43ee906f0cc75702c6a3881a SHA256 fc9fff7113277f82f5aaa9aecbc4385c6c48c2f6fd945d4de838d3edb4657e7c @@ -23,22 +21,5 @@ AUX kdelibs-4.5.73-module-suffix.patch 4098 RMD160 e003fcb8a496bcbc1c77f16a1e4ab AUX kdelibs-4.5.74-klauncher_mac.patch 952 RMD160 666491525d51ca24c9b4228d97aa368ebd9b2eb8 SHA1 6a0ccd169f910842d27d1cc16f4f0f3e7c671de6 SHA256 8477a100f6c73ced8a8be06ac9025d83434fa6396daea8f86df85d7a3fb6fe84 EBUILD kdelibs-4.4.9999.ebuild 9145 RMD160 347c547039836cf309e8a882f2fb3b080ce60451 SHA1 b85c962e01b4d9d2baf7774e93519787be0e84f7 SHA256 843fd1bf4859b2f5a5bbd23c912e5ec513a576d19fe94ae0f5b80278b77914ea EBUILD kdelibs-4.5.9999.ebuild 9192 RMD160 aea9f8a496a66d9bcb169aff45a79f834cb42039 SHA1 140b699b0f526df9f86fe11ac36299aa4d98eae6 SHA256 513782145bb5267debf06d363c29b263e3db056b6ef573ff1f9f8242f0b00ac4 -EBUILD kdelibs-9999.ebuild 9124 RMD160 7a0e60265ba87639c7528ddaba78686a5529c166 SHA1 ee0c3101b99ecf809eee352dc75a299e7a8c8599 SHA256 c1fa92342701c5e6962dc2a215f73841bc40099ebb34ac13bd1d33f2cad86458 +EBUILD kdelibs-9999.ebuild 9292 RMD160 ecbed8913abf91e0104ff3f89b4ffda087577715 SHA1 aa843d906fdf248e4d4c632ca961f00fc9a52f6b SHA256 8501b75d412bda5496312eece7fad9fa9d36d11a4c792b34493a542c4c9977ea MISC metadata.xml 310 RMD160 29952f07b1829170319534936d11d39f1f7896bb SHA1 90ad5d77993322d4c25338f4005aaa4b642961c3 SHA256 1ce0cd7403862637e6e913bee33bf9f54a176bd1466d168be748e997a663095a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iQIcBAEBCAAGBQJM1enAAAoJEOf+E+/4L5LmaCYP/AxCNoVUMezNghCIUjuqKpiw -++qoOgF+bPl99hpOhW2Sz/8mrMga4lz9PYzorMGyIT5ip64Qd0B8uv2fU1Hun+Ho -qpcbczp6S36OU8eink+J++Yrp9VY757lR8w8oCkBGkqKi0rwJq0nZf8B3Nh3k+pl -LzwWmqC+srEwPWBmEphJJiMesDPzw1LcbcZujSI97K10LgVa5KT64Vc+g/ZUNfp2 -oLwcTLMoX/kuwBRXG/VKDsRN4/5az/bLCy3k7kCZA5fb3bC1YXvi2Fb+aiAaBTMP -AZJv+rpJlDdZkOviwaRmclDQ8Jl9UC/k8zALZDUl9vat6tFZvtEVrkPthMeMbHol -Jb4A49O/qXB0V8zel3Qi2v5xHdK3zotQxIAp8y8jTrV/JLRCGLGRxQ75AAnaSxvA -0CdudOQUo8e2XYE5+ketMK6n2D+V2QX9VZTfS3HhogsrxWeT8bfrGQ9W4cRzX4dz -6BmcB9KqZD/XbPl0RnvyRFHfquYHGyCBTIMFcvF/X3i19j1YREpxakzBVMn1IoZ1 -XIVRfu8jGUkeVLnJFmHmaG5H4K2JulnsPm11IXEielqrUrj1qME/B/peFyz1r1pq -tLhATezgCQkO74OqRAFYfVoY1/MoFG4/FPVitdTW6qw7uOuNYG/R7bBCntrDqdfM -SrkdRdjkNCzkH5IbSDEM -=pIfB ------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 00000000000..3049b0a7a28 --- /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()) diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild index 4448e00fe1e..238c3c6c5f2 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -125,11 +125,11 @@ add_blocker plasma-workspace '<4.3.75' PATCHES=( "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch" - "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs.patch" - "${FILESDIR}/${PN}-4.5.73-module-suffix.patch" - "${FILESDIR}/${PN}-4.4.66-macos-unbundle.patch" - "${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch" - "${FILESDIR}/${PN}-4.5.74-klauncher_mac.patch" + "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" +# "${FILESDIR}/${PN}-4.5.73-module-suffix.patch" - FIXME what is this and why is it needed? +# "${FILESDIR}/${PN}-4.4.66-macos-unbundle.patch" - FIXME needs to be ported, also see above +# "${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch" - FIXME is this really needed? if so, please upstream it +# "${FILESDIR}/${PN}-4.5.74-klauncher_mac.patch" - FIXME read above "${FILESDIR}/${PN}-4.4.3-mimetypes.patch" "${FILESDIR}/${PN}-4.4.90-xslt.patch" ) |