[arch-commits] Commit in eric4/trunk (PKGBUILD qtwebkit23.patch)
Ray Rashif
schiv at nymeria.archlinux.org
Sun Feb 17 19:56:03 UTC 2013
Date: Sunday, February 17, 2013 @ 20:56:03
Author: schiv
Revision: 178172
upgpkg: eric4 4.5.8-2
fix segfault; close FS#33544
Added:
eric4/trunk/qtwebkit23.patch
Modified:
eric4/trunk/PKGBUILD
------------------+
PKGBUILD | 12 ++-
qtwebkit23.patch | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 172 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-02-17 18:33:20 UTC (rev 178171)
+++ PKGBUILD 2013-02-17 19:56:03 UTC (rev 178172)
@@ -5,7 +5,7 @@
pkgname=eric4
pkgver=4.5.8
-pkgrel=1
+pkgrel=2
pkgdesc="A full-featured Python 2.x and Ruby IDE in PyQt4"
arch=('any')
url="http://eric-ide.python-projects.org/"
@@ -14,9 +14,11 @@
conflicts=('eric<5')
install=$pkgname.install
source=("http://downloads.sourceforge.net/eric-ide/$pkgname-$pkgver.tar.gz"
- "$pkgname.desktop")
+ "$pkgname.desktop"
+ 'qtwebkit23.patch')
md5sums=('c9fa7f08873afccb7ed51983faf778bd'
- 'bce515b66a2c63dfc76a0f92edbe2ecb')
+ 'bce515b66a2c63dfc76a0f92edbe2ecb'
+ 'e51e04aaba7efa0365b8d94bfcfa949a')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -24,6 +26,10 @@
# our pyxml is patched
# not version-depending because not critical
sed -i 's/v < (0, 8, 6)/v < (0, 8, 4)/' install.py
+
+ # fix for qtwebkit 2.3 beta
+ # see https://bugs.archlinux.org/task/33544
+ (cd eric && patch -Np0 -i "$srcdir/qtwebkit23.patch")
}
package() {
Added: qtwebkit23.patch
===================================================================
--- qtwebkit23.patch (rev 0)
+++ qtwebkit23.patch 2013-02-17 19:56:03 UTC (rev 178172)
@@ -0,0 +1,163 @@
+Index: Preferences/__init__.py
+===================================================================
+--- Preferences/__init__.py (revision 4420)
++++ Preferences/__init__.py (revision 4421)
+@@ -601,29 +601,38 @@
+ "SearchLanguage": QtCore.QLocale().language(),
+ }
+
+- websettings = QWebSettings.globalSettings()
+- fontFamily = websettings.fontFamily(QWebSettings.StandardFont)
+- fontSize = websettings.fontSize(QWebSettings.DefaultFontSize)
+- helpDefaults["StandardFont"] = QtGui.QFont(fontFamily, fontSize).toString()
+- fontFamily = websettings.fontFamily(QWebSettings.FixedFont)
+- fontSize = websettings.fontSize(QWebSettings.DefaultFixedFontSize)
+- helpDefaults["FixedFont"] = QtGui.QFont(fontFamily, fontSize).toString()
+- helpDefaults.update({
+- "AutoLoadImages" :
+- websettings.testAttribute(QWebSettings.AutoLoadImages),
+- "UserStyleSheet" : "",
+- "SaveUrlColor" : QtGui.QColor(248, 248, 210),
+- "JavaEnabled" :
+- websettings.testAttribute(QWebSettings.JavaEnabled),
+- "JavaScriptEnabled" :
+- websettings.testAttribute(QWebSettings.JavascriptEnabled),
+- "JavaScriptCanOpenWindows" :
+- websettings.testAttribute(QWebSettings.JavascriptCanOpenWindows),
+- "JavaScriptCanAccessClipboard" :
+- websettings.testAttribute(QWebSettings.JavascriptCanAccessClipboard),
+- "PluginsEnabled" :
+- websettings.testAttribute(QWebSettings.PluginsEnabled),
+- })
++ @classmethod
++ def initWebSettingsDefaults(cls):
++ """
++ Class method to initialize the web settings related defaults.
++ """
++ websettings = QWebSettings.globalSettings()
++ fontFamily = websettings.fontFamily(QWebSettings.StandardFont)
++ fontSize = websettings.fontSize(QWebSettings.DefaultFontSize)
++ cls.helpDefaults["StandardFont"] = QtGui.QFont(fontFamily, fontSize).toString()
++ fontFamily = websettings.fontFamily(QWebSettings.FixedFont)
++ fontSize = websettings.fontSize(QWebSettings.DefaultFixedFontSize)
++ cls.helpDefaults["FixedFont"] = QtGui.QFont(fontFamily, fontSize).toString()
++ cls.helpDefaults.update({
++ "AutoLoadImages" :
++ websettings.testAttribute(QWebSettings.AutoLoadImages),
++ "UserStyleSheet" : "",
++ "SaveUrlColor" : QtGui.QColor(248, 248, 210),
++ "JavaEnabled" :
++ websettings.testAttribute(QWebSettings.JavaEnabled),
++ "JavaScriptEnabled" :
++ websettings.testAttribute(QWebSettings.JavascriptEnabled),
++ "JavaScriptCanOpenWindows" :
++ websettings.testAttribute(QWebSettings.JavascriptCanOpenWindows),
++ "JavaScriptCanAccessClipboard" :
++ websettings.testAttribute(QWebSettings.JavascriptCanAccessClipboard),
++ "PluginsEnabled" :
++ websettings.testAttribute(QWebSettings.PluginsEnabled),
++ })
++
++ cls.webSettingsIntitialized = True
++
++ webSettingsIntitialized = False
+
+ # defaults for system settings
+ if isWindowsPlatform():
+@@ -1750,6 +1759,9 @@
+ @param prefClass preferences class used as the storage area
+ @return the requested help setting
+ """
++ if not prefClass.webSettingsIntitialized:
++ prefClass.initWebSettingsDefaults()
++
+ if key in ["CustomViewer", \
+ "PythonDocDir", "QtDocDir", "Qt4DocDir", "PyQt4DocDir", "PyKDE4DocDir",
+ "UserStyleSheet", "WebSearchEngine", "HomePage", "PySideDocDir",
+Index: Documentation/Source/eric4.Preferences.__init__.html
+===================================================================
+--- Documentation/Source/eric4.Preferences.__init__.html (revision 4420)
++++ Documentation/Source/eric4.Preferences.__init__.html (revision 4421)
+@@ -322,11 +322,14 @@
+ object
+ <h3>Class Attributes</h3>
+ <table>
+-<tr><td>corbaDefaults</td></tr><tr><td>debuggerDefaults</td></tr><tr><td>editorColourDefaults</td></tr><tr><td>editorDefaults</td></tr><tr><td>editorExporterDefaults</td></tr><tr><td>editorOtherFontsDefaults</td></tr><tr><td>editorTypingDefaults</td></tr><tr><td>fontFamily</td></tr><tr><td>fontSize</td></tr><tr><td>geometryDefaults</td></tr><tr><td>graphicsDefaults</td></tr><tr><td>helpDefaults</td></tr><tr><td>iconEditorDefaults</td></tr><tr><td>iconsDefaults</td></tr><tr><td>multiProjectDefaults</td></tr><tr><td>pluginManagerDefaults</td></tr><tr><td>printerDefaults</td></tr><tr><td>projectBrowserColourDefaults</td></tr><tr><td>projectBrowserFlagsDefaults</td></tr><tr><td>projectDefaults</td></tr><tr><td>qtDefaults</td></tr><tr><td>resetLayout</td></tr><tr><td>shellDefaults</td></tr><tr><td>sysDefaults</td></tr><tr><td>tasksDefaults</td></tr><tr><td>templatesDefaults</td></tr><tr><td>terminalDefaults</td></tr><tr><td>trayStarterDefaults</td></tr><tr><td>uiDefaults</td></tr><tr><t
d>userDefaults</td></tr><tr><td>varDefaults</td></tr><tr><td>vcsDefaults</td></tr><tr><td>viewProfilesLength</td></tr><tr><td>websettings</td></tr>
++<tr><td>corbaDefaults</td></tr><tr><td>debuggerDefaults</td></tr><tr><td>editorColourDefaults</td></tr><tr><td>editorDefaults</td></tr><tr><td>editorExporterDefaults</td></tr><tr><td>editorOtherFontsDefaults</td></tr><tr><td>editorTypingDefaults</td></tr><tr><td>geometryDefaults</td></tr><tr><td>graphicsDefaults</td></tr><tr><td>helpDefaults</td></tr><tr><td>iconEditorDefaults</td></tr><tr><td>iconsDefaults</td></tr><tr><td>multiProjectDefaults</td></tr><tr><td>pluginManagerDefaults</td></tr><tr><td>printerDefaults</td></tr><tr><td>projectBrowserColourDefaults</td></tr><tr><td>projectBrowserFlagsDefaults</td></tr><tr><td>projectDefaults</td></tr><tr><td>qtDefaults</td></tr><tr><td>resetLayout</td></tr><tr><td>shellDefaults</td></tr><tr><td>tasksDefaults</td></tr><tr><td>templatesDefaults</td></tr><tr><td>terminalDefaults</td></tr><tr><td>trayStarterDefaults</td></tr><tr><td>uiDefaults</td></tr><tr><td>userDefaults</td></tr><tr><td>varDefaults</td></tr><tr><td>vcsDefaults</td></tr><
tr><td>viewProfilesLength</td></tr><tr><td>webSettingsIntitialized</td></tr>
+ </table>
+ <h3>Class Methods</h3>
+ <table>
+-<tr><td>None</td></tr>
++<tr>
++<td><a href="#Prefs.initWebSettingsDefaults">initWebSettingsDefaults</a></td>
++<td>Class method to initialize the web settings related defaults.</td>
++</tr>
+ </table>
+ <h3>Methods</h3>
+ <table>
+@@ -336,7 +339,12 @@
+ <table>
+ <tr><td>None</td></tr>
+ </table>
+-
++<a NAME="Prefs.initWebSettingsDefaults" ID="Prefs.initWebSettingsDefaults"></a>
++<h4>Prefs.initWebSettingsDefaults (class method)</h4>
++<b>initWebSettingsDefaults</b>(<i></i>)
++<p>
++ Class method to initialize the web settings related defaults.
++</p>
+ <div align="right"><a href="#top">Up</a></div>
+ <hr /><hr />
+ <a NAME="exportPreferences" ID="exportPreferences"></a>
+Index: Documentation/Help/source.qhp
+===================================================================
+--- Documentation/Help/source.qhp (revision 4420)
++++ Documentation/Help/source.qhp (revision 4421)
+@@ -5209,6 +5209,7 @@
+ <keyword name="PreferencesLexerLanguageError" id="PreferencesLexerLanguageError" ref="eric4.Preferences.PreferencesLexer.html#PreferencesLexerLanguageError" />
+ <keyword name="PreferencesLexerLanguageError (Constructor)" id="PreferencesLexerLanguageError (Constructor)" ref="eric4.Preferences.PreferencesLexer.html#PreferencesLexerLanguageError.__init__" />
+ <keyword name="Prefs" id="Prefs" ref="eric4.Preferences.__init__.html#Prefs" />
++ <keyword name="Prefs.initWebSettingsDefaults" id="Prefs.initWebSettingsDefaults" ref="eric4.Preferences.__init__.html#Prefs.initWebSettingsDefaults" />
+ <keyword name="Printer" id="Printer" ref="eric4.QScintilla.Printer.html#Printer" />
+ <keyword name="Printer (Constructor)" id="Printer (Constructor)" ref="eric4.QScintilla.Printer.html#Printer.__init__" />
+ <keyword name="Printer (Module)" id="Printer (Module)" ref="eric4.QScintilla.Printer.html" />
+Index: Documentation/Help/source.qch
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: APIs/Python/eric4.api
+===================================================================
+--- APIs/Python/eric4.api (revision 4420)
++++ APIs/Python/eric4.api (revision 4421)
+@@ -3730,13 +3730,12 @@
+ eric4.Preferences.Prefs.editorExporterDefaults?7
+ eric4.Preferences.Prefs.editorOtherFontsDefaults?7
+ eric4.Preferences.Prefs.editorTypingDefaults?7
+-eric4.Preferences.Prefs.fontFamily?7
+-eric4.Preferences.Prefs.fontSize?7
+ eric4.Preferences.Prefs.geometryDefaults?7
+ eric4.Preferences.Prefs.graphicsDefaults?7
+ eric4.Preferences.Prefs.helpDefaults?7
+ eric4.Preferences.Prefs.iconEditorDefaults?7
+ eric4.Preferences.Prefs.iconsDefaults?7
++eric4.Preferences.Prefs.initWebSettingsDefaults?4()
+ eric4.Preferences.Prefs.multiProjectDefaults?7
+ eric4.Preferences.Prefs.pluginManagerDefaults?7
+ eric4.Preferences.Prefs.printerDefaults?7
+@@ -3746,7 +3745,6 @@
+ eric4.Preferences.Prefs.qtDefaults?7
+ eric4.Preferences.Prefs.resetLayout?7
+ eric4.Preferences.Prefs.shellDefaults?7
+-eric4.Preferences.Prefs.sysDefaults?7
+ eric4.Preferences.Prefs.tasksDefaults?7
+ eric4.Preferences.Prefs.templatesDefaults?7
+ eric4.Preferences.Prefs.terminalDefaults?7
+@@ -3756,7 +3754,7 @@
+ eric4.Preferences.Prefs.varDefaults?7
+ eric4.Preferences.Prefs.vcsDefaults?7
+ eric4.Preferences.Prefs.viewProfilesLength?7
+-eric4.Preferences.Prefs.websettings?7
++eric4.Preferences.Prefs.webSettingsIntitialized?7
+ eric4.Preferences.ProgramsDialog.ProgramsDialog.on_buttonBox_clicked?4(button)
+ eric4.Preferences.ProgramsDialog.ProgramsDialog.on_programsSearchButton_clicked?4()
+ eric4.Preferences.ProgramsDialog.ProgramsDialog.show?4()
More information about the arch-commits
mailing list