| 1 |
pacho 11/01/26 08:58:52 |
| 2 |
|
| 3 |
Added: cdcollect-0.6.0-sqlite.patch |
| 4 |
Log: |
| 5 |
Apply fedora patch to work with mono-2.8 (bug #346135). |
| 6 |
|
| 7 |
(Portage version: 2.1.9.35/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-misc/cdcollect/files/cdcollect-0.6.0-sqlite.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/cdcollect/files/cdcollect-0.6.0-sqlite.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/cdcollect/files/cdcollect-0.6.0-sqlite.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: cdcollect-0.6.0-sqlite.patch |
| 16 |
=================================================================== |
| 17 |
diff -up cdcollect-0.6.0/src/CDIcon.cs.sqlite cdcollect-0.6.0/src/CDIcon.cs |
| 18 |
--- cdcollect-0.6.0/src/CDIcon.cs.sqlite 2006-11-24 18:12:13.000000000 +0100 |
| 19 |
+++ cdcollect-0.6.0/src/CDIcon.cs 2011-01-01 12:15:13.000000000 +0100 |
| 20 |
@@ -23,7 +23,7 @@ using System.IO; |
| 21 |
using System.Xml; |
| 22 |
using Gtk; |
| 23 |
using Gdk; |
| 24 |
-using Mono.Data.SqliteClient; |
| 25 |
+using Mono.Data.Sqlite; |
| 26 |
using Mono.Unix; |
| 27 |
|
| 28 |
|
| 29 |
diff -up cdcollect-0.6.0/src/CDItem.cs.sqlite cdcollect-0.6.0/src/CDItem.cs |
| 30 |
--- cdcollect-0.6.0/src/CDItem.cs.sqlite 2006-11-24 18:12:13.000000000 +0100 |
| 31 |
+++ cdcollect-0.6.0/src/CDItem.cs 2011-01-01 12:15:13.000000000 +0100 |
| 32 |
@@ -24,7 +24,7 @@ using System.Xml; |
| 33 |
using System.Text.RegularExpressions; |
| 34 |
using Gtk; |
| 35 |
using Gdk; |
| 36 |
-using Mono.Data.SqliteClient; |
| 37 |
+using Mono.Data.Sqlite; |
| 38 |
using Mono.Unix; |
| 39 |
|
| 40 |
public enum CDItemFind : int { |
| 41 |
diff -up cdcollect-0.6.0/src/DBsql.cs.sqlite cdcollect-0.6.0/src/DBsql.cs |
| 42 |
--- cdcollect-0.6.0/src/DBsql.cs.sqlite 2006-11-24 18:12:13.000000000 +0100 |
| 43 |
+++ cdcollect-0.6.0/src/DBsql.cs 2011-01-01 12:26:53.000000000 +0100 |
| 44 |
@@ -27,7 +27,7 @@ using System.Text; |
| 45 |
using System.Threading; |
| 46 |
using System.Text.RegularExpressions; |
| 47 |
|
| 48 |
-using Mono.Data.SqliteClient; |
| 49 |
+using Mono.Data.Sqlite; |
| 50 |
using Mono.Unix; |
| 51 |
|
| 52 |
|
| 53 |
@@ -958,10 +958,10 @@ public class CDDatabaseSql |
| 54 |
private int sql_command_id (string comm) |
| 55 |
{ |
| 56 |
IDbCommand command = sqlite_connection.CreateCommand (); |
| 57 |
- command.CommandText = comm; |
| 58 |
- command.ExecuteScalar (); |
| 59 |
+ command.CommandText = comm + "; SELECT last_insert_rowid();"; |
| 60 |
+ int rowid = (int)command.ExecuteScalar (); |
| 61 |
command.Dispose (); |
| 62 |
- return (((SqliteConnection)sqlite_connection).LastInsertRowId); |
| 63 |
+ return (rowid); |
| 64 |
} |
| 65 |
|
| 66 |
private void sql_command (string comm) |
| 67 |
diff -up cdcollect-0.6.0/src/Makefile.am.sqlite cdcollect-0.6.0/src/Makefile.am |
| 68 |
--- cdcollect-0.6.0/src/Makefile.am.sqlite 2011-01-01 12:15:13.000000000 +0100 |
| 69 |
+++ cdcollect-0.6.0/src/Makefile.am 2011-01-01 12:15:13.000000000 +0100 |
| 70 |
@@ -42,7 +42,7 @@ Defines.cs: Defines.cs.in |
| 71 |
|
| 72 |
ASSEMBLIES = \ |
| 73 |
/r:System.Data \ |
| 74 |
- /r:Mono.Data.SqliteClient \ |
| 75 |
+ /r:Mono.Data.Sqlite \ |
| 76 |
/r:Mono.Posix \ |
| 77 |
-pkg:gtk-sharp-2.0 \ |
| 78 |
-pkg:glade-sharp-2.0 \ |
| 79 |
diff -up cdcollect-0.6.0/src/Makefile.in.sqlite cdcollect-0.6.0/src/Makefile.in |
| 80 |
--- cdcollect-0.6.0/src/Makefile.in.sqlite 2011-01-01 12:15:13.000000000 +0100 |
| 81 |
+++ cdcollect-0.6.0/src/Makefile.in 2011-01-01 12:15:13.000000000 +0100 |
| 82 |
@@ -254,7 +254,7 @@ GENERATED_CSFILES = \ |
| 83 |
|
| 84 |
ASSEMBLIES = \ |
| 85 |
/r:System.Data \ |
| 86 |
- /r:Mono.Data.SqliteClient \ |
| 87 |
+ /r:Mono.Data.Sqlite \ |
| 88 |
/r:Mono.Posix \ |
| 89 |
-pkg:gtk-sharp-2.0 \ |
| 90 |
-pkg:glade-sharp-2.0 \ |
Archives