Wed Sep 11 12:22:33 2013 UTC ()
Update to soci 3.2.2:
- Fix uninitialized indicators in conversion_into_type and
  conversion_use_type specialisations
- Fixed placeholder matching for PostgreSQL-style casts with ORM
- Fixed memory leaking in use binding in case of bind/unbind sequence
- Fixed sscanf formatter for MinGW/MSVC in backends
- Fixed partial placeholder name matching for ORM cases
- Added test for use of indicators with rowset<row>
- Added test for get_affected_rows after bulk operations

Add options for selecting MySQL/PostgreSQL/SQLite backends, defaulting
to PostgreSQL.


(joerg)
diff -r1.3 -r1.4 pkgsrc/databases/soci/Makefile
diff -r1.3 -r1.4 pkgsrc/databases/soci/distinfo
diff -r1.1 -r1.2 pkgsrc/databases/soci/PLIST
diff -r0 -r1.1 pkgsrc/databases/soci/options.mk
diff -r1.1 -r1.2 pkgsrc/databases/soci/patches/patch-CMakeLists.txt
diff -r1.1 -r0 pkgsrc/databases/soci/patches/patch-backends_postgresql_session.cpp
diff -r1.1 -r0 pkgsrc/databases/soci/patches/patch-backends_postgresql_soci-postgresql.h
diff -r1.1 -r0 pkgsrc/databases/soci/patches/patch-backends_sqlite3_soci-sqlite3.h
diff -r1.1 -r0 pkgsrc/databases/soci/patches/patch-core_once-temp-type.cpp
diff -r1.1 -r0 pkgsrc/databases/soci/patches/patch-core_once-temp-type.h
cvs diff -r1.3 -r1.4 pkgsrc/databases/soci/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/soci/Makefile 2013/08/30 10:19:37 1.3
+++ pkgsrc/databases/soci/Makefile 2013/09/11 12:22:33 1.4
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.3 2013/08/30 10:19:37 joerg Exp $ 1# $NetBSD: Makefile,v 1.4 2013/09/11 12:22:33 joerg Exp $
2# 2#
3 3
4DISTNAME= soci-3.2.1 4DISTNAME= soci-3.2.2
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= databases 6CATEGORIES= databases
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=soci/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=soci/}
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://soci.sourceforge.net/ 10HOMEPAGE= http://soci.sourceforge.net/
11COMMENT= C++ database access library 11COMMENT= C++ database access library
12LICENSE= boost-license 12LICENSE= boost-license
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16 16
17CMAKE_ARGS+= -DSOCI_LIBDIR=lib 17CMAKE_ARGS+= -DSOCI_LIBDIR=lib
18 18
19.include "../../databases/sqlite3/buildlink3.mk" 19.include "options.mk"
20.include "../../mk/pgsql.buildlink3.mk" 
21.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/databases/soci/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/soci/distinfo 2013/08/30 10:19:37 1.3
+++ pkgsrc/databases/soci/distinfo 2013/09/11 12:22:33 1.4
@@ -1,11 +1,6 @@ @@ -1,11 +1,6 @@
1$NetBSD: distinfo,v 1.3 2013/08/30 10:19:37 joerg Exp $ 1$NetBSD: distinfo,v 1.4 2013/09/11 12:22:33 joerg Exp $
2 2
3SHA1 (soci-3.2.1.tar.gz) = 38f602ec8d61c4563df8ea4d4ed318dc378e7096 3SHA1 (soci-3.2.2.tar.gz) = 0a63cdbe719793c37b328a95778451a550f22c0a
4RMD160 (soci-3.2.1.tar.gz) = 3e98139aa904c62dbf7cc6a1fae5fc73042a6364 4RMD160 (soci-3.2.2.tar.gz) = d366c1773d23c551404a8e05791afc3a4b6acfdd
5Size (soci-3.2.1.tar.gz) = 343358 bytes 5Size (soci-3.2.2.tar.gz) = 354047 bytes
6SHA1 (patch-CMakeLists.txt) = c66f0b8fd3ca0fedaebedd6943ae0471f7c6ba35 6SHA1 (patch-CMakeLists.txt) = 589fed2101a09637cb3f052bf7915dd2bccf0385
7SHA1 (patch-backends_postgresql_session.cpp) = d816ffc0c4981ef9b2bdcb28e9e4292b519d3e75 
8SHA1 (patch-backends_postgresql_soci-postgresql.h) = 1c01ebdad82d4f641024b8e73a4c853f1c83b134 
9SHA1 (patch-backends_sqlite3_soci-sqlite3.h) = 688260116f0e35f37f7de8d61366a3397259dc0c 
10SHA1 (patch-core_once-temp-type.cpp) = 5d19aa72accd8d3883915283c1380df2ec4c7e5c 
11SHA1 (patch-core_once-temp-type.h) = 5c08a4c0f5bba3729bfec2c6930b6145da5e864d 
cvs diff -r1.1 -r1.2 pkgsrc/databases/soci/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/soci/PLIST 2013/07/05 21:04:45 1.1
+++ pkgsrc/databases/soci/PLIST 2013/09/11 12:22:33 1.2
@@ -1,64 +1,70 @@ @@ -1,64 +1,70 @@
1@comment $NetBSD: PLIST,v 1.1 2013/07/05 21:04:45 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.2 2013/09/11 12:22:33 joerg Exp $
2include/soci/backend-loader.h 2include/soci/backend-loader.h
3include/soci/blob-exchange.h 3include/soci/blob-exchange.h
4include/soci/blob.h 4include/soci/blob.h
5include/soci/boost-fusion.h 5include/soci/boost-fusion.h
6include/soci/boost-gregorian-date.h 6include/soci/boost-gregorian-date.h
7include/soci/boost-optional.h 7include/soci/boost-optional.h
8include/soci/boost-tuple.h 8include/soci/boost-tuple.h
9include/soci/connection-parameters.h 9include/soci/connection-parameters.h
10include/soci/connection-pool.h 10include/soci/connection-pool.h
11include/soci/empty/soci-empty.h 11include/soci/empty/soci-empty.h
12include/soci/error.h 12include/soci/error.h
13include/soci/exchange-traits.h 13include/soci/exchange-traits.h
14include/soci/into-type.h 14include/soci/into-type.h
15include/soci/into.h 15include/soci/into.h
 16${PLIST.mysql}include/soci/mysql/common.h
 17${PLIST.mysql}include/soci/mysql/soci-mysql.h
16include/soci/once-temp-type.h 18include/soci/once-temp-type.h
17include/soci/postgresql/common.h 19${PLIST.pgsql}include/soci/postgresql/common.h
18include/soci/postgresql/soci-postgresql.h 20${PLIST.pgsql}include/soci/postgresql/soci-postgresql.h
19include/soci/prepare-temp-type.h 21include/soci/prepare-temp-type.h
20include/soci/procedure.h 22include/soci/procedure.h
21include/soci/query_transformation.h 23include/soci/query_transformation.h
22include/soci/ref-counted-prepare-info.h 24include/soci/ref-counted-prepare-info.h
23include/soci/ref-counted-statement.h 25include/soci/ref-counted-statement.h
24include/soci/row-exchange.h 26include/soci/row-exchange.h
25include/soci/row.h 27include/soci/row.h
26include/soci/rowid-exchange.h 28include/soci/rowid-exchange.h
27include/soci/rowid.h 29include/soci/rowid.h
28include/soci/rowset.h 30include/soci/rowset.h
29include/soci/session.h 31include/soci/session.h
30include/soci/soci-backend.h 32include/soci/soci-backend.h
31include/soci/soci-config.h 33include/soci/soci-config.h
32include/soci/soci-platform.h 34include/soci/soci-platform.h
33include/soci/soci-simple.h 35include/soci/soci-simple.h
34include/soci/soci.h 36include/soci/soci.h
35include/soci/sqlite3/common.h 37${PLIST.sqlite}include/soci/sqlite3/common.h
36include/soci/sqlite3/soci-sqlite3.h 38${PLIST.sqlite}include/soci/sqlite3/soci-sqlite3.h
37include/soci/statement.h 39include/soci/statement.h
38include/soci/transaction.h 40include/soci/transaction.h
39include/soci/type-conversion-traits.h 41include/soci/type-conversion-traits.h
40include/soci/type-conversion.h 42include/soci/type-conversion.h
41include/soci/type-holder.h 43include/soci/type-holder.h
42include/soci/type-ptr.h 44include/soci/type-ptr.h
43include/soci/unsigned-types.h 45include/soci/unsigned-types.h
44include/soci/use-type.h 46include/soci/use-type.h
45include/soci/use.h 47include/soci/use.h
46include/soci/values-exchange.h 48include/soci/values-exchange.h
47include/soci/values.h 49include/soci/values.h
48include/soci/version.h 50include/soci/version.h
49lib/libsoci_core.a 51lib/libsoci_core.a
50lib/libsoci_core.so 52lib/libsoci_core.so
51lib/libsoci_core.so.3.2 53lib/libsoci_core.so.3.2
52lib/libsoci_core.so.${PKGVERSION} 54lib/libsoci_core.so.${PKGVERSION}
53lib/libsoci_empty.a 55lib/libsoci_empty.a
54lib/libsoci_empty.so 56lib/libsoci_empty.so
55lib/libsoci_empty.so.3.2 57lib/libsoci_empty.so.3.2
56lib/libsoci_empty.so.${PKGVERSION} 58lib/libsoci_empty.so.${PKGVERSION}
57lib/libsoci_postgresql.a 59${PLIST.mysql}lib/libsoci_mysql.a
58lib/libsoci_postgresql.so 60${PLIST.mysql}lib/libsoci_mysql.so
59lib/libsoci_postgresql.so.3.2 61${PLIST.mysql}lib/libsoci_mysql.so.3.2
60lib/libsoci_postgresql.so.${PKGVERSION} 62${PLIST.mysql}lib/libsoci_mysql.so.${PKGVERSION}
61lib/libsoci_sqlite3.a 63${PLIST.pgsql}lib/libsoci_postgresql.a
62lib/libsoci_sqlite3.so 64${PLIST.pgsql}lib/libsoci_postgresql.so
63lib/libsoci_sqlite3.so.3.2 65${PLIST.pgsql}lib/libsoci_postgresql.so.3.2
64lib/libsoci_sqlite3.so.${PKGVERSION} 66${PLIST.pgsql}lib/libsoci_postgresql.so.${PKGVERSION}
 67${PLIST.sqlite}lib/libsoci_sqlite3.a
 68${PLIST.sqlite}lib/libsoci_sqlite3.so
 69${PLIST.sqlite}lib/libsoci_sqlite3.so.3.2
 70${PLIST.sqlite}lib/libsoci_sqlite3.so.${PKGVERSION}
File Added: pkgsrc/databases/soci/options.mk
# $NetBSD: options.mk,v 1.1 2013/09/11 12:22:33 joerg Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.soci
PKG_SUPPORTED_OPTIONS=	mysql pgsql sqlite
PKG_SUGGESTED_OPTIONS=	pgsql

.include "../../mk/bsd.options.mk"

PLIST_VARS+=	${PKG_SUPPORTED_OPTIONS}

CMAKE_ARGS+=	-DWITH_ODBC=off -DWITH_ORACLE=off \
		-DWITH_FIREBIRD=off -DWITH_DB2=off

PLIST_VARS+=	mysql pgsql sqlite

.if !empty(PKG_OPTIONS:Mmysql)
.include "../../mk/mysql.buildlink3.mk"
CMAKE_ARGS+=	-DWITH_MYSQL=on
PLIST.mysql=	yes
.else
CMAKE_ARGS+=	-DWITH_MYSQL=off
.endif

.if !empty(PKG_OPTIONS:Mpgsql)
.include "../../mk/pgsql.buildlink3.mk"
CMAKE_ARGS+=	-DWITH_POSTGRESQL=on
PLIST.pgsql=	yes
.else
CMAKE_ARGS+=	-DWITH_POSTGRESQL=off
.endif

.if !empty(PKG_OPTIONS:Msqlite)
.include "../../databases/sqlite3/buildlink3.mk"
CMAKE_ARGS+=	-DWITH_SQLITE3=on
PLIST.sqlite=	yes
.else
CMAKE_ARGS+=	-DWITH_SQLITE3=off
.endif
cvs diff -r1.1 -r1.2 pkgsrc/databases/soci/patches/Attic/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/databases/soci/patches/Attic/patch-CMakeLists.txt 2013/07/05 21:04:45 1.1
+++ pkgsrc/databases/soci/patches/Attic/patch-CMakeLists.txt 2013/09/11 12:22:33 1.2
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1$NetBSD: patch-CMakeLists.txt,v 1.1 2013/07/05 21:04:45 joerg Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.2 2013/09/11 12:22:33 joerg Exp $
2 2
3Use consistent behavior on all platforms. 3--- CMakeLists.txt.orig 2013-09-11 10:45:29.000000000 +0000
4 
5--- CMakeLists.txt.orig 2013-07-05 18:10:32.000000000 +0000 
6+++ CMakeLists.txt 4+++ CMakeLists.txt
7@@ -70,11 +70,7 @@ include(SociDependencies) 5@@ -70,11 +70,13 @@ include(SociDependencies)
8 # Installation 6 # Installation
9 ############################################################################### 7 ###############################################################################
10  8
11-if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4) 9+if(NOT DEFINED SOCI_LIBDIR)
12- set(SOCI_LIBDIR "lib") 10 if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
13-else() 11 set(SOCI_LIBDIR "lib")
14- set(SOCI_LIBDIR "lib64") 12 else()
15-endif() 13 set(SOCI_LIBDIR "lib64")
16+set(SOCI_LIBDIR "lib") 14 endif()
 15+endif()
17  16
18 set(BINDIR "bin" CACHE PATH "The directory to install binaries into.") 17 set(BINDIR "bin" CACHE PATH "The directory to install binaries into.")
19 set(LIBDIR ${SOCI_LIBDIR} CACHE PATH "The directory to install libraries into.") 18 set(LIBDIR ${SOCI_LIBDIR} CACHE PATH "The directory to install libraries into.")
File Deleted: pkgsrc/databases/soci/patches/Attic/patch-backends_postgresql_session.cpp
File Deleted: pkgsrc/databases/soci/patches/Attic/patch-backends_postgresql_soci-postgresql.h
File Deleted: pkgsrc/databases/soci/patches/Attic/patch-backends_sqlite3_soci-sqlite3.h
File Deleted: pkgsrc/databases/soci/patches/Attic/patch-core_once-temp-type.cpp
File Deleted: pkgsrc/databases/soci/patches/Attic/patch-core_once-temp-type.h