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

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-01-04 15:40:42 +0000 (Fri, 04 Jan 2008)
New Revision: 8768

Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
Log:
* Update patch 15_kfreebsd_support to build in kfreebsd after latest
changes in ConfigureChecks.cmake.



Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-01-04 15:37:33 UTC (rev 8767)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-01-04 15:40:42 UTC (rev 8768)
@@ -1,10 +1,17 @@
 kde4libs (4:3.98.0~svn755919-2) UNRELEASED; urgency=low
 
+  +++ Changes by Armin Berres:
+
   * Add patch to disable debug information by default. They can be enabled
     with kdebugdialog.
 
- -- Armin Berres <trigger+debian at space-based.de>  Thu, 03 Jan 2008 02:17:06 +0100
+  +++ Changes by Ana Beatriz Guerrero Lopez:
 
+  * Update patch 15_kfreebsd_support to build in kfreebsd after latest changes
+    in ConfigureChecks.cmake.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Fri, 04 Jan 2008 16:44:56 +0100
+
 kde4libs (4:3.98.0~svn755919-1) experimental; urgency=low
 
   * New svn snapshot release to revision 755919.

Modified: branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff	2008-01-04 15:37:33 UTC (rev 8767)
+++ branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff	2008-01-04 15:40:42 UTC (rev 8768)
@@ -1,7 +1,7 @@
 Index: kde4libs-3.98.0~svn755919/kpty/kpty.cpp
 ===================================================================
 --- kde4libs-3.98.0~svn755919.orig/kpty/kpty.cpp	2008-01-02 13:17:23.000000000 +0100
-+++ kde4libs-3.98.0~svn755919/kpty/kpty.cpp	2008-01-02 19:32:32.000000000 +0100
++++ kde4libs-3.98.0~svn755919/kpty/kpty.cpp	2008-01-04 16:36:41.000000000 +0100
 @@ -108,24 +108,24 @@
  # define _NEW_TTY_CTRL
  #endif
@@ -42,7 +42,7 @@
 Index: kde4libs-3.98.0~svn755919/kio/kfile/kpropertiesdialog.cpp
 ===================================================================
 --- kde4libs-3.98.0~svn755919.orig/kio/kfile/kpropertiesdialog.cpp	2008-01-02 13:17:07.000000000 +0100
-+++ kde4libs-3.98.0~svn755919/kio/kfile/kpropertiesdialog.cpp	2008-01-02 19:32:32.000000000 +0100
++++ kde4libs-3.98.0~svn755919/kio/kfile/kpropertiesdialog.cpp	2008-01-04 16:36:41.000000000 +0100
 @@ -1887,7 +1887,15 @@
      fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
  #else
@@ -63,7 +63,7 @@
 Index: kde4libs-3.98.0~svn755919/kioslave/file/file.cpp
 ===================================================================
 --- kde4libs-3.98.0~svn755919.orig/kioslave/file/file.cpp	2008-01-02 13:16:20.000000000 +0100
-+++ kde4libs-3.98.0~svn755919/kioslave/file/file.cpp	2008-01-02 19:32:32.000000000 +0100
++++ kde4libs-3.98.0~svn755919/kioslave/file/file.cpp	2008-01-04 16:36:41.000000000 +0100
 @@ -361,9 +361,10 @@
      }
  
@@ -98,3 +98,22 @@
  
  #ifdef HAVE_POSIX_ACL
      acl = acl_get_fd(src_fd);
+Index: kde4libs-3.98.0~svn755919/ConfigureChecks.cmake
+===================================================================
+--- kde4libs-3.98.0~svn755919.orig/ConfigureChecks.cmake	2008-01-04 16:36:58.000000000 +0100
++++ kde4libs-3.98.0~svn755919/ConfigureChecks.cmake	2008-01-04 16:38:04.000000000 +0100
+@@ -150,11 +150,11 @@
+         set(UTIL_LIBRARY util)
+       endif (login_in_libutil)
+     endif (NOT login_in_libc)
+-    if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD)
++    if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
+       set (HAVE_UTMPX)
+-    else (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD)
++    else (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
+       check_function_exists(getutxent HAVE_UTMPX)
+-    endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD)
++    endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
+     if (HAVE_UTMPX)
+       set(utmp utmpx)
+     else (HAVE_UTMPX)