Update of /cvsroot/fink/packages/dists/unstable/main/finkinfo/x11
In directory usw-pr-cvs1:/tmp/cvs-serv4801
Added Files:
qt-3.0.0-7.info qt-3.0.0-7.patch
Log Message:
Files no longer installed outside of %p.
--- NEW FILE: qt-3.0.0-7.info ---
Package: qt
Version: 3.0.0
Revision: 7
Source: ftp://ftp.trolltech.com/qt/source/%n-x11-free-%v.tar.gz
SourceDirectory: %n-%v
Description: Cross-Platform GUI application framework.
Depends: x11, libpng, libjpeg, dlcompat, libgl
SourceDirectory: %n-x11-free-%v
PatchScript: sed 's|@PREFIX@...' <%a/%f.patch | patch -p1
CompileScript: <<
(export QTDIR=`pwd`; printf "yes" | ./configure -shared -system-zlib -system-libpng -system-libjpeg -sm -xft -xrender -xkb -xinerama -qt-gif -plugin-imgfmt-png -qt-imgfmt-png -prefix '$(INSTALLPREFIX)/share/qt' -bindir '$(INSTALLPREFIX)/bin' -docdir '$(INSTALLPREFIX)/share/doc/%n/html' -headerdir '$(INSTALLPREFIX)/include' -libdir '$(INSTALLPREFIX)/lib')
(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
<<
DocFiles: ANNOUNCE INSTALL FAQ LICENSE.GPL LICENSE.QPL PORTING MANIFEST README.QT README changes-%v
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.
No threads yet (turned off by default).
<<
License: GPL
Maintainer: Jeffrey Whitaker <jsw@...>
Homepage: http://www.trolltech.com/
--- NEW FILE: qt-3.0.0-7.patch ---
diff -ruN qt-x11-free-3.0.0/qt.csh qt-x11-free-3.0.0-patched/qt.csh
--- qt-x11-free-3.0.0/qt.csh Thu Jan 1 01:00:00 1970
+++ qt-x11-free-3.0.0-patched/qt.csh Mon Jul 2 17:14:57 2001
@@ -0,0 +1,3 @@
+# qt.csh
+
+setenv QTDIR @PREFIX@
diff -ruN qt-x11-free-3.0.0/qt.sh qt-x11-free-3.0.0-patched/qt.sh
--- qt-x11-free-3.0.0/qt.sh Thu Jan 1 01:00:00 1970
+++ qt-x11-free-3.0.0-patched/qt.sh Mon Jul 2 17:14:36 2001
@@ -0,0 +1,4 @@
+# qt.sh
+
+QTDIR=@PREFIX@
+export QTDIR
--- qt-x11-free-3.0.0/mkspecs/darwin-g++/qplatformdefs.h.orig Thu Nov 15 14:15:43 2001
+++ qt-x11-free-3.0.0/mkspecs/darwin-g++/qplatformdefs.h Thu Nov 15 14:04:16 2001
@@ -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
--- qt-x11-free-3.0.0/configure.orig Thu Nov 15 15:18:34 2001
+++ qt-x11-free-3.0.0/configure Thu Nov 15 15:18:51 2001
@@ -819,7 +819,7 @@
case "$UNAME_SYSTEM:$UNAME_RELEASE" in
Darwin:*)
- PLATFORM=macx-g++
+ PLATFORM=darwin-g++
;;
AIX*)
#PLATFORM=aix-g++
@@ -990,7 +990,7 @@
#now look at the configs and figure out what platform we are config'd for
[ ! -z "`grep QMAKE_LIBS_X11 $XQMAKESPEC/qmake.conf | awk '{print $3;}'`" ] && X11_PLATFORM=yes
-[ -d /System/Library/Frameworks/Carbon.framework ] && MAC_PLATFORM=yes
+#[ -d /System/Library/Frameworks/Carbon.framework ] && MAC_PLATFORM=yes
echo "$XQMAKESPEC" | grep mkspecs/qws >/dev/null 2>&1 && QWS_PLATFORM=yes
# Find default thread option for target
--- qt-x11-free-3.0.0/include/qglobal.h.orig Thu Nov 15 17:45:21 2001
+++ qt-x11-free-3.0.0/include/qglobal.h Thu Nov 15 18:10:13 2001
@@ -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)
--- qt-x11-free-3.0.0/mkspecs/darwin-g++/qmake.conf.orig Thu Nov 15 14:15:38 2001
+++ qt-x11-free-3.0.0/mkspecs/darwin-g++/qmake.conf Thu Nov 15 14:13:50 2001
@@ -0,0 +1,79 @@
+#
+# $Id: qt-3.0.0-7.patch,v 1.1 2001/12/04 13:27:08 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-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_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_INCDIR = @PREFIX@...
+QMAKE_LIBDIR = @PREFIX@...
+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_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
+QMAKE_DEL = rm -f
--- qt-x11-free-3.0.0/src/tools/qglobal.h.orig Sat Nov 17 06:21:43 2001
+++ qt-x11-free-3.0.0/src/tools/qglobal.h Sat Nov 17 06:22:39 2001
@@ -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)
--- qt-x11-free-3.0.0/qmake/generators/unix/unixmake.cpp.orig Mon Nov 26 05:50:05 2001
+++ qt-x11-free-3.0.0/qmake/generators/unix/unixmake.cpp Mon Nov 26 05:53:49 2001
@@ -108,10 +108,6 @@
project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_RELEASE"];
project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_RELEASE"];
}
- if ( !project->variables()["QMAKE_INCDIR"].isEmpty() )
- project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"];
- if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() )
- project->variables()["QMAKE_LIBDIR_FLAGS"].append("-L" + project->first("QMAKE_LIBDIR"));
if ( extern_libs && (project->isActiveConfig("qt") || project->isActiveConfig("opengl")) ) {
if(configs.findIndex("x11lib") == -1)
configs.append("x11lib");
@@ -149,6 +145,10 @@
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
}
}
+ if ( !project->variables()["QMAKE_INCDIR"].isEmpty() )
+ project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"];
+ if ( !project->variables()["QMAKE_LIBDIR"].isEmpty() )
+ project->variables()["QMAKE_LIBDIR_FLAGS"].append("-L" + project->first("QMAKE_LIBDIR"));
if ( project->isActiveConfig("thread") ) {
project->variables()["DEFINES"].append("QT_THREAD_SUPPORT");
if ( !project->variables()["QMAKE_CFLAGS_THREAD"].isEmpty())
|
