diff options
| -rw-r--r-- | kde-base/libkdepim/Manifest | 3 | ||||
| -rw-r--r-- | kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff | 22 | ||||
| -rw-r--r-- | kde-base/libkdepim/libkdepim-4.3.1-r1.ebuild | 40 |
3 files changed, 65 insertions, 0 deletions
diff --git a/kde-base/libkdepim/Manifest b/kde-base/libkdepim/Manifest index bf75f1acb90..6a4aa9c5a63 100644 --- a/kde-base/libkdepim/Manifest +++ b/kde-base/libkdepim/Manifest @@ -1,5 +1,8 @@ +AUX libkdepim-4.3.1-ldap_crash.diff 900 RMD160 147af66df800e0c64f4c5eec201ed8714dcf0b26 SHA1 666c66f04dee67abde417a4255cfaf688b66b865 SHA256 e8acb073df5fd83596a42e0eca068d765a0f0144cb45af47acfe52dff08a03c4 AUX libkdepim-fix-link.patch 380 RMD160 126174f177d884e4e8fd82ef82ffccb5a1fc3367 SHA1 81841662e2ee8b8f879df449f4a7ad954fe73f69 SHA256 e927fdea2bd20512ea07b14ead6dbe0cce1ffb4aa1c77c8106859bc4c2036f26 +DIST kdepim-4.3.1.tar.bz2 11323109 RMD160 fb1cac7ddb1e656c537f8db8abf2b4340db10171 SHA1 6fd0309dbd911e2667ec1c08d1f10f2626a54534 SHA256 d63ed5ae7f68e1f2d282d2cf775d287ef779854f312f7e4e30139e789ee877a6 DIST kdepim-4.3.68.tar.lzma 9517223 RMD160 96f2d626821220c4af2e6d58408e887463d842a6 SHA1 5296d291ae604ff9bc4521d8befa1f744d809ba8 SHA256 ab869cee23e1ff743426ce86a8fac734ecc65f5abfc9cab0ccf519a3c0dfbfdf +EBUILD libkdepim-4.3.1-r1.ebuild 1107 RMD160 a82261b5e5209d81b3d511056c6fa3c4f0600654 SHA1 a20a1c0a698f155193a474fd8b2e8a048e2978e8 SHA256 1b64447e467c840fac1ebce4b77236ba1a312b171e638192a211dcf77b7c1a7a EBUILD libkdepim-4.3.68.ebuild 908 RMD160 99626bd5bdf07eae1b07f175991a9ea9bf34b8c0 SHA1 a1cb7dab38d0e030686351b068f3c07d774d738e SHA256 b7940648f84e93348d751e8583c6692f4b0ef5a86516b7743839dfbfdb432689 EBUILD libkdepim-4.3.9999.ebuild 910 RMD160 19dc46bb4b962de4b60a7559b51438dbe2b5a4a9 SHA1 93676ae49f108aa93b5d830b13c6e0fa993bfe8f SHA256 efa453247321f2d2bb65d4e90585680d687f3ddd50a80ae9923e15c0a135a4ff EBUILD libkdepim-9999.ebuild 866 RMD160 b47e1226de2263c46a9a4c2450db2718cd56793d SHA1 e9deccb3c614944d693f053916f609fa2ed925c8 SHA256 1da8465fe6219a434f7aeb899a55f4f326229f0bb878455c1cbfe25e069b1d4c diff --git a/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff b/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff new file mode 100644 index 00000000000..a3092f05876 --- /dev/null +++ b/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff @@ -0,0 +1,22 @@ +diff -u libkdepim/addresseelineedit.cpp libkdepim/addresseelineedit.cpp +--- libkdepim/addresseelineedit.cpp (revision 1019119) ++++ libkdepim/addresseelineedit.cpp (revision 1019358) +@@ -800,7 +800,7 @@ + + void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs ) + { +- if ( s_LDAPLineEdit != this ) { ++ if ( adrs.isEmpty() || s_LDAPLineEdit != this ) { + return; + } + +@@ -817,7 +817,8 @@ + setText( m_previousAddresses + m_searchString ); + // only complete again if the user didn't change the selection while + // we were waiting; otherwise the completion box will be closed +- if ( m_searchString.trimmed() != completionBox()->currentItem()->text().trimmed() ) { ++ QListWidgetItem *current = completionBox()->currentItem(); ++ if ( !current || m_searchString.trimmed() != current->text().trimmed() ) { + doCompletion( m_lastSearchMode ); + } + } diff --git a/kde-base/libkdepim/libkdepim-4.3.1-r1.ebuild b/kde-base/libkdepim/libkdepim-4.3.1-r1.ebuild new file mode 100644 index 00000000000..7b6cfd2b54e --- /dev/null +++ b/kde-base/libkdepim/libkdepim-4.3.1-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-4.3.1.ebuild,v 1.1 2009/09/01 16:14:14 tampakrap Exp $ + +EAPI="2" + +KMNAME="kdepim" +inherit kde4-meta + +DESCRIPTION="Common library for KDE PIM apps" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" +IUSE="debug" + +# @Since >4.2.65 kode removed from kdepim +RDEPEND=" + !kdeprefix? ( !>=kde-base/kode-4.1.0[-kdeprefix] ) + kdeprefix? ( !kde-base/kode:${SLOT} ) +" + +KMEXTRACTONLY=" + kaddressbook/org.kde.KAddressbook.Core.xml + korganizer/korgac/org.kde.korganizer.KOrgac.xml +" + +KMSAVELIBS="true" + +PATCHES=( + "${FILESDIR}/${P}-ldap_crash.diff" +) + +src_install() { + kde4-meta_src_install + + # install additional generated headers that are needed by other packages that + # are derived from kdepim. e.g. kmail. + pushd "${CMAKE_BUILD_DIR}/libkdepim/" 2>/dev/null || die "pushd libkdepim failed" + insinto "${PREFIX}/include" + doins ui_addresspicker.h ui_categoryselectdialog_base.h || die "Failed to install extra header files." + popd 2>/dev/null +} |