pool/gtranslator
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 73685 from home:dimstar:branches:GNOME:Apps

Browse Source 
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
This commit is contained in:
Vincent Untz 2011-07-01 12:16:04 +00:00 committed by Git OBS Bridge
parent 11e93123ff
commit 2a0b1e77bd
3 changed files with 129 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
gtranslator-libgda-5.0.patch Normal file
View File

@ -0,0 +1,106 @@
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 */

13
gtranslator.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Jun 15 11:15:18 UTC 2011 - dimstar@opensuse.org
- Replace pkgconfig(libgda-4.0) BuildRequires with libgda-devel:
this allows us to use libgda-4.0 and libgda-5.0 without knowledge
of what is in the repository.
- Pass --with-gda=4.0|5.0 to configure (4.0 and 5.0 is extracted
from the rpm database, based on what libgda-devel has been
installed)
- Add gtranslator-libgda-5.0.patch: Add support for libgda-5.0 with
a new --with-gda parameter.
- Add gnome-common BuildRequires plus call to gnome-autogen.sh.
-------------------------------------------------------------------
Wed Jun 15 09:56:24 CEST 2011 - vuntz@opensuse.org

12
gtranslator.spec
View File

@ -25,9 +25,14 @@ Summary: A GNOME po file editor with many bells and whistles
Url: http://gtranslator.sourceforge.net
Group: Development/Tools/Other
Source: http://www.kabalak.net/gtranslator/download/releases/%{version}/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM gtranslator-libgda-5.0.patch bgo#652639 dimstar@opensuse.org -- Add support for libgda 5.0
Patch0: gtranslator-libgda-5.0.patch
BuildRequires: fdupes
# Require by patch0
BuildRequires: gnome-common
BuildRequires: gnome-doc-utils-devel
BuildRequires: intltool
BuildRequires: libgda-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(gdict-1.0)
@ -39,7 +44,6 @@ BuildRequires: pkgconfig(gtksourceview-3.0)
BuildRequires: pkgconfig(gtkspell-2.0)
BuildRequires: pkgconfig(iso-codes)
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libgda-4.0)
BuildRequires: pkgconfig(libpeas-1.0)
BuildRequires: pkgconfig(libpeas-gtk-1.0)
BuildRequires: pkgconfig(libxml-2.0)
@ -66,14 +70,18 @@ files imminently.
%lang_package
%prep
%setup -q
%patch0 -p1
translation-update-upstream
%build
# Required by patch0
NOCONFIGURE=1 gnome-autogen.sh
%configure \
--disable-static \
--disable-scrollkeeper \
--with-gtkspell \
--with-dictionary
--with-dictionary \
--with-gda=$(rpm -q --provides $(rpm -q --whatprovides libgda-devel) | grep "pkgconfig(libgda-[45].0)" | cut -b 18-20)
%{__make} %{?_smp_mflags}
%install