[SCM] Calligra suite packaging branch, master, updated. debian/2.7.5-1-65-gc1872d0

[Adrien Grellier]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=c1872d0

The following commit has been merged in the master branch:
commit c1872d08f83dc94c417f5a4410116c599d4362bc
Author: Adrien Grellier <perso at adrieng.fr>
Date:   Sun May 4 16:07:13 2014 +0200

    patch to build using xbase64
---
 debian/changelog            |  1 +
 debian/control              |  2 +-
 debian/patches/series       |  1 +
 debian/patches/xbase64.diff | 67 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ddfb6b0..8c25bec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ calligra (1:2.8.2-1) UNRELEASED; urgency=medium
   * new package: calligra-semanticitems
   * update to Standards-Version 3.9.5 (no changes)
   * update copyright information for beta3
+  * patch to build using xbase64, thanks Matthias Klose! (Closes: #746227)
 
   [ Pino Toscano ]
   * Add the pkg-config build dependency.
diff --git a/debian/control b/debian/control
index 667cdaf..2a28d26 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,7 @@ Build-Depends: cmake (>= 2.8),
                libwpd-dev (>= 0.9.1),
                libwpg-dev (>= 0.2.0),
                libwps-dev,
-               libxbase2.0-dev,
+               libxbase64-dev,
                libxi-dev,
                nepomuk-core-dev,
                okular-dev (>= 4:4.4.3),
diff --git a/debian/patches/series b/debian/patches/series
index 94a4466..9d4f941 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+xbase64.diff
 set_kritasketch_lib_soversion
 install_images_in_datadir
 add_keywords_to_desktop_files.patch
diff --git a/debian/patches/xbase64.diff b/debian/patches/xbase64.diff
new file mode 100644
index 0000000..73764d7
--- /dev/null
+++ b/debian/patches/xbase64.diff
@@ -0,0 +1,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;

-- 
Calligra suite packaging