[fantasdic/f17] Guard sigtrap when calling Gdk::flush (bug 844754, bug 799804)
Mamoru Tasaka
mtasaka at fedoraproject.org
Thu Aug 2 01:32:33 UTC 2012
commit 6fbda846974e15776ee75a2a3defe9022e41cfaa
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date: Thu Aug 2 10:32:26 2012 +0900
Guard sigtrap when calling Gdk::flush (bug 844754, bug 799804)
fantasdic-1.0-beta7-guard-sigtrap.patch | 26 ++++++++++++++++++++++++++
fantasdic.spec | 22 +++++++++++++++++++---
2 files changed, 45 insertions(+), 3 deletions(-)
---
diff --git a/fantasdic-1.0-beta7-guard-sigtrap.patch b/fantasdic-1.0-beta7-guard-sigtrap.patch
new file mode 100644
index 0000000..36b696b
--- /dev/null
+++ b/fantasdic-1.0-beta7-guard-sigtrap.patch
@@ -0,0 +1,26 @@
+--- fantasdic-1.0-beta7/lib/fantasdic/ui/ipc.rb.sigtrap 2009-03-25 01:14:57.000000000 +0900
++++ fantasdic-1.0-beta7/lib/fantasdic/ui/ipc.rb 2012-08-02 10:06:54.263510567 +0900
+@@ -166,7 +166,11 @@
+ def self.send(window, name, value)
+ window.set_string(MESSAGE_ARGS, Marshal.dump(value))
+ window.set_string(name, window.xid)
++ # Guard sigtrap here
++ Gdk::error_trap_push()
+ Gdk::flush()
++ # Remove guard
++ Gdk::error_trap_pop()
+ Gtk.main_iteration while Gtk.events_pending?
+ end
+
+@@ -185,7 +189,11 @@
+
+ realize()
+ window.set_string( atom_name, window.xid )
++ # Guard sigtrap here
++ Gdk::error_trap_push()
+ Gdk::flush()
++ # Remove guard
++ Gdk::error_trap_pop()
+ add_events(Gdk::Event::PROPERTY_CHANGE_MASK)
+
+ signal_connect("property-notify-event") do |widget,event|
diff --git a/fantasdic.spec b/fantasdic.spec
index fddbf1d..462a4bd 100644
--- a/fantasdic.spec
+++ b/fantasdic.spec
@@ -7,7 +7,7 @@
%define rubyabi 1.8
%endif
-%define fedorarel 11
+%define fedorarel 12
%define fullrel %{?betaver:0.}%{fedorarel}%{?betaver:.%betaver}
@@ -22,8 +22,8 @@ License: GPLv2+
URL: http://www.gnome.org/projects/fantasdic/
Source0: http://www.mblondel.org/files/fantasdic/%{name}-%{mainver}%{?betaver:-%betaver}.tar.gz
# ruby-gnome2-Bugs-2865895
-# Patch0:
-# fantasdic-1.0-beta7-workaround-rg2-bg2865895.patch
+# Patch0: fantasdic-1.0-beta7-workaround-rg2-bg2865895.patch
+%if 0%{?fedora} >= 17
# Various ruby19 fixes
# Need utf-8 encoding direction
Patch10: fantasdic-1.0-beta7-ruby19-utf8.patch
@@ -31,6 +31,9 @@ Patch10: fantasdic-1.0-beta7-ruby19-utf8.patch
Patch11: fantasdic-1.0-beta7-ruby19-syntax.patch
# Path fix for modules in ruby 19
Patch12: fantasdic-1.0-beta7-ruby19-pathfix.patch
+%endif
+# Guard sigtrap when calling Gdk::flush (bug 844754, bug 799804)
+Patch13: fantasdic-1.0-beta7-guard-sigtrap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -43,7 +46,11 @@ BuildRequires: ruby(abi) = %{rubyabi}
Requires: ruby
Requires: ruby(abi) = %{rubyabi}
+%if 0%{?fedora} >= 17
Requires: rubygem(gettext)
+%else
+Requires: ruby(gettext-package)
+%endif
Requires: ruby(libglade2)
Requires: ruby(gconf2)
@@ -62,9 +69,12 @@ Fantasdic is Free Software.
%prep
%setup -q -n %{name}-%{mainver}%{?betaver:-%betaver}
#%%patch0 -p1
+%if 0%{?fedora} >= 17
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%endif
+%patch13 -p1
%{__chmod} 0644 tools/*.rb
%{__sed} -i.path -e 's|%{_bindir}/||' fantasdic.desktop
@@ -195,6 +205,12 @@ exit 0
%changelog
+* Thu Aug 2 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.0-0.12.beta7
+- Guard sigtrap when calling Gdk::flush (bug 844754, bug 799804)
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.11.beta7.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Thu May 3 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.0-0.11.beta7
- Patch to work with ruby 1.9 (bug 817855)
More information about the scm-commits
mailing list