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

Accepting request 105063 from GNOME:Apps

Browse Source 
Pushing some G:A bits

OBS-URL: https://build.opensuse.org/request/show/105063
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtranslator?expand=0&rev=21
This commit is contained in:
Stephan Kulow 2012-02-16 11:22:20 +00:00 committed by Git OBS Bridge
commit 577c217d5e
6 changed files with 24 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtranslator-2.90.7.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:55845ad665f5e55265dd017d1c96e41a72c4c5691eb218ba9db6985b66afa556
size 5194082

3
gtranslator-2.90.8.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:89f6be55d901d62e09065ed92f471eb569834eaa7babc8a48b2255c26a105037
size 4559228

40
gtranslator-gtkspell3.patch
View File

@ -1,40 +0,0 @@
diff -u -r gtranslator-2.90.5-orig/configure.ac gtranslator-2.90.5/configure.ac
--- gtranslator-2.90.5-orig/configure.ac 2011-08-28 18:59:30.000000000 +0400
+++ gtranslator-2.90.5/configure.ac 2011-08-28 19:02:23.000000000 +0400
@@ -87,7 +87,7 @@
GDA_REQUIRED=4.2.3
PEAS_REQUIRED=1.0.0
GDICT_OPTIONAL=0.11.0
-GTKSPELL_OPTIONAL=2.0.16
+GTKSPELL_OPTIONAL=3.0.0
JSON_GLIB_OPTIONAL=0.12.0
AC_ARG_WITH(gda,
@@ -167,7 +167,7 @@
fi
dnl -------------------------------------------------------------------
-dnl Check for gtkspell >= 2.0 and use it if found
+dnl Check for gtkspell >= 3.0 and use it if found
dnl -------------------------------------------------------------------
have_gtkspell=no
AC_ARG_WITH(gtkspell3,
@@ -177,7 +177,7 @@
if test x"$with_gtkspell" != "xno"
then
PKG_CHECK_MODULES([GTKSPELL], [
- gtkspell3-2.0 >= $GTKSPELL_OPTIONAL
+ gtkspell-3.0 >= $GTKSPELL_OPTIONAL
], have_gtkspell=yes, have_gtkspell=no)
if test x"$have_gtkspell" = "xyes"
@@ -335,7 +335,7 @@
echo "Building spell support: ................................YES"
else
echo "Building spell support: ................................NO"
- echo " Requires gtkspell >= $GTKSPELL_OPTIONAL"
+ echo " Requires gtkspell3 >= $GTKSPELL_OPTIONAL"
fi
echo "
Только в gtranslator-2.90.5: configure.ac~

106
gtranslator-libgda-5.0.patch
View File

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

16
gtranslator.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue Feb 7 18:45:52 UTC 2012 - zaitor@opensuse.org
- Update to version 2.90.8:
+ Make it build with latest GTK+.
+ Add support for gda 5.
+ Misc bugfixes.
+ Updated translations.
- Drop patches fixed upstream:
+ gtranslator-libgda-5.0.patch
+ gtranslator-gtkspell3.patch
- Remove gnome-common BuildRequires and gnome-autogen.sh call: we
don't carry any patches touching the build system anymore.
-------------------------------------------------------------------
Wed Oct 19 16:43:06 UTC 2011 - zaitor@opensuse.org
@ -5,7 +19,7 @@ Wed Oct 19 16:43:06 UTC 2011 - zaitor@opensuse.org
+ Relicense some files as GPLv3+.
+ Don't normalize translations stored in the translation memory.
+ Update translation.
-------------------------------------------------------------------
Wed Oct 12 12:23:12 UTC 2011 - vuntz@opensuse.org

25
gtranslator.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gtranslator
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,23 +15,15 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: gtranslator
Version: 2.90.7
Release: 1
License: GPL-3.0+
Version: 2.90.8
Release: 0
Summary: A GNOME po file editor with many bells and whistles
Url: http://gtranslator.sourceforge.net
License: GPL-3.0+
Group: Development/Tools/Other
Source: http://download.gnome.org/sources/gtranslator/2.90/%{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
# PATCH-FIX-UPSTREAM gtranslator-gtkspell3.patch bgo#660709 gankov@opensuse.org -- Add support for gtkspell3
Patch1: gtranslator-gtkspell3.patch
Url: http://gtranslator.sourceforge.net
Source: http://download.gnome.org/sources/gtranslator/2.90/%{name}-%{version}.tar.xz
BuildRequires: fdupes
# Needed by patch0
BuildRequires: gnome-common
BuildRequires: gnome-doc-utils-devel
BuildRequires: intltool
# Not using a pkgconfig() BuildRequires, to allow building against libgda 4.0 and 5.0
@ -62,7 +54,6 @@ It features many useful function which ease the work of translators of po
files imminently.
%package devel
License: GPL-3.0+
Summary: A GNOME po file editor with many bells and whistles
Group: Development/Tools/Other
@ -74,13 +65,9 @@ files imminently.
%lang_package
%prep
%setup -q
%patch0 -p1
%patch1 -p1
translation-update-upstream
%build
# Required by patch0 and patch1
NOCONFIGURE=1 gnome-autogen.sh
%configure \
--disable-static \
--disable-scrollkeeper \