From 95d2222b90c4f54a1ff6a3b508a630b89a2f0082fae3235ba10c7063baa7891d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 16 Mar 2015 11:51:43 +0000 Subject: [PATCH] Accepting request 290942 from home:dimstar:branches:GNOME:Apps Update to 2.91.7 OBS-URL: https://build.opensuse.org/request/show/290942 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gtranslator?expand=0&rev=56 --- gtranslator-2.91.6.tar.xz | 3 -- gtranslator-2.91.7.tar.xz | 3 ++ gtranslator-gtkspell3.patch | 98 ------------------------------------- gtranslator.changes | 10 ++++ gtranslator.spec | 14 ++---- 5 files changed, 17 insertions(+), 111 deletions(-) delete mode 100644 gtranslator-2.91.6.tar.xz create mode 100644 gtranslator-2.91.7.tar.xz delete mode 100644 gtranslator-gtkspell3.patch diff --git a/gtranslator-2.91.6.tar.xz b/gtranslator-2.91.6.tar.xz deleted file mode 100644 index 1ba60b3..0000000 --- a/gtranslator-2.91.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1fd4b17b1f32cc7223a31d34e34f95b20acc7b5a23768351a34ff0b7a4bcdf6 -size 2235796 diff --git a/gtranslator-2.91.7.tar.xz b/gtranslator-2.91.7.tar.xz new file mode 100644 index 0000000..2b5f445 --- /dev/null +++ b/gtranslator-2.91.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b25b45b33e4aa856953b4a5da1d98bd51a343ddb479aeae3934bfe0c3651f9d +size 2835836 diff --git a/gtranslator-gtkspell3.patch b/gtranslator-gtkspell3.patch deleted file mode 100644 index 723a93f..0000000 --- a/gtranslator-gtkspell3.patch +++ /dev/null @@ -1,98 +0,0 @@ -From cf33d8761dbfc7f6c8b27c3146efcad81f8fbde9 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Sun, 13 Jan 2013 13:19:40 +0000 -Subject: Port to gtkspell3 - -https://bugzilla.gnome.org/show_bug.cgi?id=691655 ---- -diff --git a/configure.ac b/configure.ac -index c1ba5b6..3fe9c46 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -84,7 +84,7 @@ GDL_REQUIRED=3.6.0 - GDA_REQUIRED=4.2.3 - PEAS_REQUIRED=1.2.0 - GDICT_OPTIONAL=0.11.0 --GTKSPELL_OPTIONAL=2.99.99 -+GTKSPELL_OPTIONAL=3.0.0 - JSON_GLIB_OPTIONAL=0.12.0 - - AC_ARG_WITH(gda, -@@ -174,14 +174,14 @@ dnl ------------------------------------------------------------------- - dnl Check for gtkspell >= 3.0 and use it if found - dnl ------------------------------------------------------------------- - have_gtkspell=no --AC_ARG_WITH(gtkspell3, -+AC_ARG_WITH(gtkspell, - AS_HELP_STRING([--with-gtkspell],[Build with spell support]),, - with_gtkspell=auto) - - if test x"$with_gtkspell" != "xno" - then - PKG_CHECK_MODULES([GTKSPELL], [ -- gtkspell-3.0 >= $GTKSPELL_OPTIONAL -+ gtkspell3-3.0 >= $GTKSPELL_OPTIONAL - ], have_gtkspell=yes, have_gtkspell=no) - - if test x"$have_gtkspell" = "xyes" -@@ -339,7 +339,7 @@ if [ test x"$have_gtkspell" = "xyes" ]; then - echo "Building spell support: ................................YES" - else - echo "Building spell support: ................................NO" -- echo " Requires gtkspell >= $GTKSPELL_OPTIONAL" -+ echo " Requires gtkspell3 >= $GTKSPELL_OPTIONAL" - fi - - echo " -diff --git a/src/gtr-view.c b/src/gtr-view.c -index 59f18e8..b9c4f6a 100644 ---- a/src/gtr-view.c -+++ b/src/gtr-view.c -@@ -65,7 +65,7 @@ struct _GtrViewPrivate - gchar *search_text; - - #ifdef HAVE_GTKSPELL -- GtkSpell *spell; -+ GtkSpellChecker *spell; - #endif - }; - -@@ -75,11 +75,10 @@ gtr_attach_gtkspell (GtrView * view) - { - GError *error = NULL; - gchar *errortext = NULL; -- view->priv->spell = NULL; - -- view->priv->spell = -- gtkspell_new_attach (GTK_TEXT_VIEW (view), NULL, &error); -- if (view->priv->spell == NULL) -+ view->priv->spell = gtk_spell_checker_new (); -+ gtk_spell_checker_set_language (view->priv->spell, NULL, &error); -+ if (error) - { - g_warning (_("gtkspell error: %s\n"), error->message); - errortext = -@@ -90,6 +89,11 @@ gtr_attach_gtkspell (GtrView * view) - g_error_free (error); - g_free (errortext); - } -+ else -+ { -+ gtk_spell_checker_attach (view->priv->spell, -+ GTK_TEXT_VIEW (view)); -+ } - } - #endif - -@@ -263,7 +267,7 @@ gtr_view_enable_spellcheck (GtrView * view, gboolean enable) - #ifdef HAVE_GTKSPELL - if (!view->priv->spell) - return; -- gtkspell_detach (view->priv->spell); -+ gtk_spell_checker_detach (view->priv->spell); - #endif - } - } --- -cgit v0.9.1 - diff --git a/gtranslator.changes b/gtranslator.changes index 56bb037..3c2d888 100644 --- a/gtranslator.changes +++ b/gtranslator.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Mar 16 09:34:18 UTC 2015 - dimstar@opensuse.org + +- Update to version 2.91.7: + + Misc bugfixes. + + Updated translations. +- Drop gtranslator-gtkspell3.patch: fixed upstream. +- Drop gnome-common BuildRequires and call to autoreconf, as we no + longer carry any patches. + ------------------------------------------------------------------- Sat Jun 7 07:14:19 UTC 2014 - stathisagrapidis@gmail.com diff --git a/gtranslator.spec b/gtranslator.spec index 7a7ce3f..d02b6be 100644 --- a/gtranslator.spec +++ b/gtranslator.spec @@ -1,7 +1,7 @@ # # spec file for package gtranslator # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,14 @@ Name: gtranslator -Version: 2.91.6 +Version: 2.91.7 Release: 0 Summary: A GNOME po file editor with many bells and whistles License: GPL-3.0+ Group: Development/Tools/Other Url: http://gtranslator.sourceforge.net Source: http://download.gnome.org/sources/gtranslator/2.91/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM gtranslator-gtkspell3.patch dimstar@opensuse.org -- Port to gtkspell3, taken from git -Patch0: gtranslator-gtkspell3.patch BuildRequires: fdupes -# Needed for patch0 -BuildRequires: gnome-common BuildRequires: intltool BuildRequires: yelp-tools # Not using a pkgconfig() BuildRequires, to allow building against libgda 4.0 and 5.0 @@ -41,7 +37,7 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gtk+-3.0) >= 3.4.2 BuildRequires: pkgconfig(gtksourceview-3.0) >= 3.0.0 -BuildRequires: pkgconfig(gtkspell3-3.0) +BuildRequires: pkgconfig(gtkspell3-3.0) >= 3.0.0 BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libpeas-1.0) >= 1.2.0 @@ -71,12 +67,9 @@ files imminently. %lang_package %prep %setup -q -%patch0 -p1 translation-update-upstream %build -# Needed for patch0 -autoreconf -fiv %configure \ --disable-static \ --disable-scrollkeeper \ @@ -115,6 +108,7 @@ find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print %{_bindir}/%{name} %{_libdir}/%{name}/ %{_datadir}/%{name}/ +%{_datadir}/appdata/gtranslator.appdata.xml %{_datadir}/applications/*.desktop %{_datadir}/glib-2.0/schemas/*.gschema.xml %{_datadir}/icons/hicolor/*/apps/gtranslator.*