OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Sep-2007 09:59:58
Branch: HEAD Handle: 2007092008595700
Modified files:
openpkg-src/perl-dbi perl-dbi.patch perl-dbi.spec
Log:
modifying package: perl-dbi-5.8.8 20070824 -> 20070920
Summary:
Revision Changes Path
1.30 +18 -17 openpkg-src/perl-dbi/perl-dbi.patch
1.245 +2 -2 openpkg-src/perl-dbi/perl-dbi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.patch
============================================================================
$ cvs diff -u -r1.29 -r1.30 perl-dbi.patch
--- openpkg-src/perl-dbi/perl-dbi.patch 26 Jun 2007 19:15:20 -0000
1.29
+++ openpkg-src/perl-dbi/perl-dbi.patch 20 Sep 2007 07:59:57 -0000
1.30
@@ -1,6 +1,6 @@
-Index: DBD-SQLite-1.13/Makefile.PL
---- DBD-SQLite-1.13/Makefile.PL.orig 2006-09-08 05:45:13 +0200
-+++ DBD-SQLite-1.13/Makefile.PL 2007-06-26 21:06:20 +0200
+Index: DBD-SQLite-1.14/Makefile.PL
+--- DBD-SQLite-1.14/Makefile.PL.orig 2007-08-28 21:57:09 +0200
++++ DBD-SQLite-1.14/Makefile.PL 2007-09-20 09:40:47 +0200
@@ -10,34 +10,6 @@
}
use Config;
@@ -43,10 +43,10 @@
-my $libs = '';
-$libs .= "-L$sqlite_lib " if ($sqlite_lib);
-$libs .= "-lsqlite3 " unless ($force_local);
-+my $inc = [EMAIL PROTECTED]@/bin/pkg-config sqlite3 --cflags-only-I`;
-+$inc =~ s/\r?\n$//s;
++my $inc = [EMAIL PROTECTED]@/bin/pkg-config sqlite3 --cflags-only-I`;
++$inc =~ s/\r?\n$//s;
+my $libs = [EMAIL PROTECTED]@/bin/pkg-config sqlite3 --libs`;
-+$libs =~ s/\r?\n$//s;
++$libs =~ s/\r?\n$//s;
WriteMakefile(
'NAME' => 'DBD::SQLite',
@@ -59,22 +59,23 @@
- $libs ? ('LIBS' => $libs) : (),
+ 'LIBS' => [ $libs ],
'OPTIMIZE' => "-O2",
- 'DEFINE' => "-DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}" .
+ 'DEFINE' => "-DSQLITE_CORE -DSQLITE_ENABLE_FTS2 -DNDEBUG=1
-DSQLITE_PTR_SZ=$Config{ptrsize}" .
( ($Config{d_usleep} ||
-Index: DBD-SQLite-1.13/dbdimp.c
---- DBD-SQLite-1.13/dbdimp.c.orig 2006-09-08 06:50:50 +0200
-+++ DBD-SQLite-1.13/dbdimp.c 2007-06-26 21:06:20 +0200
-@@ -394,14 +394,17 @@
+Index: DBD-SQLite-1.14/dbdimp.c
+--- DBD-SQLite-1.14/dbdimp.c.orig 2007-08-24 04:51:25 +0200
++++ DBD-SQLite-1.14/dbdimp.c 2007-09-20 09:42:02 +0200
+@@ -394,15 +394,18 @@
sqlite_trace(3, "Execute returned %d cols\n", DBIc_NUM_FIELDS(imp_sth));
if (DBIc_NUM_FIELDS(imp_sth) == 0) {
+ char *defererr = strdup((char*)sqlite3_errmsg(imp_dbh->db));
- while ((retval = sqlite3_step(imp_sth->stmt)) != SQLITE_DONE) {
- if (retval == SQLITE_ROW) {
+ while ((imp_sth->retval = sqlite3_step(imp_sth->stmt)) !=
SQLITE_DONE) {
+ if (imp_sth->retval == SQLITE_ROW) {
continue;
}
+ /* There are bug reports that say this should be
sqlite3_reset() */
sqlite3_finalize(imp_sth->stmt);
-- sqlite_error(sth, (imp_xxh_t*)imp_sth, retval,
(char*)sqlite3_errmsg(imp_dbh->db));
+- sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval,
(char*)sqlite3_errmsg(imp_dbh->db));
+ sqlite_error(sth, (imp_xxh_t*)imp_sth, retval, defererr);
+ free(defererr);
return -5;
@@ -83,9 +84,9 @@
/* warn("Finalize\n"); */
sqlite3_reset(imp_sth->stmt);
imp_sth->nrow = sqlite3_changes(imp_dbh->db);
-Index: DBD-SQLite-1.13/dbdimp.h
---- DBD-SQLite-1.13/dbdimp.h.orig 2006-09-08 06:50:50 +0200
-+++ DBD-SQLite-1.13/dbdimp.h 2007-06-26 21:06:20 +0200
+Index: DBD-SQLite-1.14/dbdimp.h
+--- DBD-SQLite-1.14/dbdimp.h.orig 2007-08-23 02:45:08 +0200
++++ DBD-SQLite-1.14/dbdimp.h 2007-09-20 09:42:28 +0200
@@ -4,7 +4,7 @@
#define _DBDIMP_H 1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.spec
============================================================================
$ cvs diff -u -r1.244 -r1.245 perl-dbi.spec
--- openpkg-src/perl-dbi/perl-dbi.spec 24 Aug 2007 15:20:32 -0000
1.244
+++ openpkg-src/perl-dbi/perl-dbi.spec 20 Sep 2007 07:59:57 -0000
1.245
@@ -34,7 +34,7 @@
%define V_dbd_anydata 0.09
%define V_dbd_csv 0.22
%define V_dbd_sprite 0.59
-%define V_dbd_sqlite 1.13
+%define V_dbd_sqlite 1.14
%define V_dbd_mysql 4.005
%define V_dbd_pgsql 1.49
%define V_dbd_oracle 1.19
@@ -54,7 +54,7 @@
Group: Perl
License: GPL/Artistic
Version: %{V_perl}
-Release: 20070824
+Release: 20070920
# package options
%option with_dbd_sqlite yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
