Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/x11
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15537/common/main/finkinfo/x11
Modified Files:
qt3.info qt3.patch
Log Message:
testing rearranging plugins
Index: qt3.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/x11/qt3.info,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- qt3.info 4 Apr 2006 21:45:07 -0000 1.51
+++ qt3.info 10 Apr 2006 16:26:54 -0000 1.52
@@ -1,6 +1,6 @@
Package: qt3
Version: 3.3.6
-Revision: 3
+Revision: 4
GCC: 3.3
CustomMirror: <<
Primary: ftp://ftp.trolltech.com/qt/source
@@ -271,6 +271,19 @@
<<
PostInstScript: <<
/usr/X11R6/bin/fc-cache >/dev/null 2>&1 || :
+ if [ -d %p/lib/qt3-plugins ] && [ ! -L %p/lib/qt3-plugins ];
then
+ if rsync -arL %p/lib/qt3-plugins/ %p/lib/qt3/plugins/;
then
+ rm -rf %p/lib/qt3-plugins
+ ln -sf %p/lib/qt3/plugins %p/lib/qt3-plugins
+ else
+ cat <<END;
+WARNING: I was unable to copy your plugins from the (deprecated)
+%p/lib/qt3-plugins directory into %p/lib/qt3/plugins.
+
+Some Qt applications may not work as expected.
+END
+ fi
+ fi
<<
<<
SplitOff2: <<
Index: qt3.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/x11/qt3.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- qt3.patch 27 Mar 2006 22:30:24 -0000 1.39
+++ qt3.patch 10 Apr 2006 16:26:54 -0000 1.40
@@ -540,55 +540,6 @@
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
REQUIRES=full-config nocrosscompiler !win32*
---- qt-x11-free-3.3.6/qmake/project.cpp 2006-03-08 11:48:02.000000000
-0500
-+++ qt-x11-free-3.3.6-new/qmake/project.cpp 2006-03-25 11:02:35.000000000
-0500
-@@ -95,6 +95,7 @@
- #if defined(HAVE_QCONFIG_CPP)
- ret << (qInstallPathData() + concat);
- #endif
-+ ret << ("@PREFIX@/share/qt3" + concat);
-
- /* prefer $QTDIR if it is set */
- if (getenv("QTDIR"))
-@@ -936,6 +937,7 @@
- #if defined(HAVE_QCONFIG_CPP)
- feature_roots << (qInstallPathData() + concat);
- #endif
-+ feature_roots << ("@PREFIX@/share/qt3" + concat);
- for(QStringList::Iterator it = feature_roots.begin(); it !=
feature_roots.end(); ++it) {
- QString prf = (*it) + QDir::separator() + file;
- if(QFile::exists(prf)) {
---- qt-x11-free-3.3.6/src/kernel/qapplication.cpp 2006-03-08
11:47:50.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/kernel/qapplication.cpp 2006-03-25
10:56:45.000000000 -0500
-@@ -1726,6 +1726,7 @@
- installPathPlugins.replace('\\', '/');
- #endif
- app_libpaths->append(installPathPlugins);
-+ app_libpaths->append("@PREFIX@/lib/qt3-plugins");
- }
-
- QString app_location;
---- qt-x11-free-3.3.6/tools/designer/designer/mainwindowactions.cpp
2005-08-31 06:13:47.000000000 -0400
-+++ qt-x11-free-3.3.6-new/tools/designer/designer/mainwindowactions.cpp
2006-03-25 11:03:35.000000000 -0500
-@@ -1446,6 +1446,7 @@
- templRoots << qInstallPathData();
- if(qtdir) //try the tools/designer directory last!
- templRoots << (QString(qtdir) + "/tools/designer");
-+ templRoots << "@PREFIX@/share/qt3";
- QFile f;
- for ( QStringList::Iterator it = templRoots.begin(); it !=
templRoots.end(); ++it ) {
- if ( QFile::exists( (*it) + "/templates/" )) {
---- qt-x11-free-3.3.6/tools/designer/designer/newformimpl.cpp 2005-08-31
06:13:47.000000000 -0400
-+++ qt-x11-free-3.3.6-new/tools/designer/designer/newformimpl.cpp
2006-03-25 11:03:56.000000000 -0500
-@@ -285,6 +285,7 @@
- templRoots << qInstallPathData();
- if(qtdir) //try the tools/designer directory last!
- templRoots << (QString(qtdir) + "/tools/designer");
-+ templRoots << "@PREFIX@/share/qt3";
- for ( QStringList::Iterator it = templRoots.begin(); it !=
templRoots.end(); ++it ) {
- QString path = (*it) + "/templates";
- if ( QFile::exists( path )) {
-diff -uNr qt-x11-free-3.3.6/src/tools/qsettings.cpp
qt-x11-free-3.3.6-new/src/tools/qsettings.cpp
--- qt-x11-free-3.3.6/src/tools/qsettings.cpp 2006-03-08 11:47:37.000000000
-0500
+++ qt-x11-free-3.3.6-new/src/tools/qsettings.cpp 2006-03-25
13:55:36.000000000 -0500
@@ -981,7 +981,7 @@
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
