Hello community,
here is the log from the commit of package xbsql for openSUSE:Factory checked
in at 2017-09-04 12:36:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xbsql (Old)
and /work/SRC/openSUSE:Factory/.xbsql.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xbsql"
Mon Sep 4 12:36:06 2017 rev:22 rq:520352 version:0.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/xbsql/xbsql.changes 2015-04-23
08:04:13.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xbsql.new/xbsql.changes 2017-09-04
12:36:09.816853180 +0200
@@ -1,0 +2,6 @@
+Sat Sep 2 11:41:18 UTC 2017 - wba...@tmo.at
+
+- Add xbase64.patch to fix build with latest xbase(64) 3.1.2 in
+ Factory
+
+-------------------------------------------------------------------
New:
----
xbase64.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xbsql.spec ++++++
--- /var/tmp/diff_new_pack.bjFhTk/_old 2017-09-04 12:36:10.704728264 +0200
+++ /var/tmp/diff_new_pack.bjFhTk/_new 2017-09-04 12:36:10.704728264 +0200
@@ -27,6 +27,8 @@
Source0: %{name}-%{version}.tar.bz2
Patch0: %{name}.diff
Patch1: xbsql-0.11-bufferoverflowstrncat.patch
+# PATCH-FIX-OPENSUSE xbase64.patch -- fix build with latest xbase(64) 3.1.2 in
Factory
+Patch2: xbase64.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
@@ -70,6 +72,7 @@
%setup -q
%patch0
%patch1
+%patch2 -p1
%build
autoreconf -fi
++++++ xbase64.patch ++++++
diff -ur xbsql-0.11.orig/test/Makefile.am xbsql-0.11/test/Makefile.am
--- xbsql-0.11.orig/test/Makefile.am 2017-08-30 12:48:09.000000000 +0200
+++ xbsql-0.11/test/Makefile.am 2017-08-30 12:47:12.000000000 +0200
@@ -6,5 +6,5 @@
S003_multi_SOURCES = S003_multi.cpp
-S003_multi_LDFLAGS = -lxbase $(DEBUG) ../xbsql/libxbsql.la
+S003_multi_LDFLAGS = -lxbase64 $(DEBUG) ../xbsql/libxbsql.la
diff -ur xbsql-0.11.orig/xbsql/Makefile.am xbsql-0.11/xbsql/Makefile.am
--- xbsql-0.11.orig/xbsql/Makefile.am 2017-08-30 12:48:09.000000000 +0200
+++ xbsql-0.11/xbsql/Makefile.am 2017-08-30 12:47:34.000000000 +0200
@@ -16,10 +16,10 @@
xb_assignlist.cpp xb_create.cpp \
xbsql.tab.c xb_datetime.cpp
-libxbsql_la_LDFLAGS = -lxbase
+libxbsql_la_LDFLAGS = -lxbase64
xql_SOURCES = xql.cpp
-xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la
+xql_LDADD = -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la
#
#
diff -ur xbsql-0.11.orig/xbsql/xbsql.cpp xbsql-0.11/xbsql/xbsql.cpp
--- xbsql-0.11.orig/xbsql/xbsql.cpp 2017-08-30 12:48:09.000000000 +0200
+++ xbsql-0.11/xbsql/xbsql.cpp 2017-08-30 12:47:12.000000000 +0200
@@ -207,7 +207,7 @@
break ;
default :
- e = xbStrError (rc) ;
+ e = GetErrorMessage (rc) ;
break ;
}
@@ -230,7 +230,7 @@
char t[1024] ;
va_list aptr ;
- strcpy (t, xbStrError (rc)) ;
+ strcpy (t, GetErrorMessage (rc)) ;
strcat (t, ": ") ;
int l = strlen(t) ;
diff -ur xbsql-0.11.orig/xbsql/xbsql.h xbsql-0.11/xbsql/xbsql.h
--- xbsql-0.11.orig/xbsql/xbsql.h 2003-03-28 20:07:31.000000000 +0100
+++ xbsql-0.11/xbsql/xbsql.h 2017-08-30 12:47:12.000000000 +0200
@@ -43,8 +43,7 @@
#endif
-#include <xbase/xbase.h>
-#include <xbase/xbexcept.h>
+#include <xbase64/xbase64.h>
class XBaseSQL ;
class XBSQLTable ;
