From f4d19d9223e99f7d3479f50497efa6649d5e4bc6 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Jul 01 2013 07:22:35 +0000 Subject: Fix GError module error on launch (bug 964356) - Fix infinite loop when searching words with asterisk (bug 964356) --- diff --git a/catfish-0.4.0.2-GError.patch b/catfish-0.4.0.2-GError.patch new file mode 100644 index 0000000..e9adbfe --- /dev/null +++ b/catfish-0.4.0.2-GError.patch @@ -0,0 +1,11 @@ +--- catfish-0.4.0.2/catfish.py.GError 2013-07-01 16:06:08.193254698 +0900 ++++ catfish-0.4.0.2/catfish.py 2013-07-01 13:58:58.328273886 +0900 +@@ -21,7 +21,7 @@ + + import locale, gettext + from gi.repository import GObject, Gtk, Gdk, GdkPixbuf, Pango +- from gi._glib import GError ++ from gi.repository.GLib import GError + + except ImportError, msg: + print 'Error: The required module %s is missing.' % str(msg).split()[-1] diff --git a/catfish-0.4.0.2-loopiter.patch b/catfish-0.4.0.2-loopiter.patch new file mode 100644 index 0000000..fe5f94e --- /dev/null +++ b/catfish-0.4.0.2-loopiter.patch @@ -0,0 +1,11 @@ +--- catfish-0.4.0.2/catfish.py.loopiter 2013-07-01 13:58:58.328273886 +0900 ++++ catfish-0.4.0.2/catfish.py 2013-07-01 15:18:51.892475084 +0900 +@@ -1205,6 +1205,8 @@ + pass + self.suggestion_pending = False + yield False ++ else: ++ yield False + + def disable_filters(self): + self.time_filter_any.set_active(True) diff --git a/catfish.spec b/catfish.spec index 97c468f..bb314e9 100644 --- a/catfish.spec +++ b/catfish.spec @@ -2,12 +2,12 @@ %define mainver 0.4.0.2 %undefine betaver -%define fedoraver 2 +%define fedoraver 3 Name: catfish Version: %{mainver} -Release: %{?betaver:0.}%{fedoraver}%{?betaver:.%betaver}%{?dist}.1 +Release: %{?betaver:0.}%{fedoraver}%{?betaver:.%betaver}%{?dist} Summary: A handy file search tool Group: Applications/File @@ -19,6 +19,10 @@ Source0: https://launchpad.net/catfish-search/%{majorver}/%{mainver}/+download/% # the consuming code has moved from pygtk to gi.repository in the # pygobject3 package. Review if this patch is still necessary Patch0: catfish-0.4.0-stock-info.patch +# Fix GError module error on launch (bug 964356) +Patch1: catfish-0.4.0.2-GError.patch +# Fix infinite loop when searching words with asterisk (bug 964356) +Patch2: catfish-0.4.0.2-loopiter.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -66,6 +70,8 @@ This is a metapackage to install all engines supported by %{name}. %prep %setup -q -n %{name}-%{mainver}%{?betaver} %patch0 -p1 -b .info +%patch1 -p1 -b .GError +%patch2 -p1 -b .loopiter # Fix up permissions... %{__chmod} 0644 \ po/* \ @@ -150,6 +156,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %changelog +* Mon Jul 1 2013 Mamoru TASAKA - 0.4.0.2-3 +- Fix GError module error on launch (bug 964356) +- Fix infinite loop when searching words with asterisk (bug 964356) + * Sat Feb 23 2013 Toshio Kuratomi - 0.4.0.2-2.1 - Update stock_info patch so that build completes