Update of /cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/x11
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25855/10.4/main/finkinfo/x11
Modified Files:
qt3.info qt3.patch
Log Message:
more misc updates, koffice 1.5 rc1
Index: qt3.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/x11/qt3.info,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- qt3.info 24 Mar 2006 16:02:19 -0000 1.28
+++ qt3.info 26 Mar 2006 23:18:28 -0000 1.29
@@ -168,7 +168,7 @@
#### COMPATIBILITY WITH OLD QT3 PACKAGES ####
- # set up symlinks for compatibility with old packages
+ # set up symlinks for compatibility with some old packages
# %p/bin
install -d -m 0755 %i/bin
@@ -188,22 +188,6 @@
install -d -m 0755 %i/lib/pkgconfig
ln -sf %p/lib/qt3/lib/pkgconfig/qt-mt.pc %i/lib/pkgconfig/
- # %p/share/qt3
- for dir in mkspecs phrasebooks templates translations; do
- install -d -m 0755 %i/share/qt3/$dir
- for sub in `cd %i/lib/qt3/$dir; ls`; do
- ln -sf %p/lib/qt3/$dir/$sub %i/share/qt3/$dir/$sub
- done
- done
-
- # %p/lib/qt3-plugins
- for dir in `cd %i/lib/qt3/plugins; ls`; do
- install -d -m 755 %i/lib/qt3-plugins/$dir
- for pluginfile in `cd %i/lib/qt3/plugins/$dir; ls`; do
- ln -sf %p/lib/qt3/plugins/$dir/$pluginfile
%i/lib/qt3-plugins/$dir/$pluginfile
- done
- done
-
# %p/lib/qt3/doc
ln -sf %p/share/doc/%N %i/lib/qt3/doc
@@ -279,8 +263,6 @@
lib/qt3/lib/libqt-mt.*.dylib
lib/qt3/lib/libeditor.*.dylib
lib/qt3/lib/libqui.*.dylib
- lib/qt3-plugins/imageformats
- lib/qt3-plugins/sqldrivers
lib/qt3/plugins/imageformats
lib/qt3/plugins/sqldrivers
<<
@@ -303,7 +285,6 @@
share/qt3/templates
lib/qt3/bin/designer
lib/qt3/lib/libdesigner*
- lib/qt3-plugins/designer
lib/qt3/plugins/designer
lib/qt3/templates
<<
Index: qt3.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.4/main/finkinfo/x11/qt3.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- qt3.patch 24 Mar 2006 16:02:19 -0000 1.30
+++ qt3.patch 26 Mar 2006 23:18:28 -0000 1.31
@@ -540,3 +540,51 @@
+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 )) {
-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
