openpkg-packages/perl-dbi/perl-dbi.patch

Index: DBD-SQLite-1.34_02/Makefile.PL
--- DBD-SQLite-1.34_02/Makefile.PL.orig	2010-12-10 06:09:02.000000000 +0100
+++ DBD-SQLite-1.34_02/Makefile.PL	2010-12-19 11:19:59.000000000 +0100
@@ -17,46 +17,9 @@
 	return @_;
 }
 
-# Are we upgrading from a critically out of date version?
-eval {
-	require DBD::SQLite;
-	if ( $DBD::SQLite::VERSION < 1.0 ) {
-		print <<EOT;
-
-**** WARNING **** WARNING **** WARNING **** WARNING **** WARNING ****
-
-Your version of DBD::SQLite currently installed ($DBD::SQLite::VERSION) uses
-the old sqlite database format. This version of DBD::SQLite will *NOT*
-open these files, and installing this module may cause problems on your
-system. If this is a live environment you should upgrade with caution.
-
-To upgrade a database, download and install both sqlite 2.x and 3.x from
-http://www.sqlite.org/ and issue:
-
-  sqlite OLD.DB .dump | sqlite3 NEW.DB
-
-DBD::SQLite will NOT automatically upgrade a database for you, and using
-this version against an old SQLite database WILL lead to database
-corruption.
-
-EOT
-		if ( prompt("Continue?", "N") !~ /^y/i ) {
-			print "Exiting\n";
-			exit(-1);
-		}
-	}
-};
-
 # Because DBI generates a postamble at configure-time, we need
 # the required version of DBI very early.
 my $DBI_required = 1.57;
-eval {
-	require DBI;
-};
-if ( $@ or DBI->VERSION < $DBI_required ) {
-	print "DBI 1.57 is required to configure this module; please install it or upgrade your CPAN/CPANPLUS shell.\n";
-	exit(0);
-}
 
 # See if we have a C compiler
 # The following code is adapted from Module::Install::Can
@@ -194,17 +157,17 @@
 # Prepare Compiler Options
 
 my @CC_LIBS = ();
-if ( $sqlite_lib ) {
-	push @CC_LIBS, "-L$sqlite_lib";
-}
-unless ( $sqlite_local ) {
-	push @CC_LIBS, '-lsqlite3';
-}
+my $libs = `@l_prefix@/bin/pkg-config sqlite3 --libs`;
+$libs =~ s/\r?\n$//s;
+push @CC_LIBS, $libs;
 
+my $inc = `@l_prefix@/bin/pkg-config sqlite3 --cflags-only-I`;
+$inc =~ s/\r?\n$//s;
 my @CC_INC = (
 	'-I.',
 	'-I$(DBI_INSTARCH_DIR)',
 );
+unshift @INC, $inc;
 if ( $sqlite_inc ) {
 	push @CC_INC, "-I$sqlite_inc";
 }
Index: DBD-SQLite-1.34_02/SQLiteXS.h
--- DBD-SQLite-1.34_02/SQLiteXS.h.orig	2010-12-10 06:09:02.000000000 +0100
+++ DBD-SQLite-1.34_02/SQLiteXS.h	2010-12-19 11:19:59.000000000 +0100
@@ -19,6 +19,5 @@
 #include <dbd_xsh.h>
 
 #include "sqlite3.h"
-#include "fts3_tokenizer.h"
 
 #endif
Index: DBD-SQLite-1.34_02/dbdimp.c
--- DBD-SQLite-1.34_02/dbdimp.c.orig	2010-12-10 06:09:02.000000000 +0100
+++ DBD-SQLite-1.34_02/dbdimp.c	2010-12-19 11:19:59.000000000 +0100
@@ -2019,6 +2019,7 @@
 #endif
 }
 
+#if 0
 typedef struct perl_tokenizer {
     sqlite3_tokenizer base;
     SV *coderef;                 /* the perl tokenizer is a coderef that takes
@@ -2273,12 +2274,14 @@
     perl_tokenizer_Close,
     perl_tokenizer_Next
 };
+#endif
 
 /*
 ** Register the perl tokenizer with FTS3
 */
 int sqlite_db_register_fts3_perl_tokenizer(pTHX_ SV *dbh)
 {
+#if 0
     D_imp_dbh(dbh);
 
     int rc;
@@ -2301,6 +2304,8 @@
     sqlite3_step(pStmt);
 
     return sqlite3_finalize(pStmt);
+#endif
+  return 0;
 }
 
 /* end */
Index: DBD-Sybase-1.14/dbdimp.c
--- DBD-Sybase-1.14/dbdimp.c.orig	2010-11-06 14:48:24.000000000 +0100
+++ DBD-Sybase-1.14/dbdimp.c	2010-12-19 11:19:59.000000000 +0100
@@ -818,22 +818,22 @@
 #endif
 #if defined(CS_VERSION_150)
 	if (cs_ver == CS_VERSION_150)
-		BLK_VERSION = BLK_VERSION_150;
+		BLK_VERSION = CS_VERSION_150;
 #endif
 #if defined(CS_VERSION_125)
 	if (cs_ver == CS_VERSION_125)
-		BLK_VERSION = BLK_VERSION_125;
+		BLK_VERSION = CS_VERSION_125;
 #endif
 #if defined(CS_VERSION_120)
 	if (cs_ver == CS_VERSION_120)
-		BLK_VERSION = BLK_VERSION_120;
+		BLK_VERSION = CS_VERSION_120;
 #endif
 #if defined(CS_VERSION_110)
 	if (cs_ver == CS_VERSION_110)
-		BLK_VERSION = BLK_VERSION_110;
+		BLK_VERSION = CS_VERSION_110;
 #endif
 	if (cs_ver == CS_VERSION_100)
-		BLK_VERSION = BLK_VERSION_100;
+		BLK_VERSION = CS_VERSION_100;
 
 #if USE_CSLIB_CB
 	if (cs_config(context, CS_SET, CS_MESSAGE_CB,
Index: DBD-mysql-4.020/dbdimp.h
--- DBD-mysql-4.020/dbdimp.h.orig	2010-07-10 16:53:52.000000000 +0200
+++ DBD-mysql-4.020/dbdimp.h	2010-12-19 11:19:59.000000000 +0100
@@ -19,6 +19,7 @@
  *  Header files we use
  */
 #include <DBIXS.h>  /* installed by the DBI module                        */
+#include <my_global.h>
 #include <mysql.h>  /* Comes with MySQL-devel */
 #include <mysqld_error.h>  /* Comes MySQL */
 
Index: SQL-Translator-0.11007/Makefile.PL
--- SQL-Translator-0.11007/Makefile.PL.orig	2010-11-30 18:26:37.000000000 +0100
+++ SQL-Translator-0.11007/Makefile.PL	2010-12-19 11:19:59.000000000 +0100
@@ -14,7 +14,7 @@
     'Carp::Clan'               => 0,
     'IO::Dir'                  => 0,
     'IO::Scalar'               => 2.110,
-    'Parse::RecDescent'        => 1.962002,
+    'Parse::RecDescent'        => 1.962,
     'Pod::Usage'               => 0,
     'Class::Accessor::Fast'    => 0,
     'DBI'                      => 0,
@@ -33,13 +33,6 @@
     'Text::RecordParser'       => 0.02,
     'XML::LibXML'              => 1.69,
   },
-  test_requires => {
-    'YAML'                     => 0.66,
-    'File::Basename'           => 0,
-    'Test::More'               => 0.6,
-    'Test::Differences'        => 0,
-    'Test::Exception'          => 0,
-  },
 };
 
 perl_version '5.005';