packages: qt/qt.spec, qt/qt-trinity.patch (NEW) - add Trinity patch

[cactus]

Author: cactus                       Date: Sat Apr 23 21:07:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add Trinity patch

---- Files affected:
packages/qt:
   qt.spec (1.407 -> 1.408) , qt-trinity.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/qt/qt.spec
diff -u packages/qt/qt.spec:1.407 packages/qt/qt.spec:1.408
--- packages/qt/qt.spec:1.407	Wed Apr 13 23:28:32 2011
+++ packages/qt/qt.spec	Sat Apr 23 23:07:27 2011
@@ -100,6 +100,7 @@
 Patch19:	qt-buildkey-fixed.patch
 Patch20:	%{name}-gcc46.patch
 Patch21:	%{name}-odbc.patch
+Patch22:	%{name}-trinity.patch
 URL:		http://www.trolltech.com/products/qt/
 %{?with_ibase:BuildRequires:	Firebird-devel >= 1.5.0}
 BuildRequires:	OpenGL-GLU-devel
@@ -748,6 +749,7 @@
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p2
 
 # copy qt kde integration files
 cp %{SOURCE8} %{SOURCE9} src/kernel
@@ -1352,6 +1354,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.408  2011/04/23 21:07:27  cactus
+- add Trinity patch
+
 Revision 1.407  2011/04/13 21:28:32  cactus
 - add gcc46 patch and odbc patch
 

================================================================
Index: packages/qt/qt-trinity.patch
diff -u /dev/null packages/qt/qt-trinity.patch:1.1
--- /dev/null	Sat Apr 23 23:07:32 2011
+++ packages/qt/qt-trinity.patch	Sat Apr 23 23:07:27 2011
@@ -0,0 +1,64 @@
+diff -ur qt3.orig/qt-x11-free-3.3.8-b/include/qobject.h qt3.new/qt-x11-free-3.3.8-b/include/qobject.h
+--- qt3.orig/qt-x11-free-3.3.8-b/include/qobject.h	2008-01-15 13:09:13.000000000 -0600
++++ qt3.new/qt-x11-free-3.3.8-b/include/qobject.h	2011-01-01 18:33:19.715656496 -0600
+@@ -101,8 +101,11 @@
+ 
+     QObject           *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); //### const in 4.0
+     const QObjectList *children() const { return childObjects; }
++    QObjectList childrenListObject();
++    const QObjectList childrenListObject() const;
+ 
+     static const QObjectList *objectTrees();
++    static const QObjectList objectTreesListObject();
+ 
+     QObjectList	      *queryList( const char *inheritsClass = 0,
+ 				  const char *objName = 0,
+diff -ur qt3.orig/qt-x11-free-3.3.8-b/src/kernel/qobject.cpp qt3.new/qt-x11-free-3.3.8-b/src/kernel/qobject.cpp
+--- qt3.orig/qt-x11-free-3.3.8-b/src/kernel/qobject.cpp	2008-01-15 13:09:13.000000000 -0600
++++ qt3.new/qt-x11-free-3.3.8-b/src/kernel/qobject.cpp	2011-01-01 18:28:16.191270264 -0600
+@@ -360,6 +360,30 @@
+     }
+ }
+ 
++/*! \internal
++    TQt compatibility function
++*/
++QObjectList QObject::childrenListObject() {
++	if (children()) return *(children());
++	else return QObjectList();
++}
++
++/*! \internal
++    TQt compatibility function
++*/
++const QObjectList QObject::childrenListObject() const {
++	if (children()) return *(children());
++	else return QObjectList();
++}
++
++/*! \internal
++    TQt compatibility function
++*/
++const QObjectList QObject::objectTreesListObject() {
++	if (objectTrees()) return *(objectTrees());
++	else return QObjectList();
++}
++
+ 
+ /*****************************************************************************
+   QObject member functions
+diff -ur qt3.orig/qt-x11-free-3.3.8-b/src/kernel/qobject.h qt3.new/qt-x11-free-3.3.8-b/src/kernel/qobject.h
+--- qt3.orig/qt-x11-free-3.3.8-b/src/kernel/qobject.h	2008-01-15 13:09:13.000000000 -0600
++++ qt3.new/qt-x11-free-3.3.8-b/src/kernel/qobject.h	2011-01-01 18:33:19.715656496 -0600
+@@ -101,8 +101,11 @@
+ 
+     QObject           *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); //### const in 4.0
+     const QObjectList *children() const { return childObjects; }
++    QObjectList childrenListObject();
++    const QObjectList childrenListObject() const;
+ 
+     static const QObjectList *objectTrees();
++    static const QObjectList objectTreesListObject();
+ 
+     QObjectList	      *queryList( const char *inheritsClass = 0,
+ 				  const char *objName = 0,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt/qt.spec?r1=1.407&r2=1.408&f=u