diff options
| -rw-r--r-- | kde-base/katepart/ChangeLog | 9 | ||||
| -rw-r--r-- | kde-base/katepart/Manifest | 24 | ||||
| -rw-r--r-- | kde-base/katepart/files/katepart-4.10.0-plugins.patch | 55 | ||||
| -rw-r--r-- | kde-base/katepart/katepart-4.10.0-r1.ebuild | 29 |
4 files changed, 102 insertions, 15 deletions
diff --git a/kde-base/katepart/ChangeLog b/kde-base/katepart/ChangeLog index e900057acdb1..e4f65d585a77 100644 --- a/kde-base/katepart/ChangeLog +++ b/kde-base/katepart/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/katepart # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/ChangeLog,v 1.60 2013/02/07 04:57:02 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/ChangeLog,v 1.61 2013/02/11 14:34:44 kensington Exp $ + +*katepart-4.10.0-r1 (11 Feb 2013) + + 11 Feb 2013; Michael Palimaka <kensington@gentoo.org> + +files/katepart-4.10.0-plugins.patch, +katepart-4.10.0-r1.ebuild: + Backport patch from upstream to fix loading of the highlight-selection plugin, + wrt bug #456660. 06 Feb 2013; Naohiro Aota <naota@gentoo.org> katepart-4.9.5.ebuild: Add ~x86-fbsd wrt bug #430072 diff --git a/kde-base/katepart/Manifest b/kde-base/katepart/Manifest index 43cb7a72ef8b..1b399c2106d2 100644 --- a/kde-base/katepart/Manifest +++ b/kde-base/katepart/Manifest @@ -1,26 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX katepart-4.10.0-plugins.patch 1902 SHA256 f3f0722eb1dca274934ed9b21f5a23236419ac66a6a12c829411379deec558d1 SHA512 bcc4237746fe084422d2d548cc7199aadfbb9466ca527200804f83fd68d493a7b4f66e72c4ae1e708bf4525ddc3e6de0f64dc3f6e4399e27ca6e756c502a8c83 WHIRLPOOL ac9b00f55a9373b31b0d3654dc7c00a1617e540066c48280da181c8f63b9c773c28949fae2bd7564d0a78f08ab66c8ffdb77f750e18b33eb1da1bb3b9146ad71 DIST kate-4.10.0.tar.xz 2387596 SHA256 5c7c56228b7b917cba56a5ad53ba39834ac5284cf040de55a17bdad6d0ed2bd3 SHA512 72b2d67ef0242c8106c484de3d28619fabf478c632dc281de0acde324dc75aff91518a41cfc7fa798dc2befb0dbb0488b2fd9c813f9090984ab009a1d8fcf8ce WHIRLPOOL ddbe13858b8664b84cb5e7e151963a6ad9bdee20ee6b5498dd043db78e9409c0d26a89f4c61440125c25090e2822de0f96a68019b02efc28b84a9f013ddd0a9f DIST kate-4.9.5.tar.xz 2194216 SHA256 515819da87dc442f9aa1ee34252e706a0b55bd32ebecd4f908b5c632d777e08a SHA512 35dfccfa62b89f4f8706ca058d876f264879b494d964bd17b2aa24ed2c778d77630d7c928dff9a68bfc816b6f7576c5523c7131cb60592247a42b36fa70da9ee WHIRLPOOL 74455c0bcfd6682b385a7e1af9949b1b6d8c5fe3d97d6eb84dc0a06c6c3ef055b09cb706f3107886bbf9684f0830c84c4716010d15ab93bc456ab72497e46e35 +EBUILD katepart-4.10.0-r1.ebuild 636 SHA256 d5c2033267512d0a87adde9d9e6acb26a48428b8a6ba3c7f4f8cf76e41d474d7 SHA512 46bb2e6695a9802a9bf7858986f9c5166e13396679744957b6b79aa91bb6ebaeb2fff425b024ee9876ca4de229f378054a3077394eab41ece0874d68d08ebd73 WHIRLPOOL 3cab350c80755529edd914db2577f171dbfb5932abbf9cc8c2aa47b6ec32aae9b26348b8cec62e1478da7f20dae8a2862a777944d8bcf9edb54b7e706c431a9a EBUILD katepart-4.10.0.ebuild 583 SHA256 a63baf73eb83116b248f68b37fc22b43853d57b6f5e0d742e8a91dad77b84582 SHA512 0fca66ee6890d9c8a51f123ac4658c2c0318867172190bcde722b52e34bd61c884ebf0c24d7ec6ec81c48eb4339fc71bab275409a897b67e4951510506793c11 WHIRLPOOL 546c043fb4917e7512d41c0e6bf287569514e56c07b1fa31b0b3bea3d8390ab083a1c5e91ade4270d3fb9d3b69da9486d34d5c02f7aa9685a882fd32a79c6ad1 EBUILD katepart-4.9.5.ebuild 578 SHA256 f05264c82f1da0836c721aa194d3b7a96a8036adb74ef7f0dbe865d1e5400509 SHA512 8d66b2de0afb3e0a1bb430c7dfb5250ad5b5ea938d62b4c394f65d19a162446fb0296a273c75c73c6726e21d8b5b6a32044d9d6255252cd1c59f0ce644eb5fd5 WHIRLPOOL ff9dce3948b1deea2ec72b7b9138990b3bcbca53fa962a11bfc2bc1aeab550186191844e1c65f82ec6b5c54a1b63b1cd5a75771e954689c3874946d246c6e2dd -MISC ChangeLog 6939 SHA256 d00165c54b16df59f5b66a40a66ebe004753dc4f03bf7c13950b97a05529bd1d SHA512 49662325bf492c6f6672594c98ab062ebb85cee3fa8bbc6495108a351ff763fea2ea54273243947b090a98bbe72debc477a4d93a19ac511da09e72dc8f8f6f5c WHIRLPOOL f735a7ec760b71984c6da20ae127c4d5a93a2fc521c372e3c4b88da908b8b724d3b7b7fcd31060fb018df3a8fad9c5d50ac65937f85930a01a31ba245096d9d0 +MISC ChangeLog 7203 SHA256 86ade0f4ab18a58e4a40ae8d8de9fe050214cf3f462a5bb0646b8ee59e402135 SHA512 a2f52d1c69a6f1e2e5993cf27fafee472aa75a1b91b2fbc1210ef1b799653c534c078cb88971f846e3ae582c731a957f0c439dafb0eb018afffede36a72fd3e2 WHIRLPOOL 4ec885f0e1203e4fab3436ba6894474e4bfc7a8671b269ff49f498d81e09e0122ce25c5aab92b4a6d3ed064fbaf9f15d70181848b87b08d9e89e44e58d391fb4 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJREzT3AAoJEOf+E+/4L5LmatIQAKVIEbeF0VE4U7YAaRdmgqUK -tAPaW4PX7ioPVccb85vWB2czC+RN4xz+qxKyKn9ujHOSP3/k9d18GEckCayvrsDy -2Z5k8G8anDD96xMth8OXOd5cjhI3TSv1BIp0N1Y/QswDU5bNvdrxrLIakmq01u8H -MjYc1HugRJrLU8pMohpdloj1OpngdQxv95RKHn3t9eQtjNBi9pWsx9TV8beFwpdx -aRXcdj6VsBzAFRV4QG1SV3klsTWFT6E//DWHMQEl26EEaddN5fvmsNlTA69vnuK3 -2jyM65psXN4+XFRjviYi/iBxfYYCcYWBeqREwfkb2wcqySLuUhLgZq/RxxbxE5ef -Uc5Lv1wZXhV5dwcgJa+5gqid/bFkYgzsQICY6pKe9sjMhSplDhDVZ8zBNhtIVDfH -ZbMovxp1ViDsQhY9t647ahxx3oIRd4f39+ddz7C3ijImzj4zdul/8G/6arbMLjLC -++vPAocF/iSgjAAYGtbi8RZOjw4Vgem11Oo42h3M0qOym/NQs0WgCzFYIsvYTLH2 -1H1Yo9/4UPv7rb4iWY3tc+XUxOjhwDRz59R3+ZgMeP44MQRESA6CszGULtBaWSxO -MulQZU2N6UjJ5Ptvo3UDJDEVY3AEkiu3MZZJ8Cy8n7u3sDkAuzsekAACbUtmyJxI -Bx5CJZEonjOexKW0IZoj -=g3QP +iQEcBAEBCAAGBQJRGQGCAAoJEMbwO6tnXQ0sj6EH/0EuxDgSPXdZbSR68cU8Pu9c +DaPYiN5LAjzjQ71Cj0pLzTbKlPA4PZg+ObRxpoLbKaYZEZu807fPvgQ9TCMXMd3Y +cIGeEsRBCA315hllDNly3ZAgY9ZzNzM6awk64rf75HaO8OM1wf1Kc8gYzCqoX2Ky +AaDXvJm04/2yYYx4SYkgv2TztRylKlXqyfT93S2zRackGGe4Z/3qNLCHGmHhXJaJ +zI5bOx2s0kv2sigarXxM7uH/L6Lb+lNtV4SBdEf+cXf7sa98SVBlMWmSBOH3Ebwz +MzMGHnKM1RqH0BGnm6584ij+qyyKU7S6pFZhNdokFNLBptdpyTcFUzOfVoNqjHc= +=qQEb -----END PGP SIGNATURE----- diff --git a/kde-base/katepart/files/katepart-4.10.0-plugins.patch b/kde-base/katepart/files/katepart-4.10.0-plugins.patch new file mode 100644 index 000000000000..3b52bfae6a6c --- /dev/null +++ b/kde-base/katepart/files/katepart-4.10.0-plugins.patch @@ -0,0 +1,55 @@ +From f934575613d7efc60b9b6be6203c777d42ab7ffc Mon Sep 17 00:00:00 2001 +From: Dominik Haumann <dhaumann@kde.org> +Date: Sun, 10 Feb 2013 22:18:38 +0100 +Subject: [PATCH] fix plugin loading in KDE SC 4.10.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Thanks to Dorian and Loïc for finding the root of this issue. + +BUG: 314530 +FIXED-IN: 4.10.1 +--- + part/utils/katepartpluginmanager.cpp | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +diff --git a/part/utils/katepartpluginmanager.cpp b/part/utils/katepartpluginmanager.cpp +index e9cb258..18fe6f0 100644 +--- a/part/utils/katepartpluginmanager.cpp ++++ b/part/utils/katepartpluginmanager.cpp +@@ -75,17 +75,25 @@ KatePartPluginManager *KatePartPluginManager::self() + void KatePartPluginManager::setupPluginList () + { + KService::List traderList = KServiceTypeTrader::self()-> +- query("KTextEditor/Plugin", +- "([X-KDE-Version] >= 4.0) and ([X-KDE-Version] <= " + QString("%1.%2").arg(KDE::versionMajor()).arg(KDE::versionMinor()) + ')'); ++ query("KTextEditor/Plugin"); + + foreach(const KService::Ptr &ptr, traderList) + { +- KatePartPluginInfo info(ptr); ++ QVariant version = ptr->property("X-KDE-Version", QVariant::String); ++ QStringList numbers = qvariant_cast<QString>(version).split('.'); ++ unsigned int kdeVersion = KDE_MAKE_VERSION(numbers.value(0).toUInt(), ++ numbers.value(1).toUInt(), ++ numbers.value(2).toUInt()); + +- info.load = false; +- info.plugin = 0L; ++ if (KDE_MAKE_VERSION(4,0,0) <= kdeVersion && kdeVersion <= KDE::version()) ++ { ++ KatePartPluginInfo info(ptr); ++ ++ info.load = false; ++ info.plugin = 0L; + +- m_pluginList.push_back (info); ++ m_pluginList.push_back (info); ++ } + } + } + +-- +1.8.1.2 + diff --git a/kde-base/katepart/katepart-4.10.0-r1.ebuild b/kde-base/katepart/katepart-4.10.0-r1.ebuild new file mode 100644 index 000000000000..5ca8784e1a2e --- /dev/null +++ b/kde-base/katepart/katepart-4.10.0-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/katepart-4.10.0-r1.ebuild,v 1.1 2013/02/11 14:34:44 kensington Exp $ + +EAPI=5 + +KDE_HANDBOOK="optional" +KMNAME="kate" +KMMODULE="part" +inherit kde4-meta + +DESCRIPTION="KDE Editor KPart" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="debug" + +RESTRICT="test" +# bug 392993 + +add_blocker kdelibs 4.6.50 + +PATCHES=( "${FILESDIR}/${P}-plugins.patch" ) + +src_configure() { + local mycmakeargs=( + "-DKDE4_BUILD_TESTS=OFF" + ) + + kde4-meta_src_configure +} |