rpms/gwibber/F-12 gwibber-pre3-cleanup-fbauth.patch, NONE, 1.1 gwibber-pre3-no-Position-printing.patch, NONE, 1.1 gwibber-pre3-no-libproxy.patch, NONE, 1.1 gwibber-sqlite-725bzr-twitter-unicode-hack.patch, NONE, 1.1 gwibber.spec, 1.41, 1.42 sources, 1.24, 1.25
Tom Callaway
spot at fedoraproject.org
Mon Jul 26 18:49:30 UTC 2010
- Previous message: rpms/ditaa/F-13 .cvsignore, 1.2, 1.3 ditaa.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message: rpms/gwibber/F-13 gwibber-pre3-cleanup-fbauth.patch, NONE, 1.1 gwibber-pre3-no-Position-printing.patch, NONE, 1.1 gwibber-pre3-no-libproxy.patch, NONE, 1.1 gwibber-sqlite-725bzr-twitter-unicode-hack.patch, NONE, 1.1 gwibber.spec, 1.41, 1.42 sources, 1.24, 1.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/pkgs/rpms/gwibber/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13385/F-12
Modified Files:
gwibber.spec sources
Added Files:
gwibber-pre3-cleanup-fbauth.patch
gwibber-pre3-no-Position-printing.patch
gwibber-pre3-no-libproxy.patch
gwibber-sqlite-725bzr-twitter-unicode-hack.patch
Log Message:
sync
gwibber-pre3-cleanup-fbauth.patch:
gwibber/accounts.py | 2 +-
gwibber/lib/gtk/facebook.py | 4 +++-
ui/gwibber-accounts-facebook.ui | 11 +----------
3 files changed, 5 insertions(+), 12 deletions(-)
--- NEW FILE gwibber-pre3-cleanup-fbauth.patch ---
diff -up gwibber-pre3-737bzr/gwibber/accounts.py.fbauth gwibber-pre3-737bzr/gwibber/accounts.py
--- gwibber-pre3-737bzr/gwibber/accounts.py.fbauth 2010-07-26 13:41:54.846867049 -0400
+++ gwibber-pre3-737bzr/gwibber/accounts.py 2010-07-26 13:42:06.419866387 -0400
@@ -247,7 +247,7 @@ class GwibberAccountManager(object):
self.ui.get_object('image_type').set_from_pixbuf(icon)
if service_id in globals():
- aw = globals()[service_id].AccountWidget(account)
+ aw = globals()[service_id].AccountWidget(account, self.ui)
vbox_account.pack_start(aw, False, False)
vbox_account.show_all()
diff -up gwibber-pre3-737bzr/gwibber/lib/gtk/facebook.py.fbauth gwibber-pre3-737bzr/gwibber/lib/gtk/facebook.py
--- gwibber-pre3-737bzr/gwibber/lib/gtk/facebook.py.fbauth 2010-07-26 08:46:48.000000000 -0400
+++ gwibber-pre3-737bzr/gwibber/lib/gtk/facebook.py 2010-07-26 13:41:31.130887746 -0400
@@ -69,7 +69,9 @@ class AccountWidget(gtk.VBox):
self.ui.get_object("hbox_facebook_auth_done").show()
else:
self.ui.get_object("hbox_facebook_auth_done").hide()
- self.ui.get_object("facebook_auth_button").modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("red"))
+ self.ui.get_object("facebook_auth_button").modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("green"))
+ self.ui.get_object("facebook_auth_button").set_label(_("Authorized."))
+ self.ui.get_object("fb_auth_done_label").set_label(_("Click above to reauthorize."))
if self.dialog:
self.dialog.get_object('vbox_create').hide()
except:
diff -up gwibber-pre3-737bzr/ui/gwibber-accounts-facebook.ui.fbauth gwibber-pre3-737bzr/ui/gwibber-accounts-facebook.ui
--- gwibber-pre3-737bzr/ui/gwibber-accounts-facebook.ui.fbauth 2010-07-26 08:46:48.000000000 -0400
+++ gwibber-pre3-737bzr/ui/gwibber-accounts-facebook.ui 2010-07-26 13:41:31.130887746 -0400
@@ -26,15 +26,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="fb_auth_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Authorize with facebook</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
</object>
<packing>
<property name="position">0</property>
@@ -46,7 +37,7 @@
<child>
<object class="GtkLabel" id="fb_auth_done_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">Facebook authorized</property>
+ <property name="label" translatable="yes">Facebook NOT YET authorized</property>
</object>
<packing>
<property name="position">0</property>
gwibber-pre3-no-Position-printing.patch:
gwui.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE gwibber-pre3-no-Position-printing.patch ---
diff -up gwibber-pre3-737bzr/gwibber/gwui.py.BAD gwibber-pre3-737bzr/gwibber/gwui.py
--- gwibber-pre3-737bzr/gwibber/gwui.py.BAD 2010-07-26 11:00:10.928867687 -0400
+++ gwibber-pre3-737bzr/gwibber/gwui.py 2010-07-26 11:00:16.027880832 -0400
@@ -664,7 +664,7 @@ class MessageStream(gtk.HBox):
def on_scroll(self, *args):
value = int(self.scrollbar.get_value())
- print "Position:", value
+ # print "Position:", value
self.message_view.execute_script("""
document.location.hash = "";
document.location.hash = "msg-%s"
gwibber-pre3-no-libproxy.patch:
network.py | 9 ++++-----
util/facelib.py | 9 ++++-----
2 files changed, 8 insertions(+), 10 deletions(-)
--- NEW FILE gwibber-pre3-no-libproxy.patch ---
diff -up gwibber-pre3-737bzr/gwibber/microblog/network.py.no-libproxy gwibber-pre3-737bzr/gwibber/microblog/network.py
--- gwibber-pre3-737bzr/gwibber/microblog/network.py.no-libproxy 2010-07-26 08:46:48.000000000 -0400
+++ gwibber-pre3-737bzr/gwibber/microblog/network.py 2010-07-26 10:54:28.386878664 -0400
@@ -1,14 +1,13 @@
-#!/usr/bin/env python
import urllib, pycurl, json, StringIO
import traceback
from util import log
from util import exceptions
-try:
- import libproxy
-except:
- libproxy = None
+# try:
+# import libproxy
+# except:
+libproxy = None
class CurlDownloader:
def __init__(self, url, params=None, post=False, username=None, password=None, header=None, body=None):
diff -up gwibber-pre3-737bzr/gwibber/microblog/util/facelib.py.no-libproxy gwibber-pre3-737bzr/gwibber/microblog/util/facelib.py
--- gwibber-pre3-737bzr/gwibber/microblog/util/facelib.py.no-libproxy 2010-07-26 08:46:48.000000000 -0400
+++ gwibber-pre3-737bzr/gwibber/microblog/util/facelib.py 2010-07-26 10:54:45.022992510 -0400
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
#
# pyfacebook - Python bindings for the Facebook API
#
@@ -61,10 +60,10 @@ import mimetypes
import pycurl
import StringIO
-try:
- import libproxy
-except:
- libproxy = None
+# try:
+# import libproxy
+# except:
+libproxy = None
# try to use simplejson first, otherwise fallback to XML
RESPONSE_FORMAT = 'JSON'
gwibber-sqlite-725bzr-twitter-unicode-hack.patch:
twitter.py | 40 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
--- NEW FILE gwibber-sqlite-725bzr-twitter-unicode-hack.patch ---
diff -up gwibber-sqlite-725bzr/gwibber/microblog/twitter.py.gwibber-unicode-hack gwibber-sqlite-725bzr/gwibber/microblog/twitter.py
--- gwibber-sqlite-725bzr/gwibber/microblog/twitter.py.gwibber-unicode-hack 2010-07-14 17:09:36.726324770 -0400
+++ gwibber-sqlite-725bzr/gwibber/microblog/twitter.py 2010-07-14 18:02:56.341450068 -0400
@@ -45,6 +45,44 @@ PROTOCOL_INFO = {
URL_PREFIX = "https://twitter.com"
+import htmlentitydefs
+import unicodedata
+
+def htmlStripEscapes(s):
+ """Replace all html entities (escape sequences) in the string s with their
+ ISO Latin-1 (or bytecode) equivalent. If no such equivalent can be found
+ then the entity is decomposed into its normal form and the constituent
+ latin characters are retained. Failing that, the entity is deleted."""
+ i=0
+ while True:
+ i = s.find('&',i)
+ j = s.find(';',i)+1
+ identifier = s[i+1:j-1]
+ if not j==0:
+ replacement = ''
+ if identifier in htmlentitydefs.entitydefs:
+ identifier = htmlentitydefs.entitydefs[identifier]
+ if len(identifier)==1:
+ replacement = identifier
+ else:
+ identifier = identifier.strip('&;')
+ if (len(identifier)>1) and (identifier[0] == '#'):
+ identifier = identifier[1:]
+ if identifier[0]=='x':
+ identifier = int('0'+identifier,16)
+ else:
+ identifier = int(identifier)
+ if identifier<256:
+ replacement = chr(identifier)
+ elif identifier<=0xFFFF:
+ replacement = unicodedata.normalize('NFKD',
+ unichr(identifier)).encode('latin_1','ignore')
+ s = s[:i] + replacement + s[j:]
+ i += len(replacement)
+ else:
+ break
+ return(s)
+
def unescape(s):
p = htmllib.HTMLParser(None)
p.save_bgn()
@@ -61,7 +99,7 @@ class Client:
m["service"] = "twitter"
m["account"] = self.account["id"]
m["time"] = util.parsetime(data["created_at"])
- m["text"] = unescape(data["text"])
+ m["text"] = unescape(htmlStripEscapes(data["text"]))
m["to_me"] = ("@%s" % self.account["username"]) in data["text"]
m["html"] = util.linkify(data["text"],
Index: gwibber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-12/gwibber.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- gwibber.spec 7 May 2010 16:00:09 -0000 1.41
+++ gwibber.spec 26 Jul 2010 18:49:30 -0000 1.42
@@ -1,10 +1,10 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%global basever 2.30.0
+%global basever 2.31.2
Name: gwibber
-Version: %{basever}.1
-Release: 6%{?dist}
+Version: %{basever}
+Release: 7%{?dist}
Epoch: 1
Summary: An open source microblogging client for GNOME developed with Python and GTK
Group: Applications/Internet
@@ -14,29 +14,24 @@ URL: https://launchpad.net/gw
# The source for this package can be pulled from upstream's vcs. Use the
# following command to generate the tarball:
# bzr export -r %{bzr_rev} gwibber-%{bzr_rev}bzr.tar.gz lp:gwibber
-Source0: http://launchpad.net/gwibber/trunk/%{basever}/+download/gwibber-%{version}.tar.gz
+# bzr export -r 738 gwibber-pre3-738bzr.tar.gz lp:~segphault/gwibber/pre-3-merge
+# Source0: http://launchpad.net/gwibber/trunk/%{basever}/+download/gwibber-%{version}.tar.gz
+Source0: gwibber-pre3-738bzr.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Fix for https://bugs.launchpad.net/gwibber/+bug/546392
-Patch0: gwibber-2.30.0.1-non-int-font-size-fix.patch
+# Cleanup facebook auth dialog
+Patch0: gwibber-pre3-cleanup-fbauth.patch
-# Enable notification area support
-Patch1: gwibber-2.30.0.1-notification-area-support.patch
+# Gwibber unicode hack
+# See: https://bugs.launchpad.net/gwibber/+bug/532952
+Patch1: gwibber-sqlite-725bzr-twitter-unicode-hack.patch
+
+# Disable libproxy support
+# It doesn't work for some unknown reason.
+Patch2: gwibber-pre3-no-libproxy.patch
-# Set default notification icon size to 48 x 48
-# https://bugs.launchpad.net/bugs/571215
-Patch2: gwibber-2.30.0.1-notify-icon-48.patch
-
-# Use os.makedirs (mkdir -p equiv) rather than os.mkdir (mkdir)
-# https://bugs.launchpad.net/bugs/571367
-Patch3: gwibber-2.30.0.1-use-makedirs.patch
-
-# Update to bzr revision 721
-Patch4: 721_713.diff
-
-# Define pango_overlay before using it
-# https://bugs.launchpad.net/gwibber/+bug/577050
-Patch5: gwibber-2.30.0.1-define_pango_overlay_before_using.patch
+# Turn off Position printing debug. Noise noise noise!
+Patch3: gwibber-pre3-no-Position-printing.patch
Requires: libsoup, python-pycurl, PyXML
Requires: python
@@ -53,7 +48,7 @@ Requires: python-feedparser >= 4.1
Requires: pyxdg >= 0.15
Requires: python-mako >= 0.2.2
Requires: python-sexy, gnome-python2-gnomekeyring
-Requires: python-desktopcouch, python-oauth
+Requires: python-oauth
Requires: gnome-python2-libwnck
BuildRequires: python-devel, desktop-file-utils, python-distutils-extra, intltool, gettext
BuildArch: noarch
@@ -64,13 +59,11 @@ and GTK. It supports Twitter, Jaiku, Ide
%prep
-%setup -q
-%patch0 -p1 -b .non-int-font-size-fix
-%patch1 -p1 -b .notification-area
-%patch2 -p1 -b .notify-icon-48
-%patch3 -p1 -b .makedirs
-%patch4 -p0 -b .bzr721
-%patch5 -p1 -b .pango_overlay
+%setup -q -n gwibber-pre3-738bzr
+%patch0 -p1 -b .fbauth
+%patch1 -p1 -b .gwibber-unicode-hack
+%patch2 -p1 -b .no-libproxy
+%patch3 -p1 -b .no-position-printing
sed -i -e '/^#! \?\//, 1d' $(find %{name} | grep "\.py$")
@@ -114,6 +107,47 @@ rm -rf %{buildroot}
%{_datadir}/indicators/messages/applications/gwibber
%changelog
+* Mon Jul 26 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.31.2-7
+- update to 738, which has most of my patches merged!
+
+* Mon Jul 26 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.31.2-4
+- rebase on pre3 branch
+
+* Mon Jul 19 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.31.2-3
+- fix 729 patch
+
+* Wed Jul 14 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.31.2-2
+- add gwibber nbsp unicode hack fix
+
+* Wed Jul 14 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.31.2-1
+- sync up to 2.31.2
+
+* Tue Jun 29 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.30.0.1-14
+- back out libproxy patch. just makes everything stall out.
+
+* Tue Jun 29 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.30.0.1-13
+- cleanup facebook auth screen again
+
+* Tue Jun 29 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.30.0.1-12
+- remove connect timeout from network.py
+
+* Tue Jun 29 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.30.0.1-11
+- libproxy
+- fix exception handling
+- more facebook fix
+
+* Fri Jun 25 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.30.0.1-10
+- notifications
+
+* Fri May 27 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.30.0.1-9
+- more facebook fixes
+
+* Thu May 27 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.30.0.1-8
+- facebook fixes
+
+* Wed May 26 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.30.0.1-7
+- switch to sqlite backend branch
+
* Fri May 7 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:2.30.0.1-6
- update to bzr revision 721
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwibber/F-12/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources 15 Apr 2010 19:14:25 -0000 1.24
+++ sources 26 Jul 2010 18:49:30 -0000 1.25
@@ -1 +1 @@
-6e099167633ef7bda98ee784d873455e gwibber-2.30.0.1.tar.gz
+e6ab30fb28971aad4ab0a4504d5567e0 gwibber-pre3-738bzr.tar.gz
- Previous message: rpms/ditaa/F-13 .cvsignore, 1.2, 1.3 ditaa.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message: rpms/gwibber/F-13 gwibber-pre3-cleanup-fbauth.patch, NONE, 1.1 gwibber-pre3-no-Position-printing.patch, NONE, 1.1 gwibber-pre3-no-libproxy.patch, NONE, 1.1 gwibber-sqlite-725bzr-twitter-unicode-hack.patch, NONE, 1.1 gwibber.spec, 1.41, 1.42 sources, 1.24, 1.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list