Hello community, here is the log from the commit of package xbase for openSUSE:Factory checked in at 2017-08-06 11:33:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xbase (Old) and /work/SRC/openSUSE:Factory/.xbase.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xbase" Sun Aug 6 11:33:57 2017 rev:24 rq:505590 version:3.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/xbase/xbase.changes 2015-04-23 08:04:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xbase.new/xbase.changes 2017-08-06 11:33:58.494393902 +0200 @@ -1,0 +2,29 @@ +Wed Jun 21 15:08:08 UTC 2017 - tchvatal@suse.com + +- 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 + +------------------------------------------------------------------- Old: ---- 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 xbase-2.0.0.tar.gz xbase-automake-1.13.patch New: ---- xbase-2.0.0-ppc.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 xbase64-3.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xbase.spec ++++++ --- /var/tmp/diff_new_pack.zICPM8/_old 2017-08-06 11:34:00.770073288 +0200 +++ /var/tmp/diff_new_pack.zICPM8/_new 2017-08-06 11:34:00.822065963 +0200 @@ -1,7 +1,7 @@ # # spec file for package xbase # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,40 +16,53 @@ # +%define libname libxbase64-1 Name: xbase -Version: 2.0.0 +Version: 3.1.2 Release: 0 Summary: XBase Compatible C++ Class Library License: LGPL-2.1+ Group: Productivity/Databases/Tools Url: http://linux.techass.com/projects/xdb/#downloads -Source0: http://prdownloads.sourceforge.net/xdb/%{name}-%{version}.tar.gz -Patch1: %{name}-%{version}-makefiles.patch -Patch2: %{name}-%{version}-gcc41fix.patch -Patch3: %{name}-%{version}-iostream_h.patch -Patch4: %{name}-%{version}-array-del.patch -Patch5: %{name}-%{version}-gcc47.patch -Patch6: xbase-automake-1.13.patch +Source0: http://prdownloads.sourceforge.net/xdb/%{name}64-%{version}.tar.gz +Patch0: xbase-3.1.2-fixconfig.patch +Patch1: xbase-3.1.2-gcc44.patch +Patch2: xbase-2.0.0-ppc.patch +Patch3: xbase-3.1.2-xbnode.patch +Patch4: xbase-3.1.2-lesserg.patch +Patch5: xbase-3.1.2-gcc47.patch +Patch6: xbase-3.1.2-gcc6.patch +Patch7: xbase-3.1.2-configure-gcc-version-fix.patch +Patch8: xbase-3.1.2-gcc7.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: libtool -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: xbase64 = %{version}-%{release} %description +This package contains various utilities for working with X-Base files: +checkndx (check an NDX file), copydbf (copy a DBF file structure), deletall +(mark all records for deletion), dumphdr (print an X-Base file header), +dumprecs (dump records for an X-Base file), packdbf (pack a database file), +reindex (rebuild an index), undelall (undeletes all deleted records in a file), +xbase-zap (remove all records from a DBF file). + +%package -n %{libname} +Summary: XBase Compatible C++ Class Library +Group: System/Libraries + +%description -n %{libname} This is an XBase (dBase and FoxPro, for example) compatible C++ class library. -This package contains header files, a library, some command line tools, -and developer documentation. - %package devel Summary: Developmnet files for XBase Compatible C++ Class Library Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: libstdc++-devel -Provides: xbase:%{_includedir}/xbase/dbf.h +Provides: xbase64-devel = %{version}-%{release} %description devel This is an XBase (dBase and FoxPro, for example) compatible C++ class @@ -71,17 +84,15 @@ and developer documentation. %prep -%setup -q -%patch1 -%patch2 -%patch3 -%patch4 -%patch5 -p1 -%patch6 -p1 +%setup -q -n %{name}64-%{version} +%autopatch -p1 +touch AUTHORS README NEWS +cp -p copying COPYING +chmod -x COPYING ChangeLog %build autoreconf -fiv -%configure --disable-static --with-pic +%configure --disable-static make %{?_smp_mflags} %install @@ -89,20 +100,33 @@ mv %{buildroot}%{_bindir}/zap %{buildroot}%{_bindir}/xbase-zap find %{buildroot} -type f -name "*.la" -delete -print -%post -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig %files %defattr(-,root,root) -%doc AUTHORS TODO COPYING README NEWS -%{_bindir}/* +%doc COPYING ChangeLog +%{_bindir}/checkndx +%{_bindir}/copydbf +%{_bindir}/dbfxtrct +%{_bindir}/deletall +%{_bindir}/dumphdr +%{_bindir}/dumprecs +%{_bindir}/packdbf +%{_bindir}/reindex +%{_bindir}/undelall +%{_bindir}/xbase-zap +%{_bindir}/dbfutil1 + +%files -n %{libname} %{_libdir}/libxbase*.so.* %files devel %defattr(-,root,root) -%{_libdir}/libxbase.so -%{_includedir}/xbase +%{_bindir}/xbase64-config +%{_libdir}/libxbase64.so +%{_includedir}/xbase64 %files doc %defattr(-,root,root) ++++++ xbase-2.0.0-ppc.patch ++++++ --- xbase-2.0.0/ltconfig.foo 2007-05-04 18:14:42.000000000 -0400 +++ xbase-2.0.0/ltconfig 2007-05-04 18:15:39.000000000 -0400 @@ -1664,16 +1664,7 @@ linux-gnu*) shlibpath_var=LD_LIBRARY_PATH check_shared_deplibs_method='file_magic ELF 32-bit LSB shared object' sys_lib_search_path="/lib /usr/lib /usr/local/lib `echo $LD_LIBRARY_PATH | sed -e 's/:/ /g'`" - - if test -f /lib/ld.so.1; then - dynamic_linker='GNU ld.so' - else - # Only the GNU ld.so supports shared libraries on MkLinux. - case "$host_cpu" in - powerpc*) dynamic_linker=no ;; - *) dynamic_linker='Linux ld.so' ;; - esac - fi + dynamic_linker='GNU ld.so' ;; netbsd* | openbsd*) ++++++ xbase-3.1.2-configure-gcc-version-fix.patch ++++++ diff -up xbase64-3.1.2/configure.in.verfix xbase64-3.1.2/configure.in --- xbase64-3.1.2/configure.in.verfix 2017-02-20 09:44:55.702420764 -0500 +++ xbase64-3.1.2/configure.in 2017-02-20 09:45:05.838144610 -0500 @@ -74,7 +74,7 @@ AC_SUBST(RHREL) # get G++ version if test "$GXX" = "yes"; then - GXXVER=`${CXX} -v 2>&1 | grep version | cut -d " " -f 3 -` + GXXVER=`${CXX} -v 2>&1 | grep "gcc version" | cut -d " " -f 3 -` GXXVER="gcc${GXXVER}" else GXXVER="" ++++++ xbase-3.1.2-fixconfig.patch ++++++ diff -up xbase64-3.1.2/xbase64-config.in.BAD xbase64-3.1.2/xbase64-config.in --- xbase64-3.1.2/xbase64-config.in.BAD 2009-08-19 22:58:42.081087534 -0400 +++ xbase64-3.1.2/xbase64-config.in 2009-08-19 22:58:45.604090002 -0400 @@ -5,7 +5,7 @@ exec_prefix=@exec_prefix@ exec_prefix_set=no CC="@CC@" CXX="@CXX@" -LD="@SHARED_LD@" +LD="@LD@" usage="\ Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]" ++++++ xbase-2.0.0-gcc41fix.patch -> xbase-3.1.2-gcc44.patch ++++++ --- /work/SRC/openSUSE:Factory/xbase/xbase-2.0.0-gcc41fix.patch 2011-09-23 12:51:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xbase.new/xbase-3.1.2-gcc44.patch 2017-08-06 11:33:58.254427711 +0200 @@ -1,11 +1,24 @@ ---- xbase/ntx.h 2005/10/18 10:29:00 1.1 -+++ xbase/ntx.h 2005/10/18 10:29:24 -@@ -218,7 +218,7 @@ - xbShort KeyExists( char * Key ) { return FindKey( Key, strlen( Key ), 0 ); } - xbShort KeyExists( xbDouble ); +diff -up xbase64-3.1.2/xbase64/xbase64.cpp.gcc44 xbase64-3.1.2/xbase64/xbase64.cpp +--- xbase64-3.1.2/xbase64/xbase64.cpp.gcc44 2006-07-17 12:54:42.000000000 -0400 ++++ xbase64-3.1.2/xbase64/xbase64.cpp 2009-08-19 23:08:14.724079392 -0400 +@@ -66,6 +66,8 @@ + #include <dos.h> + #endif -- xbShort xbNtx::AllocKeyBufs(void); -+ xbShort AllocKeyBufs(void); ++#include <cerrno> ++ - virtual void GetExpression(char *buf, int len); - }; + /*! \file xbase64.cpp + */ +diff -up xbase64-3.1.2/xbase64/xblock.cpp.gcc44 xbase64-3.1.2/xbase64/xblock.cpp +--- xbase64-3.1.2/xbase64/xblock.cpp.gcc44 2009-08-19 23:08:59.408186578 -0400 ++++ xbase64-3.1.2/xbase64/xblock.cpp 2009-08-19 23:09:11.416184844 -0400 +@@ -65,6 +65,8 @@ + //#include <stdio.h> + //#include <stdlib.h> + ++#include <cerrno> ++ + /*! \file xblock.cpp + */ + #ifdef XB_LOCKING_ON ++++++ xbase-2.0.0-gcc41fix.patch -> xbase-3.1.2-gcc47.patch ++++++ --- /work/SRC/openSUSE:Factory/xbase/xbase-2.0.0-gcc41fix.patch 2011-09-23 12:51:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xbase.new/xbase-3.1.2-gcc47.patch 2017-08-06 11:33:58.266426019 +0200 @@ -1,11 +1,21 @@ ---- xbase/ntx.h 2005/10/18 10:29:00 1.1 -+++ xbase/ntx.h 2005/10/18 10:29:24 -@@ -218,7 +218,7 @@ - xbShort KeyExists( char * Key ) { return FindKey( Key, strlen( Key ), 0 ); } - xbShort KeyExists( xbDouble ); +diff -up xbase64-3.1.2/bin/dumprecs.cpp.gcc47 xbase64-3.1.2/bin/dumprecs.cpp +--- xbase64-3.1.2/bin/dumprecs.cpp.gcc47 2012-01-05 15:36:00.377536998 -0500 ++++ xbase64-3.1.2/bin/dumprecs.cpp 2012-01-05 15:36:15.198399295 -0500 +@@ -70,7 +70,7 @@ int main(int ac,char** av) + return 1; + } -- xbShort xbNtx::AllocKeyBufs(void); -+ xbShort AllocKeyBufs(void); +- for(int i=1; i<ac; ++i){ ++ for(int i=1; i<ac; ++i){{ + char* filename = av[i]; + + xbDbf MyFile( &x ); +@@ -91,7 +91,7 @@ int main(int ac,char** av) + x.DisplayError( rc ); + } + MyFile.CloseDatabase(); /* close database */ +- } ++ }} + return 0; + } - virtual void GetExpression(char *buf, int len); - }; ++++++ xbase-2.0.0-gcc41fix.patch -> xbase-3.1.2-gcc6.patch ++++++ --- /work/SRC/openSUSE:Factory/xbase/xbase-2.0.0-gcc41fix.patch 2011-09-23 12:51:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xbase.new/xbase-3.1.2-gcc6.patch 2017-08-06 11:33:58.310419822 +0200 @@ -1,11 +1,49 @@ ---- xbase/ntx.h 2005/10/18 10:29:00 1.1 -+++ xbase/ntx.h 2005/10/18 10:29:24 -@@ -218,7 +218,7 @@ - xbShort KeyExists( char * Key ) { return FindKey( Key, strlen( Key ), 0 ); } - xbShort KeyExists( xbDouble ); - -- xbShort xbNtx::AllocKeyBufs(void); -+ xbShort AllocKeyBufs(void); - - virtual void GetExpression(char *buf, int len); - }; +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 ++++++ xbase-2.0.0-gcc41fix.patch -> xbase-3.1.2-gcc7.patch ++++++ --- /work/SRC/openSUSE:Factory/xbase/xbase-2.0.0-gcc41fix.patch 2011-09-23 12:51:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xbase.new/xbase-3.1.2-gcc7.patch 2017-08-06 11:33:58.370411370 +0200 @@ -1,11 +1,34 @@ ---- xbase/ntx.h 2005/10/18 10:29:00 1.1 -+++ xbase/ntx.h 2005/10/18 10:29:24 -@@ -218,7 +218,7 @@ - xbShort KeyExists( char * Key ) { return FindKey( Key, strlen( Key ), 0 ); } - xbShort KeyExists( xbDouble ); +diff -up xbase64-3.1.2/bin/dbfutil1.cpp.gcc7 xbase64-3.1.2/bin/dbfutil1.cpp +--- xbase64-3.1.2/bin/dbfutil1.cpp.gcc7 2017-02-20 09:59:36.135561103 -0500 ++++ xbase64-3.1.2/bin/dbfutil1.cpp 2017-02-20 10:00:32.743218194 -0500 +@@ -157,7 +157,8 @@ void MyClass::SetFilter() + memset( Expression, 0x00, 512 ); + while( !strlen( Expression )){ + std::cout << "Enter filter expression (like AMOUNT<5)" << std::endl; +- gets( Expression ); ++ fgets( Expression, sizeof(Expression), stdin ); ++ strtok( Expression, "\n" ); + } + if( xbf ) + delete xbf; +@@ -247,7 +248,8 @@ void MyClass::ProcessExpression() + while( !strstr( exprsn, "QUIT" ) && !strstr( exprsn, "quit" )){ -- xbShort xbNtx::AllocKeyBufs(void); -+ xbShort AllocKeyBufs(void); + std::cout << ">"; +- gets( exprsn ); ++ fgets( exprsn, sizeof(exprsn), stdin ); ++ strtok( exprsn, "\n" ); - virtual void GetExpression(char *buf, int len); - }; + if( strstr( exprsn, "HELP" ) || strstr( exprsn, "help" )){ + std::cout << "** Command Help ***" << std::endl << std::endl; +diff -up xbase64-3.1.2/xbase64/xbase64.h.gcc7 xbase64-3.1.2/xbase64/xbase64.h +--- xbase64-3.1.2/xbase64/xbase64.h.gcc7 2017-02-20 09:49:07.063609482 -0500 ++++ xbase64-3.1.2/xbase64/xbase64.h 2017-02-20 09:57:36.586618723 -0500 +@@ -53,6 +53,7 @@ + #endif + + #include <string.h> ++#include <cstdio> + + #if defined(__WIN32__) + #include "windows.h" ++++++ xbase-3.1.2-lesserg.patch ++++++ diff -up xbase64-3.1.2/xbase64/xbase64.cpp.lesserg xbase64-3.1.2/xbase64/xbase64.cpp --- xbase64-3.1.2/xbase64/xbase64.cpp.lesserg 2012-01-05 15:31:01.695312436 -0500 +++ xbase64-3.1.2/xbase64/xbase64.cpp 2012-01-05 15:31:01.717312232 -0500 @@ -38,7 +38,7 @@ */ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma implementation "xbase64.h" #endif diff -up xbase64-3.1.2/xbase64/xbase64.h.lesserg xbase64-3.1.2/xbase64/xbase64.h --- xbase64-3.1.2/xbase64/xbase64.h.lesserg 2006-07-17 12:54:50.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbase64.h 2012-01-05 15:31:01.718312223 -0500 @@ -42,7 +42,7 @@ #ifndef __XB_XBASE_H__ #define __XB_XBASE_H__ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma interface #endif @@ -60,7 +60,7 @@ // ripped from wxWindows // _declspec works in BC++ 5 and later, as well as VC++ -#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNU LesserC__) +#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNU_LesserC__) # ifdef XBMAKINGDLL # define XBDLLEXPORT __declspec( dllexport ) # define XBDLLEXPORT_DATA(type) __declspec( dllexport ) type diff -up xbase64-3.1.2/xbase64/xbcdx.h.lesserg xbase64-3.1.2/xbase64/xbcdx.h --- xbase64-3.1.2/xbase64/xbcdx.h.lesserg 2012-01-05 15:32:17.398608985 -0500 +++ xbase64-3.1.2/xbase64/xbcdx.h 2012-01-05 15:32:43.051370614 -0500 @@ -50,7 +50,7 @@ struct CdxInnerNode: public CdxNode { char keys[500]; } -#ifdef __GNU LesserC__ +#ifdef __GNU_LesserC__ __attribute__((packed)) #endif ; @@ -67,7 +67,7 @@ struct CdxLeafNode: public CdxNode char byteCount; char keys[488]; } -#ifdef __GNU LesserC__ +#ifdef __GNU_LesserC__ __attribute__((packed)) #endif ; diff -up xbase64-3.1.2/xbase64/xbdate.cpp.lesserg xbase64-3.1.2/xbase64/xbdate.cpp --- xbase64-3.1.2/xbase64/xbdate.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbdate.cpp 2012-01-05 15:31:01.719312213 -0500 @@ -40,7 +40,7 @@ */ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma implementation "xbdate.h" #endif diff -up xbase64-3.1.2/xbase64/xbdate.h.lesserg xbase64-3.1.2/xbase64/xbdate.h --- xbase64-3.1.2/xbase64/xbdate.h.lesserg 2006-07-17 12:54:50.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbdate.h 2012-01-05 15:31:01.721312195 -0500 @@ -45,7 +45,7 @@ #ifndef __XB_XBDATE_H__ #define __XB_XBDATE_H__ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma interface #endif diff -up xbase64-3.1.2/xbase64/xbdbf.cpp.lesserg xbase64-3.1.2/xbase64/xbdbf.cpp --- xbase64-3.1.2/xbase64/xbdbf.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbdbf.cpp 2012-01-05 15:31:01.722312185 -0500 @@ -39,7 +39,7 @@ */ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma implementation "xbdbf.h" #endif diff -up xbase64-3.1.2/xbase64/xbdbf.h.lesserg xbase64-3.1.2/xbase64/xbdbf.h --- xbase64-3.1.2/xbase64/xbdbf.h.lesserg 2006-07-17 12:54:50.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbdbf.h 2012-01-05 15:31:01.723312175 -0500 @@ -41,7 +41,7 @@ #ifndef __XB_DBF_H__ #define __XB_DBF_H__ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma interface #endif diff -up xbase64-3.1.2/xbase64/xbexp.cpp.lesserg xbase64-3.1.2/xbase64/xbexp.cpp --- xbase64-3.1.2/xbase64/xbexp.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbexp.cpp 2012-01-05 15:31:01.725312157 -0500 @@ -38,7 +38,7 @@ */ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma implementation "xbexp.h" #endif diff -up xbase64-3.1.2/xbase64/xbexp.h.lesserg xbase64-3.1.2/xbase64/xbexp.h --- xbase64-3.1.2/xbase64/xbexp.h.lesserg 2006-07-17 12:54:50.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbexp.h 2012-01-05 15:31:01.726312148 -0500 @@ -42,7 +42,7 @@ #ifndef __XB_EXP_H__ #define __XB_EXP_H__ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma interface #endif diff -up xbase64-3.1.2/xbase64/xbfile.cpp.lesserg xbase64-3.1.2/xbase64/xbfile.cpp --- xbase64-3.1.2/xbase64/xbfile.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbfile.cpp 2012-01-05 15:31:01.727312139 -0500 @@ -39,7 +39,7 @@ */ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma implementation "xbfile.h" #endif diff -up xbase64-3.1.2/xbase64/xbfile.h.lesserg xbase64-3.1.2/xbase64/xbfile.h --- xbase64-3.1.2/xbase64/xbfile.h.lesserg 2006-07-17 12:54:50.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbfile.h 2012-01-05 15:31:01.728312130 -0500 @@ -45,7 +45,7 @@ #ifndef __XB_FILE_H__ #define __XB_FILE_H__ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma interface #endif diff -up xbase64-3.1.2/xbase64/xbfilter.cpp.lesserg xbase64-3.1.2/xbase64/xbfilter.cpp --- xbase64-3.1.2/xbase64/xbfilter.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbfilter.cpp 2012-01-05 15:31:01.729312120 -0500 @@ -38,7 +38,7 @@ */ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma implementation "xbfilter.h" #endif diff -up xbase64-3.1.2/xbase64/xbfilter.h.lesserg xbase64-3.1.2/xbase64/xbfilter.h --- xbase64-3.1.2/xbase64/xbfilter.h.lesserg 2006-07-17 12:54:50.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbfilter.h 2012-01-05 15:31:01.731312101 -0500 @@ -44,7 +44,7 @@ #ifndef __XB_FILTER_H__ #define __XB_FILTER_H__ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma interface #endif diff -up xbase64-3.1.2/xbase64/xbindex.cpp.lesserg xbase64-3.1.2/xbase64/xbindex.cpp --- xbase64-3.1.2/xbase64/xbindex.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbindex.cpp 2012-01-05 15:31:01.732312092 -0500 @@ -37,7 +37,7 @@ USA */ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma implementation "xbindex.h" #endif diff -up xbase64-3.1.2/xbase64/xbindex.h.lesserg xbase64-3.1.2/xbase64/xbindex.h --- xbase64-3.1.2/xbase64/xbindex.h.lesserg 2006-07-17 12:54:50.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbindex.h 2012-01-05 15:31:01.733312083 -0500 @@ -43,7 +43,7 @@ #ifndef __XB_INDEX_H__ #define __XB_INDEX_H__ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma interface #endif diff -up xbase64-3.1.2/xbase64/xblock.cpp.lesserg xbase64-3.1.2/xbase64/xblock.cpp --- xbase64-3.1.2/xbase64/xblock.cpp.lesserg 2012-01-05 15:31:01.696312427 -0500 +++ xbase64-3.1.2/xbase64/xblock.cpp 2012-01-05 15:31:01.734312074 -0500 @@ -42,7 +42,7 @@ USA */ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma implementation "xblock.h" #endif diff -up xbase64-3.1.2/xbase64/xblock.h.lesserg xbase64-3.1.2/xbase64/xblock.h --- xbase64-3.1.2/xbase64/xblock.h.lesserg 2006-07-17 12:54:50.000000000 -0400 +++ xbase64-3.1.2/xbase64/xblock.h 2012-01-05 15:31:01.735312065 -0500 @@ -44,7 +44,7 @@ #ifndef __XB_XBLOCK_H__ #define __XB_XBLOCK_H__ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma interface #endif diff -up xbase64-3.1.2/xbase64/xbndx.cpp.lesserg xbase64-3.1.2/xbase64/xbndx.cpp --- xbase64-3.1.2/xbase64/xbndx.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbndx.cpp 2012-01-05 15:31:01.737312045 -0500 @@ -36,7 +36,7 @@ */ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma implementation "xbndx.h" #endif diff -up xbase64-3.1.2/xbase64/xbndx.h.lesserg xbase64-3.1.2/xbase64/xbndx.h --- xbase64-3.1.2/xbase64/xbndx.h.lesserg 2006-07-17 12:54:50.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbndx.h 2012-01-05 15:31:01.738312036 -0500 @@ -41,7 +41,7 @@ #ifndef __XB_NDX_H__ #define __XB_NDX_H__ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma interface #endif diff -up xbase64-3.1.2/xbase64/xbntx.cpp.lesserg xbase64-3.1.2/xbase64/xbntx.cpp --- xbase64-3.1.2/xbase64/xbntx.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbntx.cpp 2012-01-05 15:31:01.740312018 -0500 @@ -40,7 +40,7 @@ USA */ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma implementation "xbntx.h" #endif diff -up xbase64-3.1.2/xbase64/xbntx.h.lesserg xbase64-3.1.2/xbase64/xbntx.h --- xbase64-3.1.2/xbase64/xbntx.h.lesserg 2006-07-17 12:54:50.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbntx.h 2012-01-05 15:31:01.741312009 -0500 @@ -42,7 +42,7 @@ #ifndef __XB_NTX_H__ #define __XB_NTX_H__ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma interface #endif diff -up xbase64-3.1.2/xbase64/xbstring.cpp.lesserg xbase64-3.1.2/xbase64/xbstring.cpp --- xbase64-3.1.2/xbase64/xbstring.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbstring.cpp 2012-01-05 15:31:01.742312000 -0500 @@ -38,7 +38,7 @@ */ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma implementation "xbstring.h" #endif diff -up xbase64-3.1.2/xbase64/xbstring.h.lesserg xbase64-3.1.2/xbase64/xbstring.h --- xbase64-3.1.2/xbase64/xbstring.h.lesserg 2006-07-17 12:54:50.000000000 -0400 +++ xbase64-3.1.2/xbase64/xbstring.h 2012-01-05 15:31:01.743311990 -0500 @@ -41,7 +41,7 @@ #ifndef __XBSTRING_H__ #define __XBSTRING_H__ -#ifdef __GNU LesserG__ +#ifdef __GNU_LesserG__ #pragma interface #endif ++++++ xbase-3.1.2-xbnode.patch ++++++ diff -up xbase64-3.1.2/xbase64/xbnode.cpp.BAD xbase64-3.1.2/xbase64/xbnode.cpp --- xbase64-3.1.2/xbase64/xbnode.cpp.BAD 2009-08-19 23:10:38.444059289 -0400 +++ xbase64-3.1.2/xbase64/xbnode.cpp 2009-08-19 23:10:47.348202984 -0400 @@ -1,4 +1,4 @@ -#include "xbNode.h" +#include "xbnode.h" void xbNodeLink::AddNode(xbNodeLink* node) { ++++++ xbase-2.0.0.tar.gz -> xbase64-3.1.2.tar.gz ++++++ ++++ 96842 lines of diff (skipped)