Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=acc628553e7b4b3e2b43923393340648db0cd2ad

commit acc628553e7b4b3e2b43923393340648db0cd2ad
Author: James Buren <r...@frugalware.org>
Date:   Sat May 28 09:53:11 2011 -0500

marave-0.7-2-x86_64
* enable syntax highlighter

diff --git a/source/xapps-extra/marave/FrugalBuild 
b/source/xapps-extra/marave/FrugalBuild
index 180e7ab..884fdca 100644
--- a/source/xapps-extra/marave/FrugalBuild
+++ b/source/xapps-extra/marave/FrugalBuild
@@ -4,17 +4,24 @@

pkgname=marave
pkgver=0.7
-pkgrel=1
+pkgrel=2
pkgdesc="A simple, clean text editor that doesn't distract you from your 
writing."
-depends=('pyenchant' 'pyqt4')
+depends=('pyenchant' 'pyqt4' 'source-highlight-qt')
+makedepends=('boost')
groups=('xapps-extra')
archs=('i686' 'x86_64')
-sha1sums=('10114d0bfdd871a388b6e1df7898fdc1105a7ff7')
+sha1sums=('10114d0bfdd871a388b6e1df7898fdc1105a7ff7' \
+          'd59f36cff51ab669523f9963b80a1fa59a1cfc9e')
Finclude googlecode python
+source=(${source[@]} $pkgname-0.7-fix-syntax-highlighting.patch)

build()
{
-  Fcd
-  Fbuild
+  Fpatchall
+  Fexec python setup.py build_hl
+  Fmake
+  Fmakeinstall
Fln /usr/bin/marave-editor /usr/bin/marave
}
+
+# optimization OK
diff --git a/source/xapps-extra/marave/marave-0.7-fix-syntax-highlighting.patch 
b/source/xapps-extra/marave/marave-0.7-fix-syntax-highlighting.patch
new file mode 100644
index 0000000..96d4408
--- /dev/null
+++ b/source/xapps-extra/marave/marave-0.7-fix-syntax-highlighting.patch
@@ -0,0 +1,33 @@
+diff -aur a/marave/editor/highlight/source-highlight-qt.sip 
b/marave/editor/highlight/source-highlight-qt.sip
+--- a/marave/editor/highlight/source-highlight-qt.sip  2010-02-16 
20:32:54.000000000 -0600
++++ b/marave/editor/highlight/source-highlight-qt.sip  2011-05-28 
09:38:06.050998705 -0500
+@@ -27,7 +27,7 @@
+     void setDocument ( QTextDocument * doc );
+     void rehighlightBlock ( const QTextBlock & block );
+     const QString getLangDefFileFromFileName(const QString &filename);
+-    void setDefaultToMonosapce(bool);
++    void setDefaultToMonospace(bool);
+ private:
+    Qt4SyntaxHighlighter(const srchiliteqt::Qt4SyntaxHighlighter&);
+
+diff -aur a/marave/editor/spelltextedit.py b/marave/editor/spelltextedit.py
+--- a/marave/editor/spelltextedit.py   2010-02-23 17:31:16.000000000 -0600
++++ b/marave/editor/spelltextedit.py   2011-05-28 09:38:11.926000460 -0500
+@@ -208,7 +208,7 @@
+                     if not self.dict and srchiliteqt:
+                         self.highlighter.setDocument(None)
+                         
self.highlighter=srchiliteqt.Qt4SyntaxHighlighter(self.document())
+-                        self.highlighter.setDefaultToMonosapce(False)
++                        self.highlighter.setDefaultToMonospace(False)
+                         
langName=self.highlighter.getLangDefFileFromFileName(fname)
+                         if langName:
+                             self.langChanged.emit(langName)
+@@ -230,7 +230,7 @@
+         if isinstance(self.highlighter, SpellHighlighter):
+             self.killDict()
+             self.highlighter=srchiliteqt.Qt4SyntaxHighlighter(self.document())
+-            self.highlighter.setDefaultToMonosapce(False)
++            self.highlighter.setDefaultToMonospace(False)
+         self.highlighter.setDocument(self.document())
+         self.highlighter.init(lang)
+         self.highlighter.setFormattingStyle(style)
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to