rev 12798 - in branches/kde4.2/packages/kdelibs/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-11-30 20:41:49 +0000 (Sun, 30 Nov 2008)
New Revision: 12798

Modified:
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
Log:
Rework slightly patch 15_kfreebsd_support.diff.



Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2008-11-30 19:29:46 UTC (rev 12797)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2008-11-30 20:41:49 UTC (rev 12798)
@@ -55,6 +55,10 @@
 
   * Update automoc (build-)dependency to 1.0~svn850570.
 
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+  
+  * Rework slightly patch 15_kfreebsd_support.diff.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Nov 2008 20:49:59 +0200
 
 kde4libs (4:4.1.3-2) experimental; urgency=low

Modified: branches/kde4.2/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/15_kfreebsd_support.diff	2008-11-30 19:29:46 UTC (rev 12797)
+++ branches/kde4.2/packages/kdelibs/debian/patches/15_kfreebsd_support.diff	2008-11-30 20:41:49 UTC (rev 12798)
@@ -41,7 +41,7 @@
  
  #include <kdebug.h>
 --- a/kio/kfile/kpropertiesdialog.cpp
-+++ b/kio/kfile/kpropertiesdialog.cpp
++++ b/kio/kfile/kpropertiesdialog.cpp	
 @@ -1879,7 +1879,15 @@
      fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
  #else
@@ -59,44 +59,8 @@
  #endif
      return fileSystemSupportsACLs;
  }
---- a/kioslave/file/file.cpp
-+++ b/kioslave/file/file.cpp
-@@ -361,9 +361,10 @@
-     }
- 
- #ifdef HAVE_FADVISE
-+#ifdef POSIX_FADV_SEQUENTIAL
-     posix_fadvise( fd, 0, 0, POSIX_FADV_SEQUENTIAL);
- #endif
--
-+#endif
-     // Determine the mimetype of the file to be retrieved, and emit it.
-     // This is mandatory in all slaves (for KRun/BrowserRun to work)
-     // In real "remote" slaves, this is usually done using findByNameAndContent
-@@ -882,8 +883,10 @@
-     }
- 
- #ifdef HAVE_FADVISE
-+#ifdef POSIX_FADV_SEQUENTIAL
-     posix_fadvise(src_fd,0,0,POSIX_FADV_SEQUENTIAL);
- #endif
-+#endif
-     // WABA: Make sure that we keep writing permissions ourselves,
-     // otherwise we can be in for a surprise on NFS.
-     mode_t initialMode;
-@@ -905,8 +908,10 @@
-     }
- 
- #ifdef HAVE_FADVISE
-+#ifdef POSIX_FADV_SEQUENTIAL
-     posix_fadvise(dest_fd,0,0,POSIX_FADV_SEQUENTIAL);
- #endif
-+#endif
- 
- #ifdef HAVE_POSIX_ACL
-     acl = acl_get_fd(src_fd);
 --- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
++++ b/ConfigureChecks.cmake	
 @@ -153,11 +153,11 @@
          set(UTIL_LIBRARY util)
        endif (login_in_libutil)
@@ -112,3 +76,13 @@
      if (HAVE_UTMPX)
        set(utmp utmpx)
        if (login_in_libutil)
+--- a/kioslave/file/file.cpp
++++ b/kioslave/file/file.cpp
+@@ -307,6 +307,7 @@
+     }
+ 
+ #ifdef HAVE_FADVISE
++#ifdef POSIX_FADV_SEQUENTIAL
+     posix_fadvise( fd, 0, 0, POSIX_FADV_SEQUENTIAL);
+ #endif
+