Update of /cvsroot/fink/experimental/rangerrick/10.2-gcc3.3/main/finkinfo/x11
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8185/10.2-gcc3.3/main/finkinfo/x11
Modified Files:
qt3.info qt3.patch
Log Message:
qt3 fixed?
Index: qt3.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.2-gcc3.3/main/finkinfo/x11/qt3.info,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- qt3.info 25 Oct 2004 15:27:40 -0000 1.22
+++ qt3.info 25 Oct 2004 22:05:36 -0000 1.23
@@ -1,6 +1,6 @@
Package: qt3
Version: 3.3.3
-Revision: 15
+Revision: 16
GCC: 3.3
CustomMirror: <<
Primary: ftp://ftp.trolltech.com/qt/source
@@ -43,7 +43,7 @@
for file in `ls -1 /lib/ 2>/dev/null | grep -E '(qt-mt|qt3)' | grep -v '.bad$'`; do
echo "WARNING: found suspicious file or directory \"$file\" -- moving to
\"${file}.bad\""
- mv "$file" "${file}.bad"
+ /bin/mv "$file" "${file}.bad"
done
if [ "$DOREMOVE" = "1" ]; then
@@ -91,7 +91,7 @@
-sm -xinerama -xrender -xft -xkb \
-plugin-sql-sqlite -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql
- find . -name Makefile -print | xargs perl -pi.bak -e 's,-I%p/include/qt,,g'
+ /usr/bin/find . -name Makefile -print | xargs perl -pi.bak -e 's,-I%p/include/qt,,g'
make symlinks src-qmake src-moc sub-src sub-tools
<<
InstallScript: <<
@@ -114,7 +114,7 @@
# clean up the makefiles
make -C tutorial clean
make -C examples clean
- perl -pi.bak -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"`
+ perl -pi.bak -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `/usr/bin/find examples -name
"*.pro"`
for a in */*/Makefile ; do
perl -pi.bak -e 's,^SYSCONF_MOC.*,SYSCONF_MOC = %p/bin/moc,' $a
done
@@ -123,16 +123,16 @@
install -d -m 0755 %i/share/doc/%N/html
install -d -m 0755 %i/share/doc/%N/tutorial
install -d -m 0755 %i/share/doc/%N/examples
- cp -fRL doc/html/* %i/share/doc/%N/html/
- cp -fRL tutorial/* %i/share/doc/%N/tutorial/
- cp -fRL examples/* %i/share/doc/%N/examples/
+ /bin/cp -fRL doc/html/* %i/share/doc/%N/html/
+ /bin/cp -fRL tutorial/* %i/share/doc/%N/tutorial/
+ /bin/cp -fRL examples/* %i/share/doc/%N/examples/
# the mkspecs
- rm -rf %i/share/%N/mkspecs/default
- ln -sf darwin-g++ %i/share/%N/mkspecs/default
+ /bin/rm -rf %i/share/%N/mkspecs/default
+ /bin/ln -sf darwin-g++ %i/share/%N/mkspecs/default
# kde icon for qt designer
- mkdir -p %i/share/applnk/Development
+ /bin/mkdir -p %i/share/applnk/Development
cat >%i/share/applnk/Development/designer.desktop <<EOF
[Desktop Entry]
BinaryPattern=designer;
@@ -162,21 +162,21 @@
EOF
# remove extra junk
- rm -rf \
+ /bin/rm -rf \
%i/lib/README \
%i/lib/qt3-plugins/src \
%i/lib/*f.prl
- find %i/share/doc/%n -name .moc -exec rm -rf {} \; >/dev/null 2>&1
- find %i/share/doc/%n -name .obj -exec rm -rf {} \; >/dev/null 2>&1
- find %i/share/doc/%n/examples %i/share/doc/%n/tutorial -name Makefile -exec rm -rf
{} \; >/dev/null 2>&1
- find %i/share/doc/%n -name \*.pro -exec perl -pi.bak -e 's,^(CONFIG\s*.*)$,$1
thread,' {} \; >/dev/null 2>&1
+ /usr/bin/find %i/share/doc/%n -name .moc -exec rm -rf {} \; >/dev/null 2>&1
+ /usr/bin/find %i/share/doc/%n -name .obj -exec rm -rf {} \; >/dev/null 2>&1
+ /usr/bin/find %i/share/doc/%n/examples %i/share/doc/%n/tutorial -name Makefile -exec
rm -rf {} \; >/dev/null 2>&1
+ /usr/bin/find %i/share/doc/%n -name \*.pro -exec perl -pi.bak -e
's,^(CONFIG\s*.*)$,$1 thread,' {} \; >/dev/null 2>&1
perl -pi.bak -e 's,\$\(QTDIR\),%p,g' %i/lib/libqt-mt.la
- mkdir -p %i/share/doc/kde-installed-packages
- touch %i/share/doc/kde-installed-packages/qt3
- touch %i/share/doc/kde-installed-packages/qt3-dev
+ /bin/mkdir -p %i/share/doc/kde-installed-packages
+ /usr/bin/touch %i/share/doc/kde-installed-packages/qt3
+ /usr/bin/touch %i/share/doc/kde-installed-packages/qt3-dev
<<
SplitOff: <<
Index: qt3.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.2-gcc3.3/main/finkinfo/x11/qt3.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- qt3.patch 9 Sep 2004 20:44:16 -0000 1.11
+++ qt3.patch 25 Oct 2004 22:05:36 -0000 1.12
@@ -1,5 +1,6 @@
+diff -uNr qt-x11-free-3.3.3/Makefile qt-x11-free-3.3.3-new/Makefile
--- qt-x11-free-3.3.3/Makefile Mon Aug 11 10:37:25 2003
-+++ qt-x11-free-3.3.3-new/Makefile Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/Makefile Mon Oct 25 17:57:05 2004
@@ -11,7 +11,7 @@
install: FORCE
@$(MAKE) qt.install
@@ -9,8 +10,9 @@
@echo
@echo "The Qt library is now built in ./lib"
@echo "The Qt examples are built in the directories in ./examples"
+diff -uNr qt-x11-free-3.3.3/configure qt-x11-free-3.3.3-new/configure
--- qt-x11-free-3.3.3/configure Mon Jun 14 05:18:55 2004
-+++ qt-x11-free-3.3.3-new/configure Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/configure Mon Oct 25 17:57:05 2004
@@ -1045,8 +1045,8 @@
[ -z "$QT_INSTALL_DATA" ] && QT_INSTALL_DATA=$QT_INSTALL_PREFIX
# default PREFIX/translations
@@ -22,8 +24,9 @@
# generate qconfig.cpp
[ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools
+diff -uNr qt-x11-free-3.3.3/include/private/qtextlayout_p.h
qt-x11-free-3.3.3-new/include/private/qtextlayout_p.h
--- qt-x11-free-3.3.3/include/private/qtextlayout_p.h Thu Aug 5 10:42:10 2004
-+++ qt-x11-free-3.3.3-new/include/private/qtextlayout_p.h Wed Sep 8 15:40:49
2004
++++ qt-x11-free-3.3.3-new/include/private/qtextlayout_p.h Mon Oct 25 17:57:05
2004
@@ -153,7 +153,8 @@
bool validCursorPosition( int pos ) const;
int nextCursorPosition( int oldPos, CursorMode mode = SkipCharacters ) const;
@@ -34,8 +37,9 @@
private:
QTextLayout( QTextEngine *e ) : d( e ) {}
/* disable copy and assignment */
+diff -uNr qt-x11-free-3.3.3/include/qdragobject.h
qt-x11-free-3.3.3-new/include/qdragobject.h
--- qt-x11-free-3.3.3/include/qdragobject.h Thu Aug 5 10:42:12 2004
-+++ qt-x11-free-3.3.3-new/include/qdragobject.h Wed Sep 8 15:41:54 2004
++++ qt-x11-free-3.3.3-new/include/qdragobject.h Mon Oct 25 17:57:05 2004
@@ -245,10 +245,11 @@
void move( const QPoint & );
void drop();
@@ -49,8 +53,9 @@
void updateCursor();
QWidget * dragSource;
+diff -uNr qt-x11-free-3.3.3/include/qglobal.h qt-x11-free-3.3.3-new/include/qglobal.h
--- qt-x11-free-3.3.3/include/qglobal.h Thu Aug 5 10:41:56 2004
-+++ qt-x11-free-3.3.3-new/include/qglobal.h Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/include/qglobal.h Mon Oct 25 17:57:05 2004
@@ -79,6 +79,10 @@
UNIX - Any UNIX BSD/SYSV system
*/
@@ -71,8 +76,9 @@
#elif defined(Q_OS_MSDOS)
# define Q_WS_WIN16
# error "Qt requires Win32 and does not work with Windows 3.x"
+diff -uNr qt-x11-free-3.3.3/include/qiconview.h
qt-x11-free-3.3.3-new/include/qiconview.h
--- qt-x11-free-3.3.3/include/qiconview.h Thu Aug 5 10:42:00 2004
-+++ qt-x11-free-3.3.3-new/include/qiconview.h Wed Sep 8 15:46:08 2004
++++ qt-x11-free-3.3.3-new/include/qiconview.h Mon Oct 25 17:57:05 2004
@@ -496,6 +496,8 @@
const QPoint &relativeTo,
const QIconViewItem *item ) const;
@@ -82,8 +88,9 @@
QIconViewPrivate *d;
+diff -uNr qt-x11-free-3.3.3/include/qprogressbar.h
qt-x11-free-3.3.3-new/include/qprogressbar.h
--- qt-x11-free-3.3.3/include/qprogressbar.h Thu Aug 5 10:42:21 2004
-+++ qt-x11-free-3.3.3-new/include/qprogressbar.h Wed Sep 8 15:45:50 2004
++++ qt-x11-free-3.3.3-new/include/qprogressbar.h Mon Oct 25 17:57:05 2004
@@ -61,6 +61,7 @@
public:
QProgressBar( QWidget* parent=0, const char* name=0, WFlags f=0 );
@@ -100,8 +107,9 @@
private:
int total_steps;
+diff -uNr qt-x11-free-3.3.3/include/qvaluelist.h
qt-x11-free-3.3.3-new/include/qvaluelist.h
--- qt-x11-free-3.3.3/include/qvaluelist.h Thu Aug 5 10:41:56 2004
-+++ qt-x11-free-3.3.3-new/include/qvaluelist.h Wed Sep 8 15:45:45 2004
++++ qt-x11-free-3.3.3-new/include/qvaluelist.h Mon Oct 25 17:57:05 2004
@@ -636,13 +636,11 @@
l.clear();
Q_UINT32 c;
@@ -117,8 +125,9 @@
}
return s;
}
+diff -uNr qt-x11-free-3.3.3/mkspecs/darwin-g++/qmake.conf
qt-x11-free-3.3.3-new/mkspecs/darwin-g++/qmake.conf
--- qt-x11-free-3.3.3/mkspecs/darwin-g++/qmake.conf Thu Aug 5 10:42:57 2004
-+++ qt-x11-free-3.3.3-new/mkspecs/darwin-g++/qmake.conf Wed Sep 8 15:49:05
2004
++++ qt-x11-free-3.3.3-new/mkspecs/darwin-g++/qmake.conf Mon Oct 25 17:59:08
2004
@@ -9,19 +9,19 @@
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
@@ -191,7 +200,7 @@
QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_QT = -lqt
-@@ -73,8 +73,8 @@
+@@ -73,20 +73,20 @@
QMAKE_LIBS_OPENGL_QT = -lGL -lXmu
QMAKE_LIBS_THREAD =
@@ -200,10 +209,33 @@
+QMAKE_MOC = @PREFIX@/bin/moc
+QMAKE_UIC = @PREFIX@/bin/uic
- QMAKE_AR = ar cq
- QMAKE_RANLIB = ranlib -s
+-QMAKE_AR = ar cq
+-QMAKE_RANLIB = ranlib -s
++QMAKE_AR = /usr/bin/ar cq
++QMAKE_RANLIB = /usr/bin/ranlib -s
+
+-QMAKE_TAR = tar -cf
+-QMAKE_GZIP = gzip -9f
++QMAKE_TAR = @PREFIX@/bin/tar -cf
++QMAKE_GZIP = @PREFIX@/bin/gzip -9f
+
+-QMAKE_COPY = cp -f
++QMAKE_COPY = /bin/cp -f
+ QMAKE_COPY_FILE = $$QMAKE_COPY
+ QMAKE_COPY_DIR = $$QMAKE_COPY -r
+-QMAKE_MOVE = mv -f
+-QMAKE_DEL_FILE = rm -f
+-QMAKE_DEL_DIR = rmdir
+-QMAKE_CHK_DIR_EXISTS = test -d
+-QMAKE_MKDIR = mkdir -p
++QMAKE_MOVE = /bin/mv -f
++QMAKE_DEL_FILE = /bin/rm -f
++QMAKE_DEL_DIR = /bin/rmdir
++QMAKE_CHK_DIR_EXISTS = /bin/test -d
++QMAKE_MKDIR = /bin/mkdir -p
+diff -uNr qt-x11-free-3.3.3/mkspecs/linux-g++/qplatformdefs.h
qt-x11-free-3.3.3-new/mkspecs/linux-g++/qplatformdefs.h
--- qt-x11-free-3.3.3/mkspecs/linux-g++/qplatformdefs.h Tue May 27 11:19:20
2003
-+++ qt-x11-free-3.3.3-new/mkspecs/linux-g++/qplatformdefs.h Wed Sep 8 15:42:01
2004
++++ qt-x11-free-3.3.3-new/mkspecs/linux-g++/qplatformdefs.h Mon Oct 25 17:57:05
2004
@@ -102,5 +102,6 @@
#define QT_VSNPRINTF ::vsnprintf
#endif
@@ -211,8 +243,9 @@
+#define QT_MITSHM
#endif // QPLATFORMDEFS_H
+diff -uNr qt-x11-free-3.3.3/qmake/Makefile.unix
qt-x11-free-3.3.3-new/qmake/Makefile.unix
--- qt-x11-free-3.3.3/qmake/Makefile.unix Wed Jun 2 18:24:30 2004
-+++ qt-x11-free-3.3.3-new/qmake/Makefile.unix Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/qmake/Makefile.unix Mon Oct 25 17:57:05 2004
@@ -36,8 +36,8 @@
-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
[EMAIL PROTECTED]@/include/qmake [EMAIL PROTECTED]@/include [EMAIL
PROTECTED]@/include \
@@ -224,8 +257,9 @@
qmake: $(OBJS) $(QOBJS)
$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
+diff -uNr qt-x11-free-3.3.3/qmake/main.cpp qt-x11-free-3.3.3-new/qmake/main.cpp
--- qt-x11-free-3.3.3/qmake/main.cpp Thu Aug 5 10:42:29 2004
-+++ qt-x11-free-3.3.3-new/qmake/main.cpp Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/qmake/main.cpp Mon Oct 25 17:57:05 2004
@@ -49,7 +49,7 @@
// for Borland, main is defined to qMain which breaks qmake
@@ -235,8 +269,9 @@
// for qurl
bool qt_resolve_symlinks = FALSE;
#endif
+diff -uNr qt-x11-free-3.3.3/src/iconview/qiconview.cpp
qt-x11-free-3.3.3-new/src/iconview/qiconview.cpp
--- qt-x11-free-3.3.3/src/iconview/qiconview.cpp Thu Aug 5 10:42:00 2004
-+++ qt-x11-free-3.3.3-new/src/iconview/qiconview.cpp Wed Sep 8 15:46:23 2004
++++ qt-x11-free-3.3.3-new/src/iconview/qiconview.cpp Mon Oct 25 17:57:05 2004
@@ -236,6 +236,7 @@
QPoint dragStartPos;
QFontMetrics *fm;
@@ -510,8 +545,9 @@
+}
+
#endif // QT_NO_ICONVIEW
+diff -uNr qt-x11-free-3.3.3/src/iconview/qiconview.h
qt-x11-free-3.3.3-new/src/iconview/qiconview.h
--- qt-x11-free-3.3.3/src/iconview/qiconview.h Thu Aug 5 10:42:00 2004
-+++ qt-x11-free-3.3.3-new/src/iconview/qiconview.h Wed Sep 8 15:46:08 2004
++++ qt-x11-free-3.3.3-new/src/iconview/qiconview.h Mon Oct 25 17:57:05 2004
@@ -496,6 +496,8 @@
const QPoint &relativeTo,
const QIconViewItem *item ) const;
@@ -521,8 +557,9 @@
QIconViewPrivate *d;
+diff -uNr qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp
qt-x11-free-3.3.3-new/src/kernel/qapplication_x11.cpp
--- qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp Thu Aug 5 10:42:03 2004
-+++ qt-x11-free-3.3.3-new/src/kernel/qapplication_x11.cpp Wed Sep 8 15:45:41
2004
++++ qt-x11-free-3.3.3-new/src/kernel/qapplication_x11.cpp Mon Oct 25 17:57:05
2004
@@ -3402,10 +3402,23 @@
// update the size for desktop widget
@@ -603,8 +640,9 @@
static int directionKeyEvent = 0;
if ( qt_use_rtl_extensions && type == QEvent::KeyRelease ) {
+diff -uNr qt-x11-free-3.3.3/src/kernel/qclipboard_x11.cpp
qt-x11-free-3.3.3-new/src/kernel/qclipboard_x11.cpp
--- qt-x11-free-3.3.3/src/kernel/qclipboard_x11.cpp Thu Aug 5 10:42:05 2004
-+++ qt-x11-free-3.3.3-new/src/kernel/qclipboard_x11.cpp Wed Sep 8 15:46:18
2004
++++ qt-x11-free-3.3.3-new/src/kernel/qclipboard_x11.cpp Mon Oct 25 17:57:05
2004
@@ -109,6 +109,7 @@
static bool pending_clipboard_changed = FALSE;
static bool pending_selection_changed = FALSE;
@@ -644,8 +682,9 @@
now = QTime::currentTime();
if ( started > now ) // crossed midnight
+diff -uNr qt-x11-free-3.3.3/src/kernel/qdesktopwidget_x11.cpp
qt-x11-free-3.3.3-new/src/kernel/qdesktopwidget_x11.cpp
--- qt-x11-free-3.3.3/src/kernel/qdesktopwidget_x11.cpp Thu Aug 5 10:42:11
2004
-+++ qt-x11-free-3.3.3-new/src/kernel/qdesktopwidget_x11.cpp Wed Sep 8 15:45:41
2004
++++ qt-x11-free-3.3.3-new/src/kernel/qdesktopwidget_x11.cpp Mon Oct 25 17:57:05
2004
@@ -44,6 +44,9 @@
// defined in qapplication_x11.cpp
extern Atom qt_net_workarea;
@@ -679,8 +718,9 @@
}
rects[i].setRect(x, y, w, h);
+diff -uNr qt-x11-free-3.3.3/src/kernel/qdnd_x11.cpp
qt-x11-free-3.3.3-new/src/kernel/qdnd_x11.cpp
--- qt-x11-free-3.3.3/src/kernel/qdnd_x11.cpp Thu Aug 5 10:42:09 2004
-+++ qt-x11-free-3.3.3-new/src/kernel/qdnd_x11.cpp Wed Sep 8 15:45:55 2004
++++ qt-x11-free-3.3.3-new/src/kernel/qdnd_x11.cpp Mon Oct 25 17:57:05 2004
@@ -49,13 +49,15 @@
#include "qdragobject.h"
#include "qobjectlist.h"
@@ -960,8 +1000,9 @@
}
#endif // QT_NO_DRAGANDDROP
+diff -uNr qt-x11-free-3.3.3/src/kernel/qdragobject.cpp
qt-x11-free-3.3.3-new/src/kernel/qdragobject.cpp
--- qt-x11-free-3.3.3/src/kernel/qdragobject.cpp Thu Aug 5 10:42:05 2004
-+++ qt-x11-free-3.3.3-new/src/kernel/qdragobject.cpp Wed Sep 8 15:45:58 2004
++++ qt-x11-free-3.3.3-new/src/kernel/qdragobject.cpp Mon Oct 25 17:57:05 2004
@@ -890,6 +890,16 @@
{
if(!e)
@@ -979,8 +1020,9 @@
if ( e->cacheType == QMimeSource::Text ) {
str = *e->cache.txt.str;
+diff -uNr qt-x11-free-3.3.3/src/kernel/qdragobject.h
qt-x11-free-3.3.3-new/src/kernel/qdragobject.h
--- qt-x11-free-3.3.3/src/kernel/qdragobject.h Thu Aug 5 10:42:12 2004
-+++ qt-x11-free-3.3.3-new/src/kernel/qdragobject.h Wed Sep 8 15:41:54 2004
++++ qt-x11-free-3.3.3-new/src/kernel/qdragobject.h Mon Oct 25 17:57:05 2004
@@ -245,10 +245,11 @@
void move( const QPoint & );
void drop();
@@ -994,8 +1036,9 @@
void updateCursor();
QWidget * dragSource;
+diff -uNr qt-x11-free-3.3.3/src/kernel/qfontdatabase_x11.cpp
qt-x11-free-3.3.3-new/src/kernel/qfontdatabase_x11.cpp
--- qt-x11-free-3.3.3/src/kernel/qfontdatabase_x11.cpp Thu Aug 5 10:42:06 2004
-+++ qt-x11-free-3.3.3-new/src/kernel/qfontdatabase_x11.cpp Wed Sep 8 15:40:48
2004
++++ qt-x11-free-3.3.3-new/src/kernel/qfontdatabase_x11.cpp Mon Oct 25 17:57:05
2004
@@ -1002,8 +1002,7 @@
style->smoothScalable = TRUE;
QtFontSize *size = style->pixelSize( SMOOTH_SCALABLE, TRUE );
@@ -1006,8 +1049,9 @@
}
++f;
}
+diff -uNr qt-x11-free-3.3.3/src/kernel/qpainter_x11.cpp
qt-x11-free-3.3.3-new/src/kernel/qpainter_x11.cpp
--- qt-x11-free-3.3.3/src/kernel/qpainter_x11.cpp Thu Aug 5 10:42:09 2004
-+++ qt-x11-free-3.3.3-new/src/kernel/qpainter_x11.cpp Wed Sep 8 15:40:49 2004
++++ qt-x11-free-3.3.3-new/src/kernel/qpainter_x11.cpp Mon Oct 25 17:57:05 2004
@@ -3012,15 +3012,15 @@
engine.currentItem = 0;
engine.firstItemInLine = -1;
@@ -1029,8 +1073,9 @@
}
// small hack to force skipping of unneeded items
+diff -uNr qt-x11-free-3.3.3/src/kernel/qpixmap_x11.cpp
qt-x11-free-3.3.3-new/src/kernel/qpixmap_x11.cpp
--- qt-x11-free-3.3.3/src/kernel/qpixmap_x11.cpp Thu Aug 5 10:42:05 2004
-+++ qt-x11-free-3.3.3-new/src/kernel/qpixmap_x11.cpp Wed Sep 8 15:42:10 2004
++++ qt-x11-free-3.3.3-new/src/kernel/qpixmap_x11.cpp Mon Oct 25 17:57:05 2004
@@ -37,7 +37,19 @@
// NOT REVISED
@@ -1901,8 +1946,9 @@
}
#endif
+diff -uNr qt-x11-free-3.3.3/src/kernel/qpngio.cpp
qt-x11-free-3.3.3-new/src/kernel/qpngio.cpp
--- qt-x11-free-3.3.3/src/kernel/qpngio.cpp Thu Aug 5 10:42:11 2004
-+++ qt-x11-free-3.3.3-new/src/kernel/qpngio.cpp Wed Sep 8 15:46:57 2004
++++ qt-x11-free-3.3.3-new/src/kernel/qpngio.cpp Mon Oct 25 17:57:05 2004
@@ -110,10 +110,18 @@
static
void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float
screen_gamma=0.0 )
@@ -1925,8 +1971,9 @@
}
png_uint_32 width;
+diff -uNr qt-x11-free-3.3.3/src/kernel/qprocess_unix.cpp
qt-x11-free-3.3.3-new/src/kernel/qprocess_unix.cpp
--- qt-x11-free-3.3.3/src/kernel/qprocess_unix.cpp Thu Aug 5 10:42:05 2004
-+++ qt-x11-free-3.3.3-new/src/kernel/qprocess_unix.cpp Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/src/kernel/qprocess_unix.cpp Mon Oct 25 17:57:05 2004
@@ -761,7 +761,7 @@
#endif
i++;
@@ -1981,8 +2028,9 @@
if(!QFile::exists(arglist[0])) {
QString command = arglist[0];
const QString mac_bundle_suffix = ".app/Contents/MacOS/";
+diff -uNr qt-x11-free-3.3.3/src/kernel/qrichtext.cpp
qt-x11-free-3.3.3-new/src/kernel/qrichtext.cpp
--- qt-x11-free-3.3.3/src/kernel/qrichtext.cpp Thu Aug 5 10:42:06 2004
-+++ qt-x11-free-3.3.3-new/src/kernel/qrichtext.cpp Wed Sep 8 15:40:49 2004
++++ qt-x11-free-3.3.3-new/src/kernel/qrichtext.cpp Mon Oct 25 17:57:05 2004
@@ -3801,6 +3801,7 @@
// determines the properties we need for layouting
@@ -2052,8 +2100,9 @@
}
}
+diff -uNr qt-x11-free-3.3.3/src/kernel/qtextengine.cpp
qt-x11-free-3.3.3-new/src/kernel/qtextengine.cpp
--- qt-x11-free-3.3.3/src/kernel/qtextengine.cpp Thu Aug 5 10:42:08 2004
-+++ qt-x11-free-3.3.3-new/src/kernel/qtextengine.cpp Wed Sep 8 15:40:49 2004
++++ qt-x11-free-3.3.3-new/src/kernel/qtextengine.cpp Mon Oct 25 17:57:05 2004
@@ -268,6 +268,10 @@
if ( sdir != QChar::DirL && sdir != QChar::DirR && sdir != QChar::DirEN && sdir
!= QChar::DirAN )
sdir = QChar::DirON;
@@ -2076,8 +2125,9 @@
status.eor = dir;
}
break;
+diff -uNr qt-x11-free-3.3.3/src/kernel/qtextlayout.cpp
qt-x11-free-3.3.3-new/src/kernel/qtextlayout.cpp
--- qt-x11-free-3.3.3/src/kernel/qtextlayout.cpp Thu Aug 5 10:42:10 2004
-+++ qt-x11-free-3.3.3-new/src/kernel/qtextlayout.cpp Wed Sep 8 15:40:49 2004
++++ qt-x11-free-3.3.3-new/src/kernel/qtextlayout.cpp Mon Oct 25 17:57:05 2004
@@ -631,3 +631,7 @@
return attributes[pos].charStop;
}
@@ -2086,8 +2136,9 @@
+{
+ d->direction = dir;
+}
+diff -uNr qt-x11-free-3.3.3/src/kernel/qtextlayout_p.h
qt-x11-free-3.3.3-new/src/kernel/qtextlayout_p.h
--- qt-x11-free-3.3.3/src/kernel/qtextlayout_p.h Thu Aug 5 10:42:10 2004
-+++ qt-x11-free-3.3.3-new/src/kernel/qtextlayout_p.h Wed Sep 8 15:40:49 2004
++++ qt-x11-free-3.3.3-new/src/kernel/qtextlayout_p.h Mon Oct 25 17:57:05 2004
@@ -153,7 +153,8 @@
bool validCursorPosition( int pos ) const;
int nextCursorPosition( int oldPos, CursorMode mode = SkipCharacters ) const;
@@ -2098,8 +2149,9 @@
private:
QTextLayout( QTextEngine *e ) : d( e ) {}
/* disable copy and assignment */
+diff -uNr qt-x11-free-3.3.3/src/moc/moc.pro qt-x11-free-3.3.3-new/src/moc/moc.pro
--- qt-x11-free-3.3.3/src/moc/moc.pro Fri Oct 31 09:36:28 2003
-+++ qt-x11-free-3.3.3-new/src/moc/moc.pro Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/src/moc/moc.pro Mon Oct 25 17:57:05 2004
@@ -48,6 +48,8 @@
unix:SOURCES += ../tools/qfile_unix.cpp ../tools/qdir_unix.cpp
../tools/qfileinfo_unix.cpp
win32:SOURCES += ../tools/qfile_win.cpp ../tools/qdir_win.cpp
../tools/qfileinfo_win.cpp
@@ -2109,8 +2161,9 @@
target.path=$$bins.path
INSTALLS += target
+diff -uNr qt-x11-free-3.3.3/src/qtmain.pro qt-x11-free-3.3.3-new/src/qtmain.pro
--- qt-x11-free-3.3.3/src/qtmain.pro Fri Oct 31 09:36:28 2003
-+++ qt-x11-free-3.3.3-new/src/qtmain.pro Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/src/qtmain.pro Mon Oct 25 17:57:05 2004
@@ -2,6 +2,7 @@
TEMPLATE = lib
TARGET = qtmain
@@ -2119,8 +2172,9 @@
DESTDIR = $$QMAKE_LIBDIR_QT
CONFIG += qt staticlib warn_on release
+diff -uNr qt-x11-free-3.3.3/src/tools/qdir_unix.cpp
qt-x11-free-3.3.3-new/src/tools/qdir_unix.cpp
--- qt-x11-free-3.3.3/src/tools/qdir_unix.cpp Thu Aug 5 10:41:57 2004
-+++ qt-x11-free-3.3.3-new/src/tools/qdir_unix.cpp Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/src/tools/qdir_unix.cpp Mon Oct 25 17:57:05 2004
@@ -88,7 +88,7 @@
bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
@@ -2130,8 +2184,9 @@
QString name = dirName;
if (dirName[dirName.length() - 1] == "/")
name = dirName.left( dirName.length() - 1 );
+diff -uNr qt-x11-free-3.3.3/src/tools/qglobal.h
qt-x11-free-3.3.3-new/src/tools/qglobal.h
--- qt-x11-free-3.3.3/src/tools/qglobal.h Thu Aug 5 10:41:56 2004
-+++ qt-x11-free-3.3.3-new/src/tools/qglobal.h Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/src/tools/qglobal.h Mon Oct 25 17:57:05 2004
@@ -79,6 +79,10 @@
UNIX - Any UNIX BSD/SYSV system
*/
@@ -2152,8 +2207,9 @@
#elif defined(Q_OS_MSDOS)
# define Q_WS_WIN16
# error "Qt requires Win32 and does not work with Windows 3.x"
+diff -uNr qt-x11-free-3.3.3/src/tools/qgpluginmanager.cpp
qt-x11-free-3.3.3-new/src/tools/qgpluginmanager.cpp
--- qt-x11-free-3.3.3/src/tools/qgpluginmanager.cpp Thu Aug 5 10:41:56 2004
-+++ qt-x11-free-3.3.3-new/src/tools/qgpluginmanager.cpp Wed Sep 8 15:49:05
2004
++++ qt-x11-free-3.3.3-new/src/tools/qgpluginmanager.cpp Mon Oct 25 17:57:05
2004
@@ -316,7 +316,7 @@
#if defined(Q_OS_WIN32)
@@ -2163,8 +2219,9 @@
QString filter = "*.dylib; *.so; *.bundle";
#elif defined(Q_OS_HPUX)
QString filter = "*.sl";
+diff -uNr qt-x11-free-3.3.3/src/tools/qlibrary.cpp
qt-x11-free-3.3.3-new/src/tools/qlibrary.cpp
--- qt-x11-free-3.3.3/src/tools/qlibrary.cpp Thu Aug 5 10:41:55 2004
-+++ qt-x11-free-3.3.3-new/src/tools/qlibrary.cpp Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/src/tools/qlibrary.cpp Mon Oct 25 17:57:05 2004
@@ -399,7 +399,7 @@
filename += ".dll";
#else
@@ -2174,8 +2231,9 @@
filters << ".so";
filters << ".bundle";
filters << ".dylib"; //the last one is also the default one..
+diff -uNr qt-x11-free-3.3.3/src/tools/qmutex_unix.cpp
qt-x11-free-3.3.3-new/src/tools/qmutex_unix.cpp
--- qt-x11-free-3.3.3/src/tools/qmutex_unix.cpp Thu Aug 5 10:41:56 2004
-+++ qt-x11-free-3.3.3-new/src/tools/qmutex_unix.cpp Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/src/tools/qmutex_unix.cpp Mon Oct 25 17:57:06 2004
@@ -44,7 +44,7 @@
// POSIX threads mutex types
#if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \
@@ -2185,8 +2243,9 @@
// 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)
+diff -uNr qt-x11-free-3.3.3/src/tools/qstring.cpp
qt-x11-free-3.3.3-new/src/tools/qstring.cpp
--- qt-x11-free-3.3.3/src/tools/qstring.cpp Thu Aug 5 10:41:58 2004
-+++ qt-x11-free-3.3.3-new/src/tools/qstring.cpp Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/src/tools/qstring.cpp Mon Oct 25 17:57:06 2004
@@ -1362,7 +1362,7 @@
QStringData* QString::makeSharedNull()
{
@@ -2223,8 +2282,9 @@
if ( sl == 1 )
return findRev( *str.unicode(), index, cs );
#endif
+diff -uNr qt-x11-free-3.3.3/src/tools/qvaluelist.h
qt-x11-free-3.3.3-new/src/tools/qvaluelist.h
--- qt-x11-free-3.3.3/src/tools/qvaluelist.h Thu Aug 5 10:41:56 2004
-+++ qt-x11-free-3.3.3-new/src/tools/qvaluelist.h Wed Sep 8 15:45:45 2004
++++ qt-x11-free-3.3.3-new/src/tools/qvaluelist.h Mon Oct 25 17:57:06 2004
@@ -636,13 +636,11 @@
l.clear();
Q_UINT32 c;
@@ -2240,8 +2300,9 @@
}
return s;
}
+diff -uNr qt-x11-free-3.3.3/src/widgets/qheader.cpp
qt-x11-free-3.3.3-new/src/widgets/qheader.cpp
--- qt-x11-free-3.3.3/src/widgets/qheader.cpp Thu Aug 5 10:42:20 2004
-+++ qt-x11-free-3.3.3-new/src/widgets/qheader.cpp Wed Sep 8 15:40:49 2004
++++ qt-x11-free-3.3.3-new/src/widgets/qheader.cpp Mon Oct 25 17:57:06 2004
@@ -1490,8 +1490,12 @@
p->save();
p->setClipRect( fr ); // hack to keep styles working
@@ -2272,8 +2333,9 @@
colorGroup(), flags, QStyleOption( this ) );
}
}
+diff -uNr qt-x11-free-3.3.3/src/widgets/qlineedit.cpp
qt-x11-free-3.3.3-new/src/widgets/qlineedit.cpp
--- qt-x11-free-3.3.3/src/widgets/qlineedit.cpp Thu Aug 5 10:42:21 2004
-+++ qt-x11-free-3.3.3-new/src/widgets/qlineedit.cpp Wed Sep 8 15:40:49 2004
++++ qt-x11-free-3.3.3-new/src/widgets/qlineedit.cpp Mon Oct 25 17:57:06 2004
@@ -1758,6 +1758,7 @@
}
if ( e->key() == Key_Direction_L || e->key() == Key_Direction_R ) {
@@ -2292,8 +2354,9 @@
textLayout.beginLayout(QTextLayout::SingleLine);
textLayout.beginLine( INT_MAX );
while ( !textLayout.atEnd() )
+diff -uNr qt-x11-free-3.3.3/src/widgets/qpopupmenu.cpp
qt-x11-free-3.3.3-new/src/widgets/qpopupmenu.cpp
--- qt-x11-free-3.3.3/src/widgets/qpopupmenu.cpp Thu Aug 5 10:42:21 2004
-+++ qt-x11-free-3.3.3-new/src/widgets/qpopupmenu.cpp Wed Sep 8 15:46:13 2004
++++ qt-x11-free-3.3.3-new/src/widgets/qpopupmenu.cpp Mon Oct 25 17:57:06 2004
@@ -2529,7 +2529,7 @@
constPolish();
QPopupMenu* that = (QPopupMenu*) this;
@@ -2303,8 +2366,9 @@
}
+diff -uNr qt-x11-free-3.3.3/src/widgets/qprogressbar.cpp
qt-x11-free-3.3.3-new/src/widgets/qprogressbar.cpp
--- qt-x11-free-3.3.3/src/widgets/qprogressbar.cpp Thu Aug 5 10:42:20 2004
-+++ qt-x11-free-3.3.3-new/src/widgets/qprogressbar.cpp Wed Sep 8 15:45:50 2004
++++ qt-x11-free-3.3.3-new/src/widgets/qprogressbar.cpp Mon Oct 25 17:57:06 2004
@@ -47,6 +47,14 @@
#endif
#include <limits.h>
@@ -2401,8 +2465,9 @@
/*!
This method is called to generate the text displayed in the center
+diff -uNr qt-x11-free-3.3.3/src/widgets/qprogressbar.h
qt-x11-free-3.3.3-new/src/widgets/qprogressbar.h
--- qt-x11-free-3.3.3/src/widgets/qprogressbar.h Thu Aug 5 10:42:21 2004
-+++ qt-x11-free-3.3.3-new/src/widgets/qprogressbar.h Wed Sep 8 15:45:50 2004
++++ qt-x11-free-3.3.3-new/src/widgets/qprogressbar.h Mon Oct 25 17:57:06 2004
@@ -61,6 +61,7 @@
public:
QProgressBar( QWidget* parent=0, const char* name=0, WFlags f=0 );
@@ -2419,8 +2484,9 @@
private:
int total_steps;
+diff -uNr qt-x11-free-3.3.3/src/widgets/qscrollview.cpp
qt-x11-free-3.3.3-new/src/widgets/qscrollview.cpp
--- qt-x11-free-3.3.3/src/widgets/qscrollview.cpp Thu Aug 5 10:42:21 2004
-+++ qt-x11-free-3.3.3-new/src/widgets/qscrollview.cpp Wed Sep 8 15:46:03 2004
++++ qt-x11-free-3.3.3-new/src/widgets/qscrollview.cpp Mon Oct 25 17:57:06 2004
@@ -1551,6 +1551,9 @@
case QEvent::LayoutHint:
d->autoResizeHint(this);
@@ -2431,8 +2497,9 @@
default:
break;
}
+diff -uNr qt-x11-free-3.3.3/src/widgets/qtoolbar.cpp
qt-x11-free-3.3.3-new/src/widgets/qtoolbar.cpp
--- qt-x11-free-3.3.3/src/widgets/qtoolbar.cpp Thu Aug 5 10:42:20 2004
-+++ qt-x11-free-3.3.3-new/src/widgets/qtoolbar.cpp Wed Sep 8 15:46:28 2004
++++ qt-x11-free-3.3.3-new/src/widgets/qtoolbar.cpp Mon Oct 25 17:57:06 2004
@@ -648,7 +648,7 @@
QString s = b->textLabel();
if ( s.isEmpty() )
@@ -2442,8 +2509,9 @@
id = d->extensionPopup->insertItem( b->iconSet(), s, b->popup() );
else
id = d->extensionPopup->insertItem( b->iconSet(), s, b, SLOT(
emulateClick() ) ) ;
+diff -uNr qt-x11-free-3.3.3/tools/assistant/assistant.pro
qt-x11-free-3.3.3-new/tools/assistant/assistant.pro
--- qt-x11-free-3.3.3/tools/assistant/assistant.pro Mon Nov 17 07:40:25 2003
-+++ qt-x11-free-3.3.3-new/tools/assistant/assistant.pro Wed Sep 8 15:49:05
2004
++++ qt-x11-free-3.3.3-new/tools/assistant/assistant.pro Mon Oct 25 17:57:06
2004
@@ -32,6 +32,8 @@
win32:RC_FILE = assistant.rc
@@ -2453,8 +2521,9 @@
target.path = $$bins.path
INSTALLS += target
+diff -uNr qt-x11-free-3.3.3/tools/designer/app/app.pro
qt-x11-free-3.3.3-new/tools/designer/app/app.pro
--- qt-x11-free-3.3.3/tools/designer/app/app.pro Fri Jan 16 19:51:08 2004
-+++ qt-x11-free-3.3.3-new/tools/designer/app/app.pro Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/tools/designer/app/app.pro Mon Oct 25 17:57:06 2004
@@ -20,7 +20,8 @@
QMAKE_INFO_PLIST = Info_mac.plist
staticlib:CONFIG -= global_init_link_order #yuck
@@ -2465,8 +2534,9 @@
target.path=$$bins.path
INSTALLS += target
+diff -uNr qt-x11-free-3.3.3/tools/designer/designer/designer.pro
qt-x11-free-3.3.3-new/tools/designer/designer/designer.pro
--- qt-x11-free-3.3.3/tools/designer/designer/designer.pro Thu Jul 29 09:09:50
2004
-+++ qt-x11-free-3.3.3-new/tools/designer/designer/designer.pro Wed Sep 8 15:49:05
2004
++++ qt-x11-free-3.3.3-new/tools/designer/designer/designer.pro Mon Oct 25 17:57:06
2004
@@ -1,6 +1,6 @@
TEMPLATE = lib
@@ -2475,8 +2545,9 @@
CONFIG -= dll
!force_static:!win32:contains(QT_PRODUCT,qt-internal) {
CONFIG -= staticlib
+diff -uNr qt-x11-free-3.3.3/tools/designer/designer/hierarchyview.cpp
qt-x11-free-3.3.3-new/tools/designer/designer/hierarchyview.cpp
--- qt-x11-free-3.3.3/tools/designer/designer/hierarchyview.cpp Fri Dec 5
07:47:56 2003
-+++ qt-x11-free-3.3.3-new/tools/designer/designer/hierarchyview.cpp Wed Sep 8
15:42:49 2004
++++ qt-x11-free-3.3.3-new/tools/designer/designer/hierarchyview.cpp Mon Oct 25
17:57:06 2004
@@ -605,6 +605,7 @@
formWindow->mainWindow()->setupTabWidgetHierarchyMenu(
this, SLOT( addTabPage() ),
@@ -2485,8 +2556,9 @@
tabWidgetMenu->popup( p );
}
}
+diff -uNr qt-x11-free-3.3.3/tools/designer/designer/mainwindow.cpp
qt-x11-free-3.3.3-new/tools/designer/designer/mainwindow.cpp
--- qt-x11-free-3.3.3/tools/designer/designer/mainwindow.cpp Mon Mar 29 11:14:05
2004
-+++ qt-x11-free-3.3.3-new/tools/designer/designer/mainwindow.cpp Wed Sep 8
15:42:49 2004
++++ qt-x11-free-3.3.3-new/tools/designer/designer/mainwindow.cpp Mon Oct 25
17:57:06 2004
@@ -2457,8 +2457,8 @@
{
QPopupMenu *menu = new QPopupMenu( parent );
@@ -2498,8 +2570,9 @@
menu->insertSeparator();
actionEditCut->addTo( menu );
actionEditCopy->addTo( menu );
+diff -uNr qt-x11-free-3.3.3/tools/designer/designer/mainwindow.h
qt-x11-free-3.3.3-new/tools/designer/designer/mainwindow.h
--- qt-x11-free-3.3.3/tools/designer/designer/mainwindow.h Fri Oct 17 13:33:47
2003
-+++ qt-x11-free-3.3.3-new/tools/designer/designer/mainwindow.h Wed Sep 8 15:42:49
2004
++++ qt-x11-free-3.3.3-new/tools/designer/designer/mainwindow.h Mon Oct 25 17:57:06
2004
@@ -107,6 +107,7 @@
QPopupMenu *setupNormalHierarchyMenu( QWidget *parent );
@@ -2508,8 +2581,9 @@
FormWindow *openFormWindow( const QString &fn, bool validFileName = TRUE,
FormFile *ff = 0 );
bool isCustomWidgetUsed( MetaDataBase::CustomWidget *w );
+diff -uNr qt-x11-free-3.3.3/tools/designer/editor/editor.pro
qt-x11-free-3.3.3-new/tools/designer/editor/editor.pro
--- qt-x11-free-3.3.3/tools/designer/editor/editor.pro Fri Oct 31 09:36:28 2003
-+++ qt-x11-free-3.3.3-new/tools/designer/editor/editor.pro Wed Sep 8 15:49:05
2004
++++ qt-x11-free-3.3.3-new/tools/designer/editor/editor.pro Mon Oct 25 17:57:06
2004
@@ -1,5 +1,5 @@
TEMPLATE = lib
-CONFIG += qt warn_on staticlib
@@ -2517,8 +2591,9 @@
CONFIG -= dll
HEADERS = editor.h \
parenmatcher.h \
+diff -uNr qt-x11-free-3.3.3/tools/designer/uic/uic.pro
qt-x11-free-3.3.3-new/tools/designer/uic/uic.pro
--- qt-x11-free-3.3.3/tools/designer/uic/uic.pro Fri Oct 31 09:36:28 2003
-+++ qt-x11-free-3.3.3-new/tools/designer/uic/uic.pro Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/tools/designer/uic/uic.pro Mon Oct 25 17:57:06 2004
@@ -40,3 +40,6 @@
LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
SOURCES += mwerks_mac.cpp
@@ -2526,8 +2601,9 @@
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
+
+diff -uNr qt-x11-free-3.3.3/tools/linguist/linguist/linguist.pro
qt-x11-free-3.3.3-new/tools/linguist/linguist/linguist.pro
--- qt-x11-free-3.3.3/tools/linguist/linguist/linguist.pro Fri Oct 31 09:36:28
2003
-+++ qt-x11-free-3.3.3-new/tools/linguist/linguist/linguist.pro Wed Sep 8 15:49:05
2004
++++ qt-x11-free-3.3.3-new/tools/linguist/linguist/linguist.pro Mon Oct 25 17:57:06
2004
@@ -43,6 +43,8 @@
staticlib:CONFIG -= global_init_link_order #yuck
RC_FILE = linguist.icns
@@ -2537,8 +2613,9 @@
PROJECTNAME = Qt Linguist
+diff -uNr qt-x11-free-3.3.3/tools/linguist/linguist.pro
qt-x11-free-3.3.3-new/tools/linguist/linguist.pro
--- qt-x11-free-3.3.3/tools/linguist/linguist.pro Tue Jun 8 04:06:56 2004
-+++ qt-x11-free-3.3.3-new/tools/linguist/linguist.pro Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/tools/linguist/linguist.pro Mon Oct 25 17:57:06 2004
@@ -1,8 +1,5 @@
TEMPLATE = subdirs
SUBDIRS = linguist \
@@ -2548,8 +2625,9 @@
lrelease \
lupdate \
qm2ts
+diff -uNr qt-x11-free-3.3.3/tools/linguist/lrelease/lrelease.pro
qt-x11-free-3.3.3-new/tools/linguist/lrelease/lrelease.pro
--- qt-x11-free-3.3.3/tools/linguist/lrelease/lrelease.pro Fri Oct 31 09:36:28
2003
-+++ qt-x11-free-3.3.3-new/tools/linguist/lrelease/lrelease.pro Wed Sep 8 15:49:05
2004
++++ qt-x11-free-3.3.3-new/tools/linguist/lrelease/lrelease.pro Mon Oct 25 17:57:06
2004
@@ -15,3 +15,6 @@
target.path=$$bins.path
@@ -2557,8 +2635,9 @@
+
+QMAKE_CFLAGS += -mdynamic-no-pic
+QMAKE_CXXFLAGS += -mdynamic-no-pic
+diff -uNr qt-x11-free-3.3.3/tools/linguist/lupdate/lupdate.pro
qt-x11-free-3.3.3-new/tools/linguist/lupdate/lupdate.pro
--- qt-x11-free-3.3.3/tools/linguist/lupdate/lupdate.pro Fri Oct 31 09:36:28
2003
-+++ qt-x11-free-3.3.3-new/tools/linguist/lupdate/lupdate.pro Wed Sep 8 15:49:05
2004
++++ qt-x11-free-3.3.3-new/tools/linguist/lupdate/lupdate.pro Mon Oct 25 17:57:06
2004
@@ -19,3 +19,7 @@
target.path=$$bins.path
@@ -2567,8 +2646,9 @@
+macx:CFLAGS += -mdynamic-no-pic
+macx:CXXFLAGS += -mdynamic-no-pic
+
+diff -uNr qt-x11-free-3.3.3/tools/linguist/qm2ts/qm2ts.pro
qt-x11-free-3.3.3-new/tools/linguist/qm2ts/qm2ts.pro
--- qt-x11-free-3.3.3/tools/linguist/qm2ts/qm2ts.pro Fri Oct 31 09:36:28 2003
-+++ qt-x11-free-3.3.3-new/tools/linguist/qm2ts/qm2ts.pro Wed Sep 8 15:49:05
2004
++++ qt-x11-free-3.3.3-new/tools/linguist/qm2ts/qm2ts.pro Mon Oct 25 17:57:06
2004
@@ -13,3 +13,6 @@
target.path=$$bins.path
@@ -2576,8 +2656,9 @@
+
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
+diff -uNr qt-x11-free-3.3.3/tools/qtconfig/qtconfig.pro
qt-x11-free-3.3.3-new/tools/qtconfig/qtconfig.pro
--- qt-x11-free-3.3.3/tools/qtconfig/qtconfig.pro Tue Jun 8 04:08:54 2004
-+++ qt-x11-free-3.3.3-new/tools/qtconfig/qtconfig.pro Wed Sep 8 15:49:05 2004
++++ qt-x11-free-3.3.3-new/tools/qtconfig/qtconfig.pro Mon Oct 25 17:57:06 2004
@@ -15,4 +15,7 @@
INSTALLS += target
INCLUDEPATH += .
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
