[sugar-surf] Add patch to update API for 0.94.0

Peter Robinson pbrobinson at fedoraproject.org
Sun Oct 9 17:27:20 UTC 2011


commit 382f2ea94c029c1613fe03426b3ef4ba1b950d82
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Oct 9 18:27:10 2011 +0100

    Add patch to update API for 0.94.0

 sugar-surf.spec |    9 +++++++--
 surf-0.94.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)
---
diff --git a/sugar-surf.spec b/sugar-surf.spec
index 5e5226b..3b98227 100644
--- a/sugar-surf.spec
+++ b/sugar-surf.spec
@@ -1,11 +1,12 @@
 Name:     sugar-surf
 Version:  115
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  Web Browser activity for Sugar
 Group:    Sugar/Activities
 License:  GPLv2+
 URL:      http://www.sugarlabs.org/
 Source0:  http://people.sugarlabs.org/lucian/Surf-%{version}.tar.bz2
+Patch0:   surf-0.94.patch
 
 BuildRequires: python
 BuildRequires: sugar-toolkit
@@ -21,6 +22,7 @@ HTML rendering engine as Epiphany.
 
 %prep
 %setup -q -n Surf-%{version}
+%patch0 -p1 -b .newapi
 
 %build
 python ./setup.py build
@@ -39,5 +41,8 @@ rm  $RPM_BUILD_ROOT%{sugaractivitydir}/Surf.activity/COPYING
 %{sugaractivitydir}/Surf.activity/
 
 %changelog
-* Mon Apr 18 2011 Peter Robinson <pbrobinson at gmail.com> - 115-1
+* Sun Oct  9 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 115-2
+- Add patch to update API for 0.94.0
+
+* Mon Apr 18 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 115-1
 - Initial build
diff --git a/surf-0.94.patch b/surf-0.94.patch
new file mode 100644
index 0000000..1c1265f
--- /dev/null
+++ b/surf-0.94.patch
@@ -0,0 +1,31 @@
+--- Surf-115/webtoolbar.py.orig	2011-10-09 18:16:36.687921656 +0100
++++ Surf-115/webtoolbar.py	2011-10-09 18:19:10.405730930 +0100
+@@ -26,7 +26,6 @@
+ 
+ from sugar.graphics.toolbutton import ToolButton
+ from sugar.graphics.menuitem import MenuItem
+-from sugar._sugarext import AddressEntry
+ from sugar.graphics.toolbarbox import ToolbarBox
+ from sugar.activity.widgets import ActivityToolbarButton
+ from sugar.activity.widgets import StopButton
+@@ -39,7 +38,7 @@
+ _MAX_HISTORY_ENTRIES = 15
+ 
+ 
+-class WebEntry(AddressEntry):
++class WebEntry(gtk.Entry):
+     _COL_ADDRESS = 0
+     _COL_TITLE = 1
+ 
+@@ -348,7 +347,10 @@
+         self._set_title(frame.get_title())
+ 
+     def _set_progress(self, progress):
+-        self.entry.props.progress = progress
++	if progress == 1.0:
++		self.entry.set_progress_fraction(0.0)
++	else:
++		self.entry.set_progress_fraction(progress)
+ 
+     def _set_address(self, uri):
+         self.entry.props.address = uri


More information about the scm-commits mailing list