[arch-commits] Commit in kdepim/repos (3 files)

Pierre Schmitz pierre at archlinux.org
Wed Sep 23 11:15:52 UTC 2009


    Date: Wednesday, September 23, 2009 @ 07:15:51
  Author: pierre
Revision: 52926

Merged revisions 52924 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdepim/trunk

........
  r52924 | pierre | 2009-09-23 12:47:31 +0200 (Mi, 23 Sep 2009) | 1 line
  
  gnokii rebuild; add ldap fix
........

Added:
  kdepim/repos/extra-x86_64/fix-ldap-crash.path
    (from rev 52924, kdepim/trunk/fix-ldap-crash.path)
Modified:
  kdepim/repos/extra-x86_64/	(properties)
  kdepim/repos/extra-x86_64/PKGBUILD

---------------------+
 PKGBUILD            |   12 ++++++++----
 fix-ldap-crash.path |   13 +++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)


Property changes on: kdepim/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /kdepim/trunk:1-51924
   + /kdepim/trunk:1-52925

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-09-23 10:47:42 UTC (rev 52925)
+++ extra-x86_64/PKGBUILD	2009-09-23 11:15:51 UTC (rev 52926)
@@ -19,22 +19,26 @@
          'kdepim-libkdepim'
          'kdepim-wizards')
 pkgver=4.3.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdelibs-experimental' 'kdepimlibs' 'kdepim-runtime' 'gnokii' 'libxss' 'kdebase-runtime' 'pilot-link' 'kde-agent')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-	kmail-delete-mails-from-server.patch)
+	'kmail-delete-mails-from-server.patch' 'fix-ldap-crash.path')
 md5sums=('1029bc586f29c262f5f60eb079623e62'
-         'a3c32cf5d25195c73c6a278861a3629f')
+         'a3c32cf5d25195c73c6a278861a3629f'
+         '0b1cfd0a7d3a58688f47225e168d9014')
 
 build() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
 	# Fix important KMail bug
 	# fixed in 4.3.2
-	patch -p4 -i ../kmail-delete-mails-from-server.patch || return 1
+	patch -p4 -i $srcdir/kmail-delete-mails-from-server.patch || return 1
+	# fixed in 4.3.2
+	# see https://bugs.kde.org/show_bug.cgi?id=206024
+	patch -p0 -i $srcdir/fix-ldap-crash.path || return 1
 
         cd ${srcdir}
 	mkdir build

Copied: kdepim/repos/extra-x86_64/fix-ldap-crash.path (from rev 52924, kdepim/trunk/fix-ldap-crash.path)
===================================================================
--- extra-x86_64/fix-ldap-crash.path	                        (rev 0)
+++ extra-x86_64/fix-ldap-crash.path	2009-09-23 11:15:51 UTC (rev 52926)
@@ -0,0 +1,13 @@
+Index: libkdepim/addresseelineedit.cpp
+===================================================================
+--- libkdepim/addresseelineedit.cpp	(Revision 1019118)
++++ libkdepim/addresseelineedit.cpp	(Revision 1019119)
+@@ -800,7 +800,7 @@
+ 
+ void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs )
+ {
+-  if ( s_LDAPLineEdit != this ) {
++  if ( adrs.isEmpty() || s_LDAPLineEdit != this ) {
+     return;
+   }
+ 




More information about the arch-commits mailing list