r32328 - in /packages/unstable/gtranslator/debian: changelog control.in patches/libgda-5.0.patch patches/series rules
jordi at users.alioth.debian.org
jordi at users.alioth.debian.org
Thu Jan 5 15:26:28 UTC 2012
Author: jordi
Date: Thu Jan 5 15:26:27 2012
New Revision: 32328
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32328
Log:
* libgda-5.0.patch: patch from Git to add support for libgda-5.0.
* Pass --with-gda=5.0 to configure, and bump Build-Deps to libgda5-dev.
Added:
packages/unstable/gtranslator/debian/patches/libgda-5.0.patch
Modified:
packages/unstable/gtranslator/debian/changelog
packages/unstable/gtranslator/debian/control.in
packages/unstable/gtranslator/debian/patches/series
packages/unstable/gtranslator/debian/rules
Modified: packages/unstable/gtranslator/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/changelog?rev=32328&op=diff
==============================================================================
--- packages/unstable/gtranslator/debian/changelog [utf-8] (original)
+++ packages/unstable/gtranslator/debian/changelog [utf-8] Thu Jan 5 15:26:27 2012
@@ -1,3 +1,10 @@
+gtranslator (2.90.7-3) unstable; urgency=low
+
+ * libgda-5.0.patch: patch from Git to add support for libgda-5.0.
+ * Pass --with-gda=5.0 to configure, and bump Build-Deps to libgda5-dev.
+
+ -- Jordi Mallach <jordi at debian.org> Thu, 05 Jan 2012 16:26:00 +0100
+
gtranslator (2.90.7-2) unstable; urgency=low
* Build-Depend on libgtkspell-3-dev.
Modified: packages/unstable/gtranslator/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/control.in?rev=32328&op=diff
==============================================================================
--- packages/unstable/gtranslator/debian/control.in [utf-8] (original)
+++ packages/unstable/gtranslator/debian/control.in [utf-8] Thu Jan 5 15:26:27 2012
@@ -15,7 +15,7 @@
libgirepository1.0-dev (>= 0.9.3),
intltool (>= 0.40.0),
iso-codes (>= 0.35),
- libgda-4.0-dev (>= 4.2.0),
+ libgda-5.0-dev,
libgdl-3-dev (>= 2.91.1),
libgdict-1.0-dev (>= 3.0.1-2~),
libglib2.0-dev (>= 2.28.0),
Added: packages/unstable/gtranslator/debian/patches/libgda-5.0.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/patches/libgda-5.0.patch?rev=32328&op=file
==============================================================================
--- packages/unstable/gtranslator/debian/patches/libgda-5.0.patch (added)
+++ packages/unstable/gtranslator/debian/patches/libgda-5.0.patch [utf-8] Thu Jan 5 15:26:27 2012
@@ -1,0 +1,119 @@
+From 23516385bd647ab46e9ee0d1653262682ea68049 Mon Sep 17 00:00:00 2001
+From: Jordi Mallach <jordi at sindominio.net>
+Date: Thu, 05 Jan 2012 15:04:25 +0000
+Subject: Add support for libgda-5.0 (Dominique Leuenberger).
+
+Replace uses of deprecated gda_execute_non_select_command with
+gda_connection_execute_non_select_command. Bump LIBGDA requirement
+to 4.2.3.
+
+Add new configure option --with-gda=4.0|5.0, defaulting to 4.0.
+---
+diff --git a/configure.ac b/configure.ac
+index 56a8da3..c027a9f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,12 +81,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=2.99.99
+ 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
+@@ -96,7 +100,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
+ ])
+diff --git a/src/translation-memory/gda/gtr-gda.c b/src/translation-memory/gda/gtr-gda.c
+index 009662f..9b5ec31 100644
+--- a/src/translation-memory/gda/gtr-gda.c
++++ b/src/translation-memory/gda/gtr-gda.c
+@@ -764,38 +764,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 */
+
+--
+cgit v0.9.0.2
Modified: packages/unstable/gtranslator/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/patches/series?rev=32328&op=diff
==============================================================================
--- packages/unstable/gtranslator/debian/patches/series [utf-8] (original)
+++ packages/unstable/gtranslator/debian/patches/series [utf-8] Thu Jan 5 15:26:27 2012
@@ -1,1 +1,2 @@
fix_gtkspell_check.patch
+libgda-5.0.patch
Modified: packages/unstable/gtranslator/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/rules?rev=32328&op=diff
==============================================================================
--- packages/unstable/gtranslator/debian/rules [utf-8] (original)
+++ packages/unstable/gtranslator/debian/rules [utf-8] Thu Jan 5 15:26:27 2012
@@ -8,7 +8,10 @@
LDFLAGS += -Wl,-O1 -Wl,--as-needed
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-debug=no
+DEB_CONFIGURE_EXTRA_FLAGS += \
+ --with-gda=5.0 \
+ --disable-scrollkeeper \
+ --enable-debug=no
DEB_DH_MAKESHLIBS_ARGS_ALL += -Xusr/lib/gtranslator
More information about the pkg-gnome-commits
mailing list