Files
xbase/xbase-3.1.2-gcc6.patch
Martin Pluskal f8eaef609e Accepting request 505494 from home:scarabeus_iv:branches:server:database
- Split the library to separate subpackage as per guidelines
- Update to 3.1.2 release to match fedora:
  * Our version was from 2001
  * This version is from 2006
- Add patches from Fedora:
  * xbase-2.0.0-fixconfig.patch
  * xbase-2.0.0-fixheader.patch
  * xbase-2.0.0-gcc43.patch
  * xbase-2.0.0-ppc.patch
  * xbase-2.0.0-x86_64.patch
  * xbase-3.1.2-configure-gcc-version-fix.patch
  * xbase-3.1.2-fixconfig.patch
  * xbase-3.1.2-gcc44.patch
  * xbase-3.1.2-gcc47.patch
  * xbase-3.1.2-gcc6.patch
  * xbase-3.1.2-gcc7.patch
  * xbase-3.1.2-lesserg.patch
  * xbase-3.1.2-xbnode.patch
- Drop no longer applicable patches:
  * xbase-automake-1.13.patch
  * xbase-2.0.0-array-del.patch
  * xbase-2.0.0-gcc41fix.patch
  * xbase-2.0.0-gcc47.patch
  * xbase-2.0.0-iostream_h.patch
  * xbase-2.0.0-makefiles.patch

OBS-URL: https://build.opensuse.org/request/show/505494
OBS-URL: https://build.opensuse.org/package/show/server:database/xbase?expand=0&rev=12
2017-06-21 16:07:07 +00:00

50 lines
2.2 KiB
Diff

diff -up xbase64-3.1.2/xbase64/xblock.cpp.gcc6 xbase64-3.1.2/xbase64/xblock.cpp
--- xbase64-3.1.2/xbase64/xblock.cpp.gcc6 2016-02-16 16:06:40.146864585 -0500
+++ xbase64-3.1.2/xbase64/xblock.cpp 2016-02-16 16:07:51.137342339 -0500
@@ -84,7 +84,7 @@ xbLock::xbLock(xbDbf * pdbf)
TableLockCnt = 0;
MemoLockCnt = 0;
IndexLockCnt = 0;
- std::cout << "xbLock constructor" << std::cout;
+ std::cout << "xbLock constructor";
}
/*************************************************************************/
xbLock::~xbLock()
@@ -169,7 +169,7 @@ else if( LockType == XB_LOCK || LockType
/*************************************************************************/
xbaseLock::xbaseLock( xbDbf * pdbf ) : xbLock( pdbf )
{
- std::cout << "xbaseLock constructor" << std::cout;
+ std::cout << "xbaseLock constructor";
}
/*************************************************************************/
xbShort xbaseLock::LockTableHeader( xbShort LockType )
@@ -336,7 +336,7 @@ xbShort xbaseLock::LockInit()
/*************************************************************************/
dbaseLock::dbaseLock( xbDbf * pdbf ) : xbLock( pdbf )
{
- std::cout << "dbaseLock constructor" << std::cout;
+ std::cout << "dbaseLock constructor";
}
/*************************************************************************/
xbShort dbaseLock::LockTableHeader( xbShort LockType )
@@ -460,7 +460,7 @@ xbShort dbaseLock::UnlockAll()
/*************************************************************************/
clipperLock::clipperLock( xbDbf * pdbf ) : xbLock( pdbf )
{
- std::cout << "clipperLock constructor" << std::cout;
+ std::cout << "clipperLock constructor";
}
/*************************************************************************/
xbShort clipperLock::LockTableHeader( xbShort LockType )
@@ -523,7 +523,7 @@ xbShort clipperLock::UnlockAll()
/*************************************************************************/
foxproLock::foxproLock( xbDbf * pdbf ) : xbLock( pdbf )
{
- std::cout << "foxproLock constructor" << std::cout;
+ std::cout << "foxproLock constructor";
}
/*************************************************************************/
xbShort foxproLock::LockTableHeader( xbShort LockType )
diff -up xbase64-3.1.2/xbase64/xblock.h.gcc6 xbase64-3.1.2/xbase64/xblock.h