Package: calligra / 1:2.8.5+dfsg-1

xbase64.diff Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
Index: b/cmake/modules/FindXBase.cmake
===================================================================
--- a/cmake/modules/FindXBase.cmake
+++ b/cmake/modules/FindXBase.cmake
@@ -13,11 +13,11 @@
 
 ELSE (XBase_INCLUDE_DIR AND XBase_LIBRARIES)
 
-       FIND_PATH(XBase_INCLUDE_DIR NAMES xbase.h
-        PATHS /usr/include/xbase /usr/local/include/xbase
+       FIND_PATH(XBase_INCLUDE_DIR NAMES xbase64.h
+        PATHS /usr/include/xbase64 /usr/local/include/xbase
        )
 
-       FIND_LIBRARY(XBase_LIBRARIES NAMES xbase )
+       FIND_LIBRARY(XBase_LIBRARIES NAMES xbase64 )
 
        include(FindPackageHandleStandardArgs)
        FIND_PACKAGE_HANDLE_STANDARD_ARGS(XBase DEFAULT_MSG XBase_INCLUDE_DIR XBase_LIBRARIES )
Index: b/kexi/kexidb/drivers/xbase/xbaseexport.cpp
===================================================================
--- a/kexi/kexidb/drivers/xbase/xbaseexport.cpp
+++ b/kexi/kexidb/drivers/xbase/xbaseexport.cpp
@@ -33,7 +33,7 @@
 
 #include <cstring>
 
-#include "xbase.h"
+#include "xbase64.h"
 
 using namespace KexiDB;
 
Index: b/kexi/migration/xbase/xbasemigrate.h
===================================================================
--- a/kexi/migration/xbase/xbasemigrate.h
+++ b/kexi/migration/xbase/xbasemigrate.h
@@ -24,7 +24,7 @@
 
 #include <migration/keximigrate.h>
 #include <migration/keximigrate_p.h>
-#include "xbase.h"
+#include "xbase64.h"
 
 namespace KexiMigration
 {
Index: b/kexi/migration/xbase/xbasemigrate.cpp
===================================================================
--- a/kexi/migration/xbase/xbasemigrate.cpp
+++ b/kexi/migration/xbase/xbasemigrate.cpp
@@ -254,7 +254,7 @@
           memoBuffer = new char[blobFieldLength];
 
           #ifdef XB_LOCKING_ON
-            tableDbf->LockMemoFile( F_SETLK, F_RDLCK );
+            // tableDbf->LockMemoFile( F_SETLK, F_RDLCK );
           #endif
 
           if ( ( returnCode = tableDbf->GetMemoField( j , blobFieldLength, memoBuffer, F_SETLKW ) ) != XB_NO_ERROR ) {
@@ -263,7 +263,7 @@
             val = KexiDB::cstringToVariant( memoBuffer, fieldsExpanded.at(j)->field, blobFieldLength );
           }
           #ifdef XB_LOCKING_ON
-            tableDbf->LockMemoFile( F_SETLK, F_UNLCK );
+            // tableDbf->LockMemoFile( F_SETLK, F_UNLCK );
           #endif
 
           break;