[csw-devel] SF.net SVN: gar:[19417] csw/mgar/pkg/qt4-gcc/trunk
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Thu Oct 11 09:26:16 CEST 2012
Revision: 19417
http://gar.svn.sourceforge.net/gar/?rev=19417&view=rev
Author: cgrzemba
Date: 2012-10-11 07:26:15 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
qt4-gcc/trunk: rebuild because: -
- ld.so.1: librecad: Schwerer Fehler: libgcc_s.so.1: Version 'GCC_4.0.0' not found
- bump minor version 4.8.1
Modified Paths:
--------------
csw/mgar/pkg/qt4-gcc/trunk/Makefile
csw/mgar/pkg/qt4-gcc/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/qt4-gcc/trunk/files/no-xshape.patch
csw/mgar/pkg/qt4-gcc/trunk/files/qt-dbus-const.diff
Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-10-11 06:05:00 UTC (rev 19416)
+++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-10-11 07:26:15 UTC (rev 19417)
@@ -1,7 +1,7 @@
# $Id$
NAME = qt
-VERSION = 4.8.0
+VERSION = 4.8.1
GARTYPE = v2
CATEGORIES = lib
@@ -23,7 +23,14 @@
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
PATCHFILES += mkspec-csw.patch
+# Solaris10 XShape is too old, has no ShapeInput and QTBUG-25281
+PATCHFILES += no-xshape.patch
+REINPLACE_USRLOCAL += src/gui/kernel/qguiplatformplugin.cpp
+REINPLACE_USRLOCAL += src/network/ssl/qsslsocket_openssl_symbols.cpp
+# replace SSL cert location
+REINPLACE_USRLOCAL += src/network/ssl/qsslsocket.cpp
+
# http://wiki.opencsw.org/porting-faq#toc9
EXTRA_CFLAGS = -DSUN_OGL_NO_VERTEX_MACROS
EXTRA_CXXFLAGS = -DSUN_OGL_NO_VERTEX_MACROS
@@ -37,6 +44,8 @@
CONFIGURE_ARGS += -qt-libjpeg -qt-libpng -qt-libmng -qt-zlib
CONFIGURE_ARGS += -I/usr/include -I/usr/X11/include
CONFIGURE_ARGS += -I/usr/X11/share/include
+# Solaris10 XShape is too old, has no ShapeInput
+CONFIGURE_ARGS += -no-xshape
CONFIGURE_ARGS_sparc += -big-endian -host-big-endian
# CONFIGURE_ARGS_i386 += -little-endian -host-big-endian
CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
@@ -50,9 +59,9 @@
PACKAGES += CSWlibqtcore4-gxx
PKGFILES_CSWlibqtcore4-gxx += $(call baseisadirs,$(libdir),libQtCore\.so\.4(\.\d+)*)
SPKG_DESC_CSWlibqtcore4-gxx += $(DESCRIPTION), libQtCore.so.4
-RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibgthread2-0-0
+# RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibgthread2-0-0
RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibintl8
+# RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibstdc++6
RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibgcc-s1
@@ -61,19 +70,18 @@
CATALOGNAME_CSWlibqtgui4-gxx = libqtgui4_gxx
PKGFILES_CSWlibqtgui4-gxx += $(call baseisadirs,$(libdir),libQtGui\.so\.4(\.\d+)*)
SPKG_DESC_CSWlibqtgui4-gxx += $(DESCRIPTION), libQtGui.so.4
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibintl8
+# RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgthread2-0-0
+# RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibintl8
RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibxrender
RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibstdc++6
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_sparc += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_sparc += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_sparc += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += $(RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_$(GARCH))
-CHECKPKG_OVERRIDES_CSWlibqtgui4-gxx += file-with-bad-content|/usr/local|root/opt/csw/gxx/lib/libQtGui.so.4.8.0
-CHECKPKG_OVERRIDES_CSWlibqtgui4-gxx += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtGui.so.4.8.0
+RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibfreetype6
+# 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
SPKG_DESC_CSWqt4-gxx-dev += $(DESCRIPTION), development files
@@ -103,28 +111,29 @@
RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtsvg4-gxx
RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibphonon4-gxx
RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtsql4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgmodule2-0-0
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibintl8
+# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgthread2-0-0
+# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgmodule2-0-0
+# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibintl8
RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWgstreamer
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibxrender
+# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibxrender
RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgobject2-0-0
RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWmesa
RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibstdc++6
RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibxml2-2
+# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibxml2-2
RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWgstplugins
RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibsybdb5
+# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibsybdb5
RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWsqlite
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibpq5
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibodbc2
+# 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_sparc += CSWlibfontconfig1
RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_sparc += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += $(RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_$(GARCH))
# These are code examples.
CHECKPKG_OVERRIDES_CSWqt4-gxx-dev += binary-architecture-does-not-match-placement
+
# REFINE this later!
CHECKPKG_OVERRIDES_CSWqt4-gxx-dev += file-with-bad-content
CHECKPKG_OVERRIDES_CSWqt4-gxx-dev += discouraged-path-in-pkgmap
@@ -156,8 +165,8 @@
RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibstdc++6
RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibqtcore4-gxx
-CHECKPKG_OVERRIDES_CSWlibqtnetwork4-gxx += file-with-bad-content|/usr/local|root/opt/csw/gxx/lib/libQtNetwork.so.4.8.0
-CHECKPKG_OVERRIDES_CSWlibqtnetwork4-gxx += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtNetwork.so.4.8.0
+# /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
PKGFILES_CSWlibqtopengl4-gxx += $(call baseisadirs,$(libdir),libQtOpenGL\.so\.4(\.\d+)*)
@@ -227,6 +236,7 @@
RUNTIME_DEP_PKGS_CSWlibqtclucene4-gxx += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWlibqtclucene4-gxx += CSWlibstdc++6
RUNTIME_DEP_PKGS_CSWlibqtclucene4-gxx += CSWlibqtcore4-gxx
+RUNTIME_DEP_PKGS_CSWlibqtclucene4-gxx += CSWlibqtdbus4-gxx
PACKAGES += CSWlibqtdbus4-gxx
PKGFILES_CSWlibqtdbus4-gxx += $(call baseisadirs,$(libdir),libQtDBus\.so\.4(\.\d+)*)
@@ -283,3 +293,9 @@
CHECKPKG_OVERRIDES_CSWqt4-gxx-doc += file-with-bad-content
include gar/category.mk
+
+# pre-reconfigure-modulated:
+# cd $(WORKSRC) && gmake confclean
+# @$(MAKECOOKIE)
+
+PATH:=$(PATH):/opt/csw/gcc4/bin
Modified: csw/mgar/pkg/qt4-gcc/trunk/checksums
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/checksums 2012-10-11 06:05:00 UTC (rev 19416)
+++ csw/mgar/pkg/qt4-gcc/trunk/checksums 2012-10-11 07:26:15 UTC (rev 19417)
@@ -1 +1 @@
-e8a5fdbeba2927c948d9f477a6abe904 qt-everywhere-opensource-src-4.8.0.tar.gz
+7960ba8e18ca31f0c6e4895a312f92ff qt-everywhere-opensource-src-4.8.1.tar.gz
Added: csw/mgar/pkg/qt4-gcc/trunk/files/no-xshape.patch
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/files/no-xshape.patch (rev 0)
+++ csw/mgar/pkg/qt4-gcc/trunk/files/no-xshape.patch 2012-10-11 07:26:15 UTC (rev 19417)
@@ -0,0 +1,48 @@
+--- a/src/gui/kernel/qdnd_x11.cpp
++++ b/src/gui/kernel/qdnd_x11.cpp
+@@ -1422,6 +1422,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 +1437,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 +1464,7 @@ 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);
++#ifndef 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;
+@@ -1489,9 +1495,11 @@ Window findRealWindow(const QPoint & pos, Window w, int md)
+ }
+
+ // No children!
++#ifndef QT_NO_SHAPE
+ if (!windowContainsMouse)
+ return 0;
+ else
++#endif
+ return w;
+ }
+ }
Added: csw/mgar/pkg/qt4-gcc/trunk/files/qt-dbus-const.diff
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/files/qt-dbus-const.diff (rev 0)
+++ csw/mgar/pkg/qt4-gcc/trunk/files/qt-dbus-const.diff 2012-10-11 07:26:15 UTC (rev 19417)
@@ -0,0 +1,11 @@
+--- src/dbus/qdbusintegrator.cpp.orig 2011-03-12 02:11:32.313467991 +0100
++++ src/dbus/qdbusintegrator.cpp 2011-03-12 02:11:03.795809176 +0100
+@@ -71,7 +71,7 @@
+ static bool isDebugging;
+ #define qDBusDebug if (!::isDebugging); else qDebug
+
+-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
++Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
+
+ static inline QString dbusServiceString()
+ { return *orgFreedesktopDBusString(); }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list