Menu
▾
▴
CVS: shared-libraries/splitoff qt-3.0.2-1.info,NONE,1.1 qt-3.0.2-1.patch,NONE,1.1 qt-3.0.1-2.info,1.1,NONE qt-3.0.1-2.patch,1.1,NONE
|
From: Justin <th...@us...> - 2002-03-20 21:56:24
|
Update of /cvsroot/fink/shared-libraries/splitoff In directory usw-pr-cvs1:/tmp/cvs-serv13731 Added Files: qt-3.0.2-1.info qt-3.0.2-1.patch Removed Files: qt-3.0.1-2.info qt-3.0.1-2.patch Log Message: New upstream version --- NEW FILE: qt-3.0.2-1.info --- Package: qt Version: 3.0.2 Revision: 1 Source: ftp://ftp.trolltech.com/qt/source/%n-x11-free-%v.tar.gz SourceDirectory: %n-%v Description: Cross-Platform GUI application framework. Depends: dlcompat, libgl, %N-shlibs (= %v-%r) BuildDepends: libpng, libjpeg BuildDependsOnly: true SourceDirectory: %n-x11-free-%v PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1 CompileScript: << (export QTDIR=`pwd`; ./configure -no-g++-exceptions -no-stl -thread -shared -system-zlib -system-libpng -system-libjpeg -sm -xft -xrender -xkb -xinerama -qt-gif -plugin-imgfmt-png -qt-imgfmt-png -plugin-imgfmt-jpeg -qt-imgfmt-jpeg -plugin-imgfmt-mng -qt-imgfmt-mng -prefix '$(INSTALLPREFIX)/share/qt' -bindir '$(INSTALLPREFIX)/bin' -docdir '$(INSTALLPREFIX)/share/doc/%n/html' -headerdir '$(INSTALLPREFIX)/include' -libdir '$(INSTALLPREFIX)/lib') (cd src; mv Makefile Makefile.orig; cat Makefile.orig | sed -e s,libqt-mt.dylib.3.0.2,libqt-mt.3.0.2.dylib, -e s,libqt-mt.dylib.3.0,libqt-mt.3.0.dylib, -e s,libqt-mt.dylib.3,libqt-mt.3.dylib, > Makefile; rm -f Makefile.orig) (cd tools/designer/uilib; mv Makefile Makefile.orig; cat Makefile.orig | sed -e s,libqui.dylib.1.0.0,libqui.1.0.0.dylib, -e s,libqui.dylib.1.0,libqui.1.0.dylib, -e s,libqui.dylib.1,libqui.1.dylib, > Makefile; rm -f Makefile.orig) (cd tools/designer/editor; mv Makefile Makefile.orig; cat Makefile.orig | sed -e s,libeditor.dylib.1.0.0,libeditor.1.0.0.dylib, -e s,libeditor.dylib.1.0,libeditor.1.0.dylib, -e s,libeditor.dylib.1,libeditor.1.dylib, > Makefile; rm -f Makefile.orig) (cd lib; for i in *; do cat $i | sed -e s,libqt-mt.dylib.3.0.1,libqt-mt.3.0.1.dylib, -e s,libeditor.dylib.1.0.0,libeditor.1.0.0.dylib, -e s,libqnp.dylib.0.3.0,libqnp.0.3.0.dylib, -e s,libqui.dylib.1.0.0,libqui.1.0.0.dylib, -e s,libqxt.dylib.0.3.0,libqxt.0.3.0.dylib, > $i.tmp; mv $i.tmp $i; done) (export QTDIR=`pwd`; export DYLD_LIBRARY_PATH=`pwd`/lib; make) << InstallScript: << (cd include; mv qconfig.h qconfig.h.orig; sed 's|$(INSTALLPREFIX)|%p|' < qconfig.h.orig > qconfig.h; rm qconfig.h.orig) (cd src; mv Makefile Makefile.orig; sed 's|ln -sf $(INSTALLPREFIX)/lib/$(TARGET) $(INSTALLPREFIX)/lib/|cd $(INSTALLPREFIX)/lib; ln -sf %p/lib/$(TARGET) |g' < Makefile.orig > Makefile; rm Makefile.orig) (cd tools/designer/editor; mv Makefile Makefile.orig; sed 's|ln -sf $(INSTALLPREFIX)/lib/$(TARGET) $(INSTALLPREFIX)/lib/|cd $(INSTALLPREFIX)/lib; ln -sf %p/lib/$(TARGET) |g' < Makefile.orig > Makefile; rm Makefile.orig) (cd tools/designer/uilib; mv Makefile Makefile.orig; sed 's|ln -sf $(INSTALLPREFIX)/lib/$(TARGET) $(INSTALLPREFIX)/lib/|cd $(INSTALLPREFIX)/lib; ln -sf %p/lib/$(TARGET) |g' < Makefile.orig > Makefile; rm Makefile.orig) mkdir -p %i/share/qt (export QTDIR=`pwd`; make install INSTALLPREFIX=%i) mkdir -p %i/etc/profile.d install -m 755 qt.sh %i/etc/profile.d/ install -m 755 qt.csh %i/etc/profile.d/ cp -R examples tutorial %i/share/qt echo *** Fixing Symbolic Links *** rm -rf %i/lib/libeditor.dylib rm -rf %i/lib/libeditor.1.dylib rm -rf %i/lib/libeditor.1.0.dylib rm -rf %i/lib/libqui.dylib rm -rf %i/lib/libqui.1.dylib rm -rf %i/lib/libqui.1.0.dylib rm -rf %i/lib/libqt-mt.dylib rm -rf %i/lib/libqt-mt.3.dylib rm -rf %i/lib/libqt-mt.3.0.dylib ln -s %p/lib/libeditor.1.0.0.dylib %i/lib/libeditor.1.dylib ln -s %p/lib/libeditor.1.0.0.dylib %i/lib/libeditor.dylib ln -s %p/lib/libqt-mt.3.0.2.dylib %i/lib/libqt-mt.3.dylib ln -s %p/lib/libqt-mt.3.0.2.dylib %i/lib/libqt-mt.dylib ln -s %p/lib/libqui.1.0.0.dylib %i/lib/libqui.1.dylib ln -s %p/lib/libqui.1.0.0.dylib %i/lib/libqui.dylib mkdir %i/lib/prl mv %i/lib/*.prl %i/lib/prl for i in %i/lib/prl/*; do cat $i | sed -e s,%i,%p/share/qt/, > $i; done mv %i/lib/prl/*.prl %i/lib rm -rf %i/lib/prl << SplitOff: << Package: %N-shlibs Replaces: %N (<< 3.0.2-2) Suggests: %N-bin Files: lib/libqt-mt.3.dylib lib/libqt-mt.3.0.2.dylib lib/libeditor.1.dylib lib/libeditor.1.0.0.dylib lib/libqui.1.dylib lib/libqui.1.0.0.dylib DocFiles: ANNOUNCE INSTALL FAQ LICENSE.GPL LICENSE.QPL PLATFORMS MANIFEST README.QT README changes-%v << SplitOff2: << Package: %N-doc Files: share/qt/tutorial/ share/qt/tools/ share/qt/plugins/ share/qt/mkspecs/ share/qt/examples/ share/doc/qt/html/ DocFiles: LICENSE.GPL LICENSE.QPL README.QT README << SplitOff3: << Package: %N-bin Replaces: %N (<< 3.0.2-2) Depends: %N-shlibs (= %v-%r) Files: bin/ DocFiles: LICENSE.GPL LICENSE.QPL README.QT README << DocFiles: LICENSE.GPL LICENSE.QPL README.QT README DescPort: << Uses a custom configure script. Patch adds config files to build under Darwin, identifies OS as FreeBSD to prevent building of QtMac stuff (which is not available in the free version). unixmake.cpp patched so QMAKE_INCDIR, QMAKE_LIBDIR put at end of INCPATH (instead of beginning). This prevents old qt headers and libs (installed in %p/include and and %p/lib) from being used. Added -no-g++-exceptions -no-stl to configure line to speed qt up. << License: GPL Maintainer: Jeffrey Whitaker <js...@cd...> Homepage: http://www.trolltech.com/ --- NEW FILE: qt-3.0.2-1.patch --- diff -ruN qt-x11-free-3.0.2.orig/Makefile qt-x11-free-3.0.2/Makefile --- qt-x11-free-3.0.2.orig/Makefile Sun Feb 17 18:06:50 2002 +++ qt-x11-free-3.0.2/Makefile Sun Mar 17 12:09:29 2002 @@ -36,7 +36,7 @@ qmake-install: src-qmake cd qmake && $(MAKE) install -plugins-install: src-plugins +plugins-install: sub-plugins cd plugins/src && $(MAKE) install src-qmake: symlinks FORCE diff -ruN qt-x11-free-3.0.2.orig/configure qt-x11-free-3.0.2/configure --- qt-x11-free-3.0.2.orig/configure Fri Feb 15 01:12:23 2002 +++ qt-x11-free-3.0.2/configure Sun Mar 17 12:14:58 2002 @@ -836,7 +836,7 @@ case "$UNAME_SYSTEM:$UNAME_RELEASE" in Darwin:*) - PLATFORM=macx-g++ + PLATFORM=darwin-g++ # PLATFORM=macx-pbuilder PLATFORM_NOTES=" - Also available for Mac OS X: macx-pbuilder diff -ruN qt-x11-free-3.0.2.orig/include/qconfig.h qt-x11-free-3.0.2/include/qconfig.h --- qt-x11-free-3.0.2.orig/include/qconfig.h Wed Dec 31 17:00:00 1969 +++ qt-x11-free-3.0.2/include/qconfig.h Mon Mar 18 21:50:16 2002 @@ -0,0 +1 @@ +// All features enabled while configuring diff -ruN qt-x11-free-3.0.2.orig/include/qglobal.h qt-x11-free-3.0.2/include/qglobal.h --- qt-x11-free-3.0.2.orig/include/qglobal.h Mon Feb 18 05:46:55 2002 +++ qt-x11-free-3.0.2/include/qglobal.h Thu Mar 14 13:24:05 2002 @@ -77,7 +77,7 @@ */ #if defined(__APPLE__) && defined(__GNUC__) -# define Q_OS_MACX +# define Q_OS_FREEBSD #elif defined(__MACOSX__) # define Q_OS_MACX #elif defined(macintosh) diff -ruN qt-x11-free-3.0.2.orig/include/qmodules.h qt-x11-free-3.0.2/include/qmodules.h --- qt-x11-free-3.0.2.orig/include/qmodules.h Wed Dec 31 17:00:00 1969 +++ qt-x11-free-3.0.2/include/qmodules.h Mon Mar 18 21:50:16 2002 @@ -0,0 +1 @@ +// All modules enabled while configuring diff -ruN qt-x11-free-3.0.2.orig/mkspecs/darwin-g++/qmake.conf qt-x11-free-3.0.2/mkspecs/darwin-g++/qmake.conf --- qt-x11-free-3.0.2.orig/mkspecs/darwin-g++/qmake.conf Wed Dec 31 17:00:00 1969 +++ qt-x11-free-3.0.2/mkspecs/darwin-g++/qmake.conf Sun Mar 17 17:30:52 2002 @@ -0,0 +1,82 @@ +# +# $Id: qt-3.0.1-1.patch,v 1.1 2002/01/01 23:51:16 jswhit Exp $ +# +# qmake configuration for darwin-g++ +# + +MAKEFILE_GENERATOR = UNIX +TEMPLATE = app +CONFIG += qt warn_on release resource_fork + +QMAKE_CC = cc +QMAKE_LEX = flex +QMAKE_LEXFLAGS = +QMAKE_YACC = yacc +QMAKE_YACCFLAGS = -d +QMAKE_CFLAGS = -fno-common -fno-exceptions -pipe +QMAKE_CFLAGS_DEPS = -M +QMAKE_CFLAGS_WARN_ON = -Wall -W +QMAKE_CFLAGS_WARN_OFF = +QMAKE_CFLAGS_RELEASE = -O3 +QMAKE_CFLAGS_DEBUG = -g +QMAKE_CFLAGS_SHLIB = -fPIC +QMAKE_EXTENSION_SHLIB = dylib +QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses +QMAKE_CFLAGS_THREAD = -D_THREAD_SAFE + +QMAKE_CXX = c++ +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS +QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS +QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF +QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG +QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB +QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC +QMAKE_CXXFLAGS_THREAD = -D_THREAD_SAFE + +QMAKE_INCDIR = /sw/include +QMAKE_LIBDIR = /sw/lib +QMAKE_INCDIR_QT = $(QTDIR)/include +QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_X11 = /usr/X11R6/include +QMAKE_LIBDIR_X11 = /usr/X11R6/lib +QMAKE_INCDIR_OPENGL = /usr/X11R6/include +QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib + +QMAKE_LINK = c++ +QMAKE_LINK_SHLIB = c++ +QMAKE_LFLAGS = +QMAKE_LFLAGS_RELEASE = +QMAKE_LFLAGS_DEBUG = +QMAKE_LFLAGS_SHLIB = -dynamiclib -flat_namespace -undefined suppress \ + -install_name $$QMAKE_LIBDIR/$(TARGET) +QMAKE_LFLAGS_PLUGIN = -bundle +QMAKE_LFLAGS_THREAD = +QMAKE_RPATH = + +QMAKE_LIBS = +QMAKE_LIBS_X11 = -lXext -lX11 -lm +QMAKE_LIBS_X11SM = -lICE -lSM +QMAKE_LIBS_QT = -lqt +QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu +QMAKE_LIBS_OPENGL_QT = -lGL -lXmu +QMAKE_LIBS_DYNLOAD = -ldl +QMAKE_LIBS_THREAD = +QMAKE_LIBS_QT = -lqt +QMAKE_LIBS_QT_THREAD = -lqt-mt + + +QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_UIC = $(QTDIR)/bin/uic + +QMAKE_AR = ar cq +QMAKE_RANLIB = ranlib -s + +QMAKE_TAR = tar -cf +QMAKE_GZIP = gzip -9f + +QMAKE_COPY = cp -f +QMAKE_COPY_FILE = $$QMAKE_COPY +QMAKE_COPY_DIR = $$QMAKE_COPY -r +QMAKE_MOVE = mv -f diff -ruN qt-x11-free-3.0.2.orig/mkspecs/darwin-g++/qplatformdefs.h qt-x11-free-3.0.2/mkspecs/darwin-g++/qplatformdefs.h --- qt-x11-free-3.0.2.orig/mkspecs/darwin-g++/qplatformdefs.h Wed Dec 31 17:00:00 1969 +++ qt-x11-free-3.0.2/mkspecs/darwin-g++/qplatformdefs.h Thu Mar 14 13:23:14 2002 @@ -0,0 +1,89 @@ +#ifndef QPLATFORMDEFS_H +#define QPLATFORMDEFS_H + +// Get Qt defines/settings + +#include "qglobal.h" + + +// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs + +#include <unistd.h> + + +// We are hot - unistd.h should have turned on the specific APIs we requested + + +#ifdef QT_THREAD_SUPPORT +#include <pthread.h> +#endif + +#include <ctype.h> +#include <dirent.h> +#include <errno.h> +#include <fcntl.h> +#include <grp.h> +#include <limits.h> +#include <locale.h> +#include <pwd.h> +#include <signal.h> +#include <stdlib.h> +#include <stdio.h> +#include <time.h> + +#include <sys/types.h> +#include <sys/ioctl.h> +#include <sys/ipc.h> +#include <sys/time.h> +#include <sys/shm.h> +#include <sys/socket.h> +#include <sys/stat.h> +#include <sys/wait.h> + +// DNS header files are not fully covered by X/Open specifications. +// In particular nothing is said about res_* :/ +// On BSDs header files <netinet/in.h> and <arpa/nameser.h> are not +// included by <resolv.h>. Note that <arpa/nameser.h> must be included +// before <resolv.h>. +#include <netinet/in.h> +#include <arpa/nameser.h> +#include <resolv.h> + + +#define QT_STATBUF struct stat +#define QT_STATBUF4TSTAT struct stat +#define QT_STAT ::stat +#define QT_FSTAT ::fstat +#define QT_STAT_REG S_IFREG +#define QT_STAT_DIR S_IFDIR +#define QT_STAT_MASK S_IFMT +#define QT_STAT_LNK S_IFLNK +#define QT_FILENO fileno +#define QT_OPEN ::open +#define QT_CLOSE ::close +#define QT_LSEEK ::lseek +#define QT_READ ::read +#define QT_WRITE ::write +#define QT_ACCESS ::access +#define QT_GETCWD ::getcwd +#define QT_CHDIR ::chdir +#define QT_MKDIR ::mkdir +#define QT_RMDIR ::rmdir +#define QT_OPEN_RDONLY O_RDONLY +#define QT_OPEN_WRONLY O_WRONLY +#define QT_OPEN_RDWR O_RDWR +#define QT_OPEN_CREAT O_CREAT +#define QT_OPEN_TRUNC O_TRUNC +#define QT_OPEN_APPEND O_APPEND + +#define QT_SIGNAL_RETTYPE void +#define QT_SIGNAL_ARGS int +#define QT_SIGNAL_IGNORE (void (*)(int))1 + +#define QT_SOCKLEN_T int + +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf + + +#endif // QPLATFORMDEFS_H diff -ruN qt-x11-free-3.0.2.orig/qmake/generators/unix/unixmake.cpp qt-x11-free-3.0.2/qmake/generators/unix/unixmake.cpp --- qt-x11-free-3.0.2.orig/qmake/generators/unix/unixmake.cpp Mon Feb 18 05:46:23 2002 +++ qt-x11-free-3.0.2/qmake/generators/unix/unixmake.cpp Tue Mar 19 18:56:44 2002 @@ -111,10 +111,7 @@ !project->variables()["QMAKE_LIB_FLAG"].isEmpty() && project->isActiveConfig("dll")) project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_PREBIND"]; - if(!project->isEmpty("QMAKE_INCDIR")) - project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"]; - if(!project->isEmpty("QMAKE_LIBDIR")) - project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue( "QMAKE_LIBDIR", " -L", " -L", "" ); + if ( extern_libs && (project->isActiveConfig("qt") || project->isActiveConfig("opengl")) ) { if(configs.findIndex("x11lib") == -1) configs.append("x11lib"); @@ -152,6 +149,10 @@ project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; } } + if(!project->isEmpty("QMAKE_INCDIR")) + project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"]; + if(!project->isEmpty("QMAKE_LIBDIR")) + project->variables()["QMAKE_LIBDIR_FLAGS"].append("-L" + project->first("QMAKE_LIBDIR")); if ( project->isActiveConfig("thread") ) { if(project->isActiveConfig("qt")) project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT"); diff -ruN qt-x11-free-3.0.2.orig/qt.csh qt-x11-free-3.0.2/qt.csh --- qt-x11-free-3.0.2.orig/qt.csh Wed Dec 31 17:00:00 1969 +++ qt-x11-free-3.0.2/qt.csh Thu Mar 14 13:16:18 2002 @@ -0,0 +1,3 @@ +# qt.csh + +setenv QTDIR @PREFIX@ diff -ruN qt-x11-free-3.0.2.orig/qt.sh qt-x11-free-3.0.2/qt.sh --- qt-x11-free-3.0.2.orig/qt.sh Wed Dec 31 17:00:00 1969 +++ qt-x11-free-3.0.2/qt.sh Thu Mar 14 13:16:52 2002 @@ -0,0 +1,4 @@ +# qt.sh + +QTDIR=@PREFIX@ +export QTDIR diff -ruN qt-x11-free-3.0.2.orig/src/tools/qglobal.h qt-x11-free-3.0.2/src/tools/qglobal.h --- qt-x11-free-3.0.2.orig/src/tools/qglobal.h Mon Feb 18 05:46:55 2002 +++ qt-x11-free-3.0.2/src/tools/qglobal.h Thu Mar 14 13:24:05 2002 @@ -77,7 +77,7 @@ */ #if defined(__APPLE__) && defined(__GNUC__) -# define Q_OS_MACX +# define Q_OS_FREEBSD #elif defined(__MACOSX__) # define Q_OS_MACX #elif defined(macintosh) diff -ruN qt-x11-free-3.0.2.orig/src/tools/qmutex_unix.cpp qt-x11-free-3.0.2/src/tools/qmutex_unix.cpp --- qt-x11-free-3.0.2.orig/src/tools/qmutex_unix.cpp Mon Feb 18 05:46:56 2002 +++ qt-x11-free-3.0.2/src/tools/qmutex_unix.cpp Thu Mar 14 13:30:20 2002 @@ -76,7 +76,7 @@ // mutex types # if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \ - defined(Q_OS_FREEBSD)) && !defined(Q_OS_UNIXWARE7) + defined(Q_OS_FREEBSD)) && !defined(Q_OS_UNIXWARE7) && !defined(__APPLE__) // POSIX 1003.1c-1995 - We love this OS # define Q_MUTEX_SET_TYPE(a, b) pthread_mutexattr_settype((a), (b)) # if defined(QT_CHECK_RANGE) --- qt-3.0.1-2.info DELETED --- --- qt-3.0.1-2.patch DELETED --- |