[gscribble/f17] use webkit instead of gtkhtml2
Tom Callaway
spot at fedoraproject.org
Mon Mar 26 14:53:12 UTC 2012
commit e64f6095e7a94134861332d559c7673d9b05341f
Author: Tom Callaway <spot at fedoraproject.org>
Date: Mon Mar 26 10:53:09 2012 -0400
use webkit instead of gtkhtml2
gscribble-0.1.2-webkit.patch | 58 ++++++++++++++++++++++++++++++++++++++++++
gscribble.spec | 20 ++++++--------
2 files changed, 66 insertions(+), 12 deletions(-)
---
diff --git a/gscribble-0.1.2-webkit.patch b/gscribble-0.1.2-webkit.patch
new file mode 100644
index 0000000..ed717ba
--- /dev/null
+++ b/gscribble-0.1.2-webkit.patch
@@ -0,0 +1,58 @@
+diff -up gscribble-0.1.2/libgscribble/htmlview.py.webkit gscribble-0.1.2/libgscribble/htmlview.py
+--- gscribble-0.1.2/libgscribble/htmlview.py.webkit 2010-11-13 00:24:46.000000000 -0500
++++ gscribble-0.1.2/libgscribble/htmlview.py 2012-03-26 10:39:51.626912857 -0400
+@@ -1,36 +1,36 @@
+ # This file is taken from http://antrix.net/stuff/writr/ project. Provides a very nice and useful
+ # way to parse HTML for good visual display.
+ # Licensed under GNU GPL.
++# Modified to use webkit instead of the dead gtkhtml2 python code.
+
+ import traceback
+-import gtkhtml2
++import webkit
+ from markdown import markdown
+
+-class HtmlView(gtkhtml2.View):
++class HtmlView(webkit.WebView):
+
+ def __init__(self):
+- gtkhtml2.View.__init__(self)
+- self.document = gtkhtml2.Document()
+- self.set_document(self.document)
++ webkit.WebView.__init__(self)
+
+ def update(self, text, parent):
+- self.document.open_stream(u'text/html')
+- self.document.write_stream(u"""<html><head>
+- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+- <title>Try</title>
+- </head>
+- <body bgcolor="#CCCCFF">""")
+ try:
+ fmt_text = markdown(text.encode("utf-8"))
+- self.document.write_stream(fmt_text)
+- self.document.write_stream(u"</body></html>")
+- self.document.close_stream()
+ except:
+ traceback.print_exc()
+ fmt_text = "<h3>Markdown conversion failed!</h3>" \
+- + "The following error was encountered:<br/><br/>"
++ + "The following error was encountered:<br/><br/>"
+ tb_str = traceback.format_exc()
+ fmt_text += "<code><pre>%s</pre></code>" % tb_str
+- self.document.write_stream(fmt_text)
+- self.document.write_stream(u"</body></html>")
+- self.document.close_stream()
++
++ header_text = u"""<html><head>
++ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
++ <title>Try</title>
++ </head>
++ <body bgcolor="#CCCCFF">"""
++ footer_text = u"</body></html>"
++
++ whole_text = header_text
++ whole_text += fmt_text
++ whole_text += footer_text
++
++ self.load_string(whole_text, "text/html", "utf-8", "file:/")
diff --git a/gscribble.spec b/gscribble.spec
index 03cf41d..759fdf6 100644
--- a/gscribble.spec
+++ b/gscribble.spec
@@ -2,42 +2,36 @@
Name: gscribble
Version: 0.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A desktop client for blogging which supports wordpress and blogger
Group: Applications/Internet
License: GPLv2+
URL: https://sourceforge.net/projects/gscribble
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# This patch is licensed GPLv2+.
+Patch0: gscribble-0.1.2-webkit.patch
BuildArch: noarch
BuildRequires: python-devel, desktop-file-utils
-Requires: pygtk2, gnome-python2-gtkspell, gnome-python2-gtkhtml2, python-gdata >= 2.0.9
+Requires: pygtk2, gnome-python2-gtkspell, pywebkitgtk, python-gdata >= 2.0.9
%description
A desktop client for blogging for wordpress and blogger
%prep
%setup -q
+%patch0 -p1 -b .webkit
sed -i 's|^#!/usr/bin/env python|#!/usr/bin/python|' gscribble
%build
%{__python} setup.py build
-
%install
-rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
desktop-file-validate %{buildroot}/%{_datadir}/applications/gscribble.desktop
-
-
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%doc README LICENSE AUTHORS ChangeLog
%{python_sitelib}/libgscribble/
%{python_sitelib}/gscribble-*egg-info
@@ -46,8 +40,10 @@ rm -rf %{buildroot}
%{_datadir}/applications/gscribble.desktop
%{_datadir}/pixmaps/gscribble.png
-
%changelog
+* Mon Mar 26 2012 Tom Callaway <spot at fedoraproject.org> - 0.1.2-3
+- use pywebkitgtk
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list