diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-06-24 19:58:32 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-06-24 19:58:32 +0200 |
| commit | d8e1ce857bedb9d018ae0918b4c90686d604c2df (patch) | |
| tree | 111a8759c0599ce2be8d25946d21dee4f69923b9 /redhat/libraries/pytdeextensions | |
| parent | 8743b3f65cd27e30aefe49f127105aa305a86051 (diff) | |
| download | tde-packaging-d8e1ce857bedb9d018ae0918b4c90686d604c2df.tar.gz tde-packaging-d8e1ce857bedb9d018ae0918b4c90686d604c2df.zip | |
RPM Packaging: add 3.5.13.2 build patches
Diffstat (limited to 'redhat/libraries/pytdeextensions')
| -rw-r--r-- | redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch | 41 | ||||
| -rw-r--r-- | redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch | 11 |
2 files changed, 52 insertions, 0 deletions
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch new file mode 100644 index 000000000..ba57986f0 --- /dev/null +++ b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch @@ -0,0 +1,41 @@ +--- 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 ()); diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch new file mode 100644 index 000000000..2d6863f65 --- /dev/null +++ b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch @@ -0,0 +1,11 @@ +--- pykdeextensions/src/kdedistutils.py.ORI 2012-08-27 22:10:18.873738368 +0200 ++++ pykdeextensions/src/kdedistutils.py 2012-08-27 22:10:50.234094262 +0200 +@@ -539,7 +539,7 @@ + canidatepaths.append(os.path.join(kdedir,"include")) + canidatepaths.append(os.path.join(install.prefix,"include")) + canidatepaths.append('/opt/trinity/include') +- canidatepaths.append('/opt/kde/include') ++ canidatepaths.append('/opt/trinity/include/tde') + self.kde_inc_dir = FindFileInPaths('kapplication.h',canidatepaths) + if self.kde_inc_dir is None: + raise SystemExit, "Failed to find the KDE header file directory." |