Attachment 1166 Details for Bug 1188 – pykdeextensions 3.5.13.2 : adds EXTRA_MODULE_DIR and PYQT_DIR variables in KCM code template

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] pykdeextensions 3.5.13.2 : adds EXTRA_MODULE_DIR and PYQT_DIR variables in KCM code template

pykdeextensions-3.5.13.2-fix_extra_module_dir.patch (text/plain), 1.89 KB, created by Francois Andriot on 2013-04-15 12:39:40 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Francois Andriot

Created: 2013-04-15 12:39:40 CDT

Size: 1.89 KB

patch

obsolete

>--- pykdeextensions-3.5.13.1/src/kdedistutils.py.extramodule	2012-09-08 17:33:05.000000000 +0000
>+++ pykdeextensions-3.5.13.1/src/kdedistutils.py	2012-10-02 19:19:40.185384207 +0000
>@@ -712,6 +712,8 @@
>             
>             # Build the 'stub' code.
>             cppcode = self.cpptemplate % {"moduledir": self.data_dir,
>+                                            "extramodule": os.getenv("EXTRA_MODULE_DIR"),
>+                                            "pyqt_dir": self.pyqt_dir,
>                                             "modulename": modulename,
>                                             "factoryfunction": factoryfunction,
>                                             "python_version": python_version}
>@@ -854,6 +856,8 @@
> #include <sip.h>
> 
> #define MODULE_DIR "%(moduledir)s"
>+#define EXTRA_MODULE_DIR "%(extramodule)s"
>+#define PYQT_DIR "%(pyqt_dir)s"
> #define MODULE_NAME "%(modulename)s"
> #define FACTORY "%(factoryfunction)s"
> #define CPP_FACTORY %(factoryfunction)s
>--- pykdeextensions-3.5.13.1/src/kdedistutils.py.ORI	2013-04-07 17:54:28.531813437 +0200
>+++ pykdeextensions-3.5.13.1/src/kdedistutils.py	2013-04-07 17:56:15.510529614 +0200
>@@ -903,6 +906,18 @@
>     if(!pyize->appendToSysPath (path.latin1 ())) {
>         return report_error ("***Failed to set sys.path\n");
>     }
>+
>+    // Add the extra path to the python script to the interpreter search path.
>+    QString extrapath = QString(EXTRA_MODULE_DIR);
>+    if(!pyize->appendToSysPath (extrapath.latin1 ())) {
>+      return report_error ("***Failed to set extra sys.path\n");
>+    }
>+
>+    // Add the PYQT path to the python script to the interpreter search path.
>+    QString pyqt_dir = QString(PYQT_DIR);
>+    if(!pyize->appendToSysPath (pyqt_dir.latin1 ())) {
>+      return report_error ("***Failed to set PYQT sys.path\n");
>+    }
>     
>     // Load the Python script.
>     PyObject *pyModule = pyize->importModule ((char *)script.latin1 ());

Actions: View | Diff

Attachments on bug 1188: 1165 | 1166