RPM Packaging: update R14 packages

4 files changed, 0 insertions, 143 deletions

diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0-fix_extra_module_dir.patch b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0-fix_extra_module_dir.patch
deleted file mode 100644
index d72fdc928..000000000
--- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0-fix_extra_module_dir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- 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-14.0.0/src/kdedistutils.py.ORI	2013-04-07 17:54:28.531813437 +0200
-+++ pykdeextensions-14.0.0/src/kdedistutils.py	2013-04-07 17:56:15.510529614 +0200
-@@ -903,6 +907,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.
-+    TQString extrapath = TQString(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.
-+    TQString pyqt_dir = TQString(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/pytdeextensions-14.0.0-fix_include_dir.patch b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0-fix_include_dir.patch
deleted file mode 100644
index 40c466e4e..000000000
--- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0-fix_include_dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-pytdeextensions-14.0.0~pre116+64c969d7/src/kdedistutils.py.ORI	2013-07-04 20:30:36.889883389 +0200
-+++ trinity-pytdeextensions-14.0.0~pre116+64c969d7/src/kdedistutils.py	2013-07-04 20:30:54.729085109 +0200
-@@ -539,7 +539,7 @@
-                     canidatepaths.append(os.path.join(tdedir,"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('tdeapplication.h',canidatepaths)
-             if self.kde_inc_dir is None:
-                 raise SystemExit, "Failed to find the KDE header file directory."
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0-python_tqt.patch b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0-python_tqt.patch
deleted file mode 100644
index bcd6156df..000000000
--- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0-python_tqt.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- pytdeextensions/src/qtuicompiler.py.ORI	2013-12-28 17:06:51.749357267 +0100
-+++ pytdeextensions/src/qtuicompiler.py	2013-12-28 17:07:03.539275908 +0100
-@@ -17,7 +17,7 @@
- 
- import os
- import sys
--import pyqtconfig
-+from python_tqt import pyqtconfig
- from distutils.spawn import *
- import traceback
- 
---- pytdeextensions/src/kdedistutils.py.ORI2	2013-12-28 17:20:38.828670001 +0100
-+++ pytdeextensions/src/kdedistutils.py	2013-12-28 17:21:04.731492545 +0100
-@@ -930,8 +930,8 @@
-     }
- 
-     // Inject a helper function
--    TQString bridge = TQString("import sip\n" 
--                            "import qt\n"
-+    TQString bridge = TQString("from sip4_tqt import sip\n" 
-+                            "from python_tqt import qt\n"
-                             "def kcontrol_bridge_" FACTORY "(parent,name):\n"
-                              "    if parent!=0:\n"
- #if SIP_VERSION >= 0x040200
-@@ -2019,7 +2019,7 @@
-             self.announce("Found Qt version %s." % qtver)
-         try:
-             self.announce("Checking for a working PyQt...")
--            import qt
-+            from python_tqt import qt
-             self.announce("  ...PyQt is working")
-         except:
-             raise SystemExit, "Couldn't import Qt! Please make sure that PyQt is installed and working."
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0-tqt.patch b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0-tqt.patch
deleted file mode 100644
index 7b004d8c5..000000000
--- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0-tqt.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- pytdeextensions/src/kdedistutils.py.ORI	2013-12-28 14:50:50.209401866 +0100
-+++ pytdeextensions/src/kdedistutils.py	2013-12-28 15:36:18.381316251 +0100
-@@ -892,7 +892,7 @@
-     return NULL;
- }
- 
--static TDECModule* return_instance( QWidget *parent, const char *name ) {
-+static TDECModule* return_instance( TQWidget *parent, const char *name ) {
-     TDECModule* tdecmodule;
-     PyObject *pyTDECModuleTuple; 
-     PyObject *pyTDECModule;
-@@ -901,7 +901,7 @@
-     
-     // Try to determine what py script we're loading. Note that "name"
-     // typically appears to be NULL.
--    QString script(MODULE_NAME);
-+    TQString script(MODULE_NAME);
- 
-     // Reload libpython, but this time tell the runtime linker to make the
-     // symbols global and available for later loaded libraries/module.
-@@ -914,8 +914,8 @@
-     }
-     
-     // Add the path to the python script to the interpreter search path.
--    QString path = QString(MODULE_DIR);
--    if(path == QString::null) {
-+    TQString path = TQString(MODULE_DIR);
-+    if(path == TQString::null) {
-         return report_error ("***Failed to locate script path");
-     }
-     if(!pyize->appendToSysPath (path.latin1 ())) {
-@@ -930,14 +930,14 @@
-     }
- 
-     // Inject a helper function
--    QString bridge = QString("import sip\n" 
-+    TQString bridge = TQString("import sip\n" 
-                             "import qt\n"
-                             "def kcontrol_bridge_" FACTORY "(parent,name):\n"
-                              "    if parent!=0:\n"
- #if SIP_VERSION >= 0x040200
--                             "        wparent = sip.wrapinstance(parent,qt.QWidget)\n"
-+                             "        wparent = sip.wrapinstance(parent,qt.TQWidget)\n"
- #else                             
--                             "        wparent = sip.wrapinstance(parent,'QWidget')\n"
-+                             "        wparent = sip.wrapinstance(parent,'TQWidget')\n"
- #endif
-                              "    else:\n"
-                              "        wparent = None\n"
-@@ -997,7 +997,7 @@
- 
- extern "C" {
-     // Factory function that kcontrol will call.
--    TDECModule* CPP_FACTORY(QWidget *parent, const char *name) {
-+    TDECModule* CPP_FACTORY(TQWidget *parent, const char *name) {
-         return return_instance(parent, name);
-     }
- }