rev 4079 - in trunk/packages/kdelibs/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-07-07 14:18:53 +0000 (Fri, 07 Jul 2006)
New Revision: 4079

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/patches/21_kfreebsd_support.diff
Log:
Another chunk of non-Linux build patch stuff.


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2006-07-07 09:18:45 UTC (rev 4078)
+++ trunk/packages/kdelibs/debian/changelog	2006-07-07 14:18:53 UTC (rev 4079)
@@ -13,6 +13,8 @@
     resolve a number of user glitches, such as cryptic errors popping up when
     no printer has yet been added to CUPS. (Closes: #369140, #375477, #370403)
 
+  * Apply a GNU/kFreeBSD build patch from Petr Salinger. (Closes: #377213)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 Jun 2006 15:38:09 -0400
 
 kdelibs (4:3.5.3-1) unstable; urgency=low

Modified: trunk/packages/kdelibs/debian/patches/21_kfreebsd_support.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/21_kfreebsd_support.diff	2006-07-07 09:18:45 UTC (rev 4078)
+++ trunk/packages/kdelibs/debian/patches/21_kfreebsd_support.diff	2006-07-07 14:18:53 UTC (rev 4079)
@@ -77,3 +77,21 @@
         /* set the process name, so that killall works like intended */
         r = prctl(PR_SET_NAME, (unsigned long) name.data(), 0, 0, 0);
         if ( r == 0 )
+--- kde.orig/kio/kfile/kpropertiesdialog.cpp
++++ kde.patched/kio/kfile/kpropertiesdialog.cpp
+@@ -1860,7 +1860,14 @@
+     fileSystemSupportsACLs = ( statfs( pathCString.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
+ #else
+     fileSystemSupportsACLs =
+-      getxattr( pathCString.data(), "system.posix_acl_access", NULL, 0 ) >= 0 || errno == ENODATA;
++      getxattr( pathCString.data(), "system.posix_acl_access", NULL, 0 ) >= 0 
++#ifdef ENODATA      
++			|| (errno == ENODATA)
++#endif
++#ifdef ENOATTR      
++			|| (errno == ENOATTR)
++#endif
++			;
+ #endif
+     return fileSystemSupportsACLs;
+ }