[gcompris] Fix water cycle and renewable energy activities (rhbz#1034132)
Hans de Goede
jwrdegoede at fedoraproject.org
Tue Nov 26 13:39:51 UTC 2013
commit 4232c2360ecf932cc5fdd63c9df3ee23264b121f
Author: Hans de Goede <hdegoede at redhat.com>
Date: Tue Nov 26 09:16:17 2013 +0100
Fix water cycle and renewable energy activities (rhbz#1034132)
.gitignore | 1 +
gcompris-13.11-watercycle-hydropow.patch | 119 ++++++++++++++++++++++++++++++
gcompris.spec | 9 ++-
sources | 1 +
4 files changed, 129 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index effe26d..da4c169 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ gcompris-9.3.tar.gz
/gcompris-12.05.tar.bz2
/gcompris-12.11.tar.bz2
/gcompris-13.11.tar.bz2
+/hydroelectric.svgz
diff --git a/gcompris-13.11-watercycle-hydropow.patch b/gcompris-13.11-watercycle-hydropow.patch
new file mode 100644
index 0000000..921e9b6
--- /dev/null
+++ b/gcompris-13.11-watercycle-hydropow.patch
@@ -0,0 +1,119 @@
+--- gcompris-13.11/src/hydroelectric-activity/hydroelectric.py 2013-08-13 22:27:22.000000000 +0200
++++ gcompris-13.11/src/hydroelectric-activity/hydroelectric.py 2013-11-25 21:26:28.827475201 +0100
+@@ -150,6 +150,7 @@
+ parent = self.rootitem,
+ svg_handle = self.svghandle,
+ svg_id = "#RESERVOIR1",
++ pointer_events = goocanvas.EVENTS_NONE,
+ visibility = goocanvas.ITEM_INVISIBLE
+ )
+
+@@ -237,7 +238,8 @@
+ self.boatitem = goocanvas.Svg(
+ parent = self.rootitem,
+ svg_handle = self.svghandle,
+- svg_id = "#BOAT"
++ svg_id = "#BOAT",
++ pointer_events = goocanvas.EVENTS_NONE
+ )
+ self.boatitem.translate(-100, 0);
+ self.boatitem_bounds = self.boatitem.get_bounds()
+@@ -246,6 +248,7 @@
+ parent = self.rootitem,
+ svg_handle = self.svghandle,
+ svg_id = "#BOAT_PARKED",
++ pointer_events = goocanvas.EVENTS_NONE,
+ visibility = goocanvas.ITEM_INVISIBLE
+ )
+
+@@ -254,6 +257,7 @@
+ parent = self.rootitem,
+ svg_handle = self.svghandle,
+ svg_id = "#SALOON",
++ pointer_events = goocanvas.EVENTS_NONE,
+ visibility = goocanvas.ITEM_INVISIBLE
+ )
+
+@@ -819,6 +823,7 @@
+ parent = rootitem,
+ svg_handle = svghandle,
+ svg_id = target_on,
++ pointer_events = goocanvas.EVENTS_NONE,
+ visibility = goocanvas.ITEM_INVISIBLE
+ )
+ if target_off:
+@@ -826,6 +831,7 @@
+ parent = rootitem,
+ svg_handle = svghandle,
+ svg_id = target_off,
++ pointer_events = goocanvas.EVENTS_NONE,
+ visibility = goocanvas.ITEM_INVISIBLE
+ )
+ else:
+@@ -940,6 +946,7 @@
+ parent = rootitem,
+ svg_handle = svghandle,
+ svg_id = prod_item_on,
++ pointer_events = goocanvas.EVENTS_NONE,
+ visibility = goocanvas.ITEM_INVISIBLE
+ )
+
+@@ -960,6 +967,7 @@
+ parent = rootitem,
+ svg_handle = svghandle,
+ svg_id = transformer_on,
++ pointer_events = goocanvas.EVENTS_NONE,
+ visibility = goocanvas.ITEM_INVISIBLE
+ )
+
+@@ -1086,6 +1094,7 @@
+ parent = rootitem,
+ svg_handle = svghandle,
+ svg_id = svg_id,
++ pointer_events = goocanvas.EVENTS_NONE,
+ tooltip = "\n\n\n" + tooltip
+ )
+ self.text = goocanvas.Text(
+--- gcompris-13.11/src/watercycle-activity/watercycle.py 2013-03-31 01:03:30.000000000 +0100
++++ gcompris-13.11/src/watercycle-activity/watercycle.py 2013-11-25 19:21:02.145355021 +0100
+@@ -191,13 +191,15 @@
+ self.boatitem = goocanvas.Svg(
+ parent = self.rootitem,
+ svg_handle = svghandle,
+- svg_id = "#BOAT"
++ svg_id = "#BOAT",
++ pointer_events = goocanvas.EVENTS_NONE
+ )
+ self.boatitem.translate(-100, 0);
+ self.boatitem_parked = goocanvas.Svg(
+ parent = self.rootitem,
+ svg_handle = svghandle,
+ svg_id = "#BOAT_PARKED",
++ pointer_events = goocanvas.EVENTS_NONE,
+ visibility = goocanvas.ITEM_INVISIBLE
+ )
+
+@@ -206,13 +208,14 @@
+ parent = self.rootitem,
+ svg_handle = svghandle,
+ svg_id = "#SHOWER",
+- visibility = goocanvas.ITEM_INVISIBLE
++ pointer_events = goocanvas.EVENTS_NONE
+ )
+
+ self.shower_tux = goocanvas.Svg(
+ parent = self.rootitem,
+ svg_handle = svghandle,
+ svg_id = "#SHOWER_TUX",
++ pointer_events = goocanvas.EVENTS_NONE,
+ visibility = goocanvas.ITEM_INVISIBLE
+ )
+
+@@ -221,6 +224,7 @@
+ parent = self.rootitem,
+ svg_handle = svghandle,
+ svg_id = "#SHOWER_ON",
++ pointer_events = goocanvas.EVENTS_NONE,
+ visibility = goocanvas.ITEM_INVISIBLE
+ )
+
diff --git a/gcompris.spec b/gcompris.spec
index 260952e..35c12a4 100644
--- a/gcompris.spec
+++ b/gcompris.spec
@@ -1,13 +1,15 @@
Name: gcompris
Version: 13.11
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Educational suite for kids 2-10 years old
Group: Amusements/Games
License: GPLv3+
URL: http://gcompris.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source1: hydroelectric.svgz
Patch0: gcompris-9.0-icon.patch
Patch1: gcompris-13.11-use-bundled-gnuchess.patch
+Patch2: gcompris-13.11-watercycle-hydropow.patch
Buildrequires: libgnomeui-devel sqlite-devel python-devel gnet2-devel
Buildrequires: pygtk2-devel SDL_mixer-devel libXt-devel libXxf86vm-devel
Buildrequires: gnome-python2 xorg-x11-proto-devel gstreamer-devel
@@ -445,6 +447,7 @@ Voice samples for the GCompris games in Chinese, Simplified.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
for file in AUTHORS ChangeLog; do
iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
touch -r $file $file.new && \
@@ -472,6 +475,7 @@ sed -i \
%install
%make_install
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/boards/hydroelectric
rm $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.la
%find_lang %{name}
@@ -643,6 +647,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Tue Nov 26 2013 Hans de Goede <hdegoede at redhat.com> - 13.11-2
+- Fix water cycle and renewable energy activities (rhbz#1034132)
+
* Wed Nov 20 2013 Hans de Goede <hdegoede at redhat.com> - 13.11-1
- New upstream release 13.11 (rhbz#1026684)
diff --git a/sources b/sources
index 1ca1210..da0f9da 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
7c3396c02e44bbf72424ca12bfff9cf3 gcompris-13.11.tar.bz2
+b834c9066dfe8fe36e583e531dfc5877 hydroelectric.svgz
More information about the scm-commits
mailing list