[csw-devel] SF.net SVN: gar:[19880] csw/mgar/pkg/qt4-gcc/trunk

[cgrzemba at users.sourceforge.net]

Revision: 19880
          http://gar.svn.sourceforge.net/gar/?rev=19880&view=rev
Author:   cgrzemba
Date:     2012-12-11 10:11:57 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
qt4-gcc/trunk: adjust versions of dependencies

Modified Paths:
--------------
    csw/mgar/pkg/qt4-gcc/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/qt4-gcc/trunk/files/0001-shapeinput.patch

Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/Makefile	2012-12-11 09:45:30 UTC (rev 19879)
+++ csw/mgar/pkg/qt4-gcc/trunk/Makefile	2012-12-11 10:11:57 UTC (rev 19880)
@@ -19,11 +19,17 @@
 
 LICENSE = README
 
+NOGITPATCH = 1
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
+REINPLACE_USRLOCAL += src/gui/kernel/qguiplatformplugin.cpp 
+REINPLACE_USRLOCAL += src/network/ssl/qsslsocket_openssl_symbols.cpp
+REINPLACE_USRLOCAL += src/network/ssl/qsslsocket_openssl.cpp
+REINPLACE_USRLOCAL += src/network/ssl/qsslsocket.cpp
+REINPLACE_USRLOCAL += src/3rdparty/webkit/Source/WebCore/plugins/PluginDatabase.cpp
 PATCHFILES += mkspec-csw.patch
-# Solaris10 XShape is too old, has no ShapeInput and QTBUG-25281
-PATCHFILES += no-xshape.patch
+# bug in 4.8.1, see: https//bugreports.qt-project.org/browse/QTBUG-25281
+PATCHFILES += 0001-shapeinput.patch
 
 REINPLACE_USRLOCAL += src/gui/kernel/qguiplatformplugin.cpp
 REINPLACE_USRLOCAL += src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -38,6 +44,7 @@
 CONFIGURE_ARGS += -opensource
 CONFIGURE_ARGS += -prefix $(prefix)
 CONFIGURE_ARGS += -no-qt3support
+CONFIGURE_ARGS += -no-xshape
 CONFIGURE_ARGS += -webkit
 CONFIGURE_ARGS += -v -shared -stl -largefile -sm 
 CONFIGURE_ARGS += -qt-libjpeg -qt-libpng -qt-libmng -qt-zlib 
@@ -76,10 +83,10 @@
 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_sparc += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_sparc += CSWlibfontconfig1
 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibfreetype6
-# RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += $(RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_$(GARCH))
+RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += $(RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_$(GARCH))
 CHECKPKG_OVERRIDES_CSWlibqtgui4-gxx += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtGui.so.4.8.1
 
 PACKAGES += CSWqt4-gxx-dev
@@ -127,6 +134,7 @@
 # RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibpq5
 # RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibodbc2
 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibtiff3
+RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibmysqlclient18
 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_sparc += CSWlibfontconfig1
 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_sparc += CSWlibfreetype6
 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += $(RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_$(GARCH))
@@ -164,7 +172,6 @@
 RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibqtcore4-gxx
-# /usr/share is useless but ok
 CHECKPKG_OVERRIDES_CSWlibqtnetwork4-gxx += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtNetwork.so.4.8.1
 
 PACKAGES += CSWlibqtopengl4-gxx

Added: csw/mgar/pkg/qt4-gcc/trunk/files/0001-shapeinput.patch
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/files/0001-shapeinput.patch	                        (rev 0)
+++ csw/mgar/pkg/qt4-gcc/trunk/files/0001-shapeinput.patch	2012-12-11 10:11:57 UTC (rev 19880)
@@ -0,0 +1,53 @@
+diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp
+index c4d2469..5f77c14 100644
+--- a/src/gui/kernel/qdnd_x11.cpp
++++ b/src/gui/kernel/qdnd_x11.cpp
+@@ -1421,7 +1421,7 @@ void QDragManager::cancel(bool deleteSource)
+ 
+     global_accepted_action = Qt::IgnoreAction;
+ }
+-
++#ifndef QT_NO_SHAPE
+ static
+ bool windowInteractsWithPosition(const QPoint & pos, Window w, int shapeType)
+ {
+@@ -1436,6 +1436,7 @@ bool windowInteractsWithPosition(const QPoint & pos, Window w, int shapeType)
+     }
+     return interacts;
+ }
++#endif
+ 
+ static
+ Window findRealWindow(const QPoint & pos, Window w, int md)
+@@ -1462,6 +1463,8 @@ Window findRealWindow(const QPoint & pos, Window w, int md)
+                 XGetWindowProperty(X11->display, w, ATOM(XdndAware), 0, 0, False,
+                                    AnyPropertyType, &type, &f,&n,&a,&data);
+                 if (data) XFree(data);
++
++#ifdef QT_NO_SHAPE
+                 if (type) {
+                     // When ShapeInput and ShapeBounding are not set they return a single rectangle with the geometry of the window, this is why we
+                     // need an && here so that in the case one is set and the other is not we still get the correct result.
+@@ -1469,6 +1472,9 @@ Window findRealWindow(const QPoint & pos, Window w, int md)
+                     if (windowContainsMouse)
+                         return w;
+                 }
++#else
++		return w;
++#endif
+             }
+ 
+             Window r, p;
+@@ -1488,10 +1494,12 @@ Window findRealWindow(const QPoint & pos, Window w, int md)
+                 // innermost window.
+             }
+ 
++#ifdef QT_NO_SHAPE
+             // No children!
+             if (!windowContainsMouse)
+                 return 0;
+             else
++#endif
+                 return w;
+         }
+     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.