forked from pool/gtranslator
2a0b1e77bd
Resubmit... this patch has been accepted upstream, flagged as commit_now OBS-URL: https://build.opensuse.org/request/show/73685 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gtranslator?expand=0&rev=22
107 lines
4.8 KiB
Diff
107 lines
4.8 KiB
Diff
Index: gtranslator-2.90.5/configure.ac
|
|
===================================================================
|
|
--- gtranslator-2.90.5.orig/configure.ac
|
|
+++ gtranslator-2.90.5/configure.ac
|
|
@@ -84,12 +84,16 @@ GLIB_REQUIRED=2.28.0
|
|
LIBXML_REQUIRED=2.4.12
|
|
SOURCEVIEW_REQUIRED=3.0.0
|
|
GDL_REQUIRED=2.91.1
|
|
-GDA_REQUIRED=4.2.0
|
|
+GDA_REQUIRED=4.2.3
|
|
PEAS_REQUIRED=1.0.0
|
|
GDICT_OPTIONAL=0.11.0
|
|
GTKSPELL_OPTIONAL=100
|
|
JSON_GLIB_OPTIONAL=0.12.0
|
|
|
|
+AC_ARG_WITH(gda,
|
|
+ AS_HELP_STRING([--with-gda={4.0|5.0}],[Define which version of libgda to use]),,
|
|
+ with_gda=4.0)
|
|
+
|
|
PKG_CHECK_MODULES(GTRANSLATOR, [
|
|
libxml-2.0 >= $LIBXML_REQUIRED
|
|
gthread-2.0 >= $GTHREAD_REQUIRED
|
|
@@ -99,7 +103,7 @@ PKG_CHECK_MODULES(GTRANSLATOR, [
|
|
gtksourceview-3.0 >= $SOURCEVIEW_REQUIRED
|
|
gdl-3.0 >= $GDL_REQUIRED
|
|
gsettings-desktop-schemas
|
|
- libgda-4.0 >= $GDA_REQUIRED
|
|
+ libgda-$with_gda >= $GDA_REQUIRED
|
|
libpeas-1.0 >= $PEAS_REQUIRED
|
|
libpeas-gtk-1.0 >= $PEAS_REQUIRED
|
|
])
|
|
Index: gtranslator-2.90.5/src/translation-memory/gda/gtr-gda.c
|
|
===================================================================
|
|
--- gtranslator-2.90.5.orig/src/translation-memory/gda/gtr-gda.c
|
|
+++ gtranslator-2.90.5/src/translation-memory/gda/gtr-gda.c
|
|
@@ -775,38 +775,38 @@ gtr_gda_init (GtrGda * self)
|
|
GDA_CONNECTION_OPTIONS_NONE,
|
|
NULL);
|
|
|
|
- gda_execute_non_select_command (self->priv->db,
|
|
- "create table WORD ("
|
|
- "ID integer primary key autoincrement,"
|
|
- "VALUE text unique)",
|
|
- NULL);
|
|
-
|
|
- gda_execute_non_select_command (self->priv->db,
|
|
- "create table WORD_ORIG_LINK ("
|
|
- "WORD_ID integer,"
|
|
- "ORIG_ID integer,"
|
|
- "primary key (WORD_ID, ORIG_ID))",
|
|
- NULL);
|
|
-
|
|
- gda_execute_non_select_command (self->priv->db,
|
|
- "create table ORIG ("
|
|
- "ID integer primary key autoincrement,"
|
|
- "VALUE text unique,"
|
|
- "SENTENCE_SIZE integer)",
|
|
- NULL);
|
|
-
|
|
- gda_execute_non_select_command (self->priv->db,
|
|
- "create table TRANS ("
|
|
- "ID integer primary key autoincrement,"
|
|
- "ORIG_ID integer,"
|
|
- "VALUE text)",
|
|
- NULL);
|
|
-
|
|
- gda_execute_non_select_command (self->priv->db,
|
|
- "create index "
|
|
- "if not exists IDX_TRANS_ORIG_ID "
|
|
- "on TRANS (ORIG_ID)",
|
|
- NULL);
|
|
+ gda_connection_execute_non_select_command (self->priv->db,
|
|
+ "create table WORD ("
|
|
+ "ID integer primary key autoincrement,"
|
|
+ "VALUE text unique)",
|
|
+ NULL);
|
|
+
|
|
+ gda_connection_execute_non_select_command (self->priv->db,
|
|
+ "create table WORD_ORIG_LINK ("
|
|
+ "WORD_ID integer,"
|
|
+ "ORIG_ID integer,"
|
|
+ "primary key (WORD_ID, ORIG_ID))",
|
|
+ NULL);
|
|
+
|
|
+ gda_connection_execute_non_select_command (self->priv->db,
|
|
+ "create table ORIG ("
|
|
+ "ID integer primary key autoincrement,"
|
|
+ "VALUE text unique,"
|
|
+ "SENTENCE_SIZE integer)",
|
|
+ NULL);
|
|
+
|
|
+ gda_connection_execute_non_select_command (self->priv->db,
|
|
+ "create table TRANS ("
|
|
+ "ID integer primary key autoincrement,"
|
|
+ "ORIG_ID integer,"
|
|
+ "VALUE text)",
|
|
+ NULL);
|
|
+
|
|
+ gda_connection_execute_non_select_command (self->priv->db,
|
|
+ "create index "
|
|
+ "if not exists IDX_TRANS_ORIG_ID "
|
|
+ "on TRANS (ORIG_ID)",
|
|
+ NULL);
|
|
|
|
/* prepare statements */
|
|
|