OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 05-Apr-2009 09:21:52
Branch: HEAD Handle: 2009040508215100
Modified files:
openpkg-src/perl-dbi perl-dbi.patch perl-dbi.spec
Log:
upgrade to a newer DBD::SQLite version
Summary:
Revision Changes Path
1.51 +68 -53 openpkg-src/perl-dbi/perl-dbi.patch
1.333 +6 -4 openpkg-src/perl-dbi/perl-dbi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.patch
============================================================================
$ cvs diff -u -r1.50 -r1.51 perl-dbi.patch
--- openpkg-src/perl-dbi/perl-dbi.patch 16 Feb 2009 18:43:22 -0000
1.50
+++ openpkg-src/perl-dbi/perl-dbi.patch 5 Apr 2009 07:21:51 -0000
1.51
@@ -1,14 +1,15 @@
-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 2009-02-10 08:56:57 +0100
-@@ -10,34 +10,6 @@
+Index: DBD-SQLite-1.19_09/Makefile.PL
+--- DBD-SQLite-1.19_09/Makefile.PL.orig 2009-04-05 05:09:55 +0200
++++ DBD-SQLite-1.19_09/Makefile.PL 2009-04-05 09:11:40 +0200
+@@ -16,36 +16,6 @@
+ return @_;
}
- use Config;
- use strict;
+
+-# Are we upgrading from a critically out of date version?
-eval {
-- require DBD::SQLite;
-- if ($DBD::SQLite::VERSION < 1.0) {
-- print <<EOT;
+- require DBD::SQLite;
+- if ( $DBD::SQLite::VERSION < 1.0 ) {
+- print <<EOT;
-
-**** WARNING **** WARNING **** WARNING **** WARNING **** WARNING ****
-
@@ -27,55 +28,69 @@
-corruption.
-
-EOT
-- if (prompt("Continue?", "N") !~ /^y/i) {
-- print "Exiting\n";
-- exit -1;
-- }
-- }
+- if ( prompt("Continue?", "N") !~ /^y/i ) {
+- print "Exiting\n";
+- exit(-1);
+- }
+- }
-};
-
+-
# 2005/6/19, by rj...@blackperl.com
#
-@@ -111,18 +83,19 @@
-
- my $nlid = $DBI::VERSION > 1.42 ? '' : '-Dno_last_insert_id';
-
--my $libs = '';
--$libs .= "-L$sqlite_lib " if ($sqlite_lib);
--$libs .= "-lsqlite3 " unless ($force_local);
-+my $inc = `...@l_prefix@/bin/pkg-config sqlite3 --cflags-only-I`;
-+$inc =~ s/\r?\n$//s;
+ # Determine if we are going to use the provided SQLite code, or an already-
+@@ -143,24 +113,20 @@
+ # Prepare Compiler Options
+
+ my @CC_LIBS = ();
+-if ( $sqlite_lib ) {
+- push @CC_LIBS, "-L$sqlite_lib";
+-}
+-unless ( $force_local ) {
+- push @CC_LIBS, '-lsqlite3';
+-}
+my $libs = `...@l_prefix@/bin/pkg-config sqlite3 --libs`;
-+$libs =~ s/\r?\n$//s;
-
- WriteMakefile(
- 'NAME' => 'DBD::SQLite',
- 'VERSION_FROM' => 'lib/DBD/SQLite.pm', # finds $VERSION
- 'PREREQ_PM' => {DBI => 1.21}, # e.g., Module::Name => 1.1
- 'OBJECT' => ($force_local) ? '$(O_FILES)' : 'SQLite.o dbdimp.o',
-- 'INC' => '-I. -I$(DBI_INSTARCH_DIR)' .
-+ 'INC' => $inc . ' -I. -I$(DBI_INSTARCH_DIR)' .
- (($sqlite_inc) ? " -I$sqlite_inc" : ''),
-- $libs ? ('LIBS' => $libs) : (),
-+ 'LIBS' => [ $libs ],
- 'OPTIMIZE' => "-O2",
- 'DEFINE' => "-DSQLITE_CORE -DSQLITE_ENABLE_FTS2 -DNDEBUG=1
-DSQLITE_PTR_SZ=$Config{ptrsize}" .
- ( ($Config{d_usleep} ||
-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 2009-02-10 08:56:57 +0100
-@@ -4,7 +4,7 @@
- #define _DBDIMP_H 1
-
- #include "SQLiteXS.h"
--#include "sqliteInt.h"
-+#include "sqlite3.h"
++$libs =~ s/\r?\n$//s;
++push @CC_LIBS, $libs;
- /* 30 second timeout by default */
- #define SQL_TIMEOUT 30000
++my $inc = `...@l_prefix@/bin/pkg-config sqlite3 --cflags-only-I`;
++$inc =~ s/\r?\n$//s;
+ my @CC_INC = (
+ '-I.',
+- '-I$(DBI_INSTARCH_DIR)',
++ '-I$(DBI_INSTARCH_DIR)'
+ );
+-if ( $sqlite_inc ) {
+- push @INC, "-I$sqlite_inc";
+-}
++unshift @INC, $inc;
+
+ my @CC_DEFINE = (
+ '-DSQLITE_CORE',
+- '-DSQLITE_ENABLE_FTS3',
+ '-DNDEBUG=1',
+ "-DSQLITE_PTR_SZ=$Config{ptrsize}"
+ );
+@@ -192,8 +158,6 @@
+ VERSION_FROM => 'lib/DBD/SQLite.pm',
+ PREREQ_PM => {
+ 'DBI' => '1.43',
+- 'Test::More' => '0.42',
+- 'Test::NoWarnings' => '0.081',
+ },
+ OPTIONAL( '6.48',
+ MIN_PERL_VERSION => '5.006',
+@@ -212,8 +176,6 @@
+ 'DBI' => '1.43',
+ },
+ build_requires => {
+- 'Test::More' => '0.42',
+- 'Test::NoWarnings' => '0.081',
+ },
+ resources => {
+ license => 'http://dev.perl.org/licenses/',
Index: DBD-Sybase-1.09/dbdimp.c
--- DBD-Sybase-1.09/dbdimp.c.orig 2008-08-31 14:08:17 +0200
-+++ DBD-Sybase-1.09/dbdimp.c 2009-02-10 08:56:57 +0100
++++ DBD-Sybase-1.09/dbdimp.c 2009-04-05 09:10:54 +0200
@@ -774,22 +774,22 @@
#if defined(CS_VERSION_150)
@@ -106,7 +121,7 @@
if (cs_config(context, CS_SET, CS_MESSAGE_CB,
Index: DBD-cego/Makefile.PL
--- DBD-cego/Makefile.PL.orig 2007-06-25 20:38:07 +0200
-+++ DBD-cego/Makefile.PL 2009-02-10 08:56:57 +0100
++++ DBD-cego/Makefile.PL 2009-04-05 09:10:54 +0200
@@ -43,7 +43,7 @@
'VERSION_FROM' => 'Cego.pm',
'PREREQ_PM' => {DBI => 1.03},
@@ -118,7 +133,7 @@
. $opt->{'prefix'} . "/lib/libBase.a",
Index: DBD-mysql-4.010/dbdimp.h
--- DBD-mysql-4.010/dbdimp.h.orig 2008-04-29 01:36:17 +0200
-+++ DBD-mysql-4.010/dbdimp.h 2009-02-10 08:56:57 +0100
++++ DBD-mysql-4.010/dbdimp.h 2009-04-05 09:10:54 +0200
@@ -19,6 +19,7 @@
* Header files we use
*/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.spec
============================================================================
$ cvs diff -u -r1.332 -r1.333 perl-dbi.spec
--- openpkg-src/perl-dbi/perl-dbi.spec 4 Apr 2009 07:32:07 -0000
1.332
+++ openpkg-src/perl-dbi/perl-dbi.spec 5 Apr 2009 07:21:51 -0000
1.333
@@ -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.14
+%define V_dbd_sqlite 1.19_09
%define V_dbd_mysql 4.010
%define V_dbd_pgsql 2.12.0
%define V_dbd_oracle 1.22
@@ -54,7 +54,7 @@
Group: Perl
License: GPL/Artistic
Version: %{V_perl}
-Release: 20090404
+Release: 20090405
# package options
%option with_sqlite yes
@@ -114,7 +114,7 @@
Source8:
http://www.cpan.org/modules/by-module/DBD/DBD-AnyData-%{V_dbd_anydata}.tar.gz
Source9:
http://www.cpan.org/modules/by-module/DBD/DBD-CSV-%{V_dbd_csv}.tar.gz
Source10:
http://www.cpan.org/modules/by-module/DBD/DBD-Sprite-%{V_dbd_sprite}.tar.gz
-Source11:
http://www.cpan.org/modules/by-module/DBD/DBD-SQLite-%{V_dbd_sqlite}.tar.gz
+Source11:
http://www.cpan.org/authors/id/A/AD/ADAMK/DBD-SQLite-%{V_dbd_sqlite}.tar.gz
Source12:
http://www.cpan.org/modules/by-module/DBD/DBD-mysql-%{V_dbd_mysql}.tar.gz
Source13:
http://www.cpan.org/modules/by-module/DBD/DBD-Pg-%{V_dbd_pgsql}.tar.gz
Source14:
http://www.cpan.org/modules/by-module/DBD/DBD-Oracle-%{V_dbd_oracle}.tar.gz
@@ -264,7 +264,7 @@
}
prog perl-dbi:DBD-SQLite = {
version = %{V_dbd_sqlite}
- url = http://www.cpan.org/modules/by-module/DBD/
+ url = http://www.cpan.org/authors/id/A/AD/ADAMK/
regex = DBD-SQLite-(__VER__)\.tar\.gz
}
prog perl-dbi:DBD-PgLite = {
@@ -341,6 +341,8 @@
# perform regular build and install
%{l_prefix}/bin/perl-openpkg configure build install
) || exit $?
+
+ # build DBD::PgLite
%{l_prefix}/bin/perl-openpkg -d DBD-PgLite-%{V_dbd_pglite} configure
build install
%endif
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
