Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11
In directory sc8-pr-cvs17:/tmp/cvs-serv14745/main/finkinfo/x11
Modified Files:
qt3.info qt3.patch
Added Files:
xfonts-intl.info
Log Message:
update kde to 3.5.6
Index: qt3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11/qt3.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- qt3.info 26 Nov 2006 22:34:16 -0000 1.5
+++ qt3.info 23 Jul 2007 12:01:09 -0000 1.6
@@ -1,17 +1,51 @@
Package: qt3
-Version: 3.3.7
+Version: 3.3.8
Revision: 1021
Description: Cross-Platform GUI application framework
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-Depends: %N-shlibs (>= %v-%r), %N-designer (>= %v-%r), %N-linguist (>= %v-%r),
%N-doc (>= %v-%r), pkgconfig, macosx (>= 10.4.3-1)
-BuildDepends: cctools (>= 446-0) | cctools-single-module, cups-dev, fink (>=
0.24-1), freetype219, libgl-dev, libpng3 (>= 1.2.5-4), libjpeg, macosx (>=
10.4.3-1), pkgconfig, x11-dev
+Depends: <<
+ %N-shlibs (= %v-%r),
+ %N-designer (= %v-%r),
+ %N-linguist (= %v-%r),
+ %N-doc (= %v-%r),
+ pkgconfig,
+ macosx (>= 10.4.3-1)
+<<
+BuildDepends: <<
+ cctools (>= 446-0) | cctools-single-module,
+ cups-dev,
+ fink (>= 0.26.0-1),
+ freetype219,
+ libgl-dev,
+ libpng3 (>= 1.2.5-4),
+ libjpeg,
+ macosx (>= 10.4.3-1),
+ pkgconfig,
+ x11-dev
+<<
BuildConflicts: autogen-dev
Provides: %N-bin
-Conflicts: qt, qt2, %N-dev
-Replaces: qt, qt2, %N-doc, %N-bin, %N-dev
-Suggests: libpng3, libjpeg, %N-mysql (>= %v-%r), %N-postgresql (>= %v-%r)
+Conflicts: <<
+ qt,
+ qt2,
+ %N-dev
+<<
+Replaces: <<
+ qt,
+ qt2,
+ %N-doc,
+ %N-bin,
+ %N-dev,
+ %N-designer
+<<
+Suggests: <<
+ libpng3,
+ libjpeg,
+ %N-mysql (>= %v-1),
+ %N-postgresql (>= %v-1)
+<<
BuildDependsOnly: true
GCC: 4.0
@@ -27,11 +61,11 @@
nam-US: http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source
<<
Source: mirror:custom:qt-x11-free-%v.tar.bz2
-Source2: http://ranger.befunk.com/fink/qt-upstream-patches-0003.tar.bz2
-SourceDirectory: qt-x11-free-%v
+Source-MD5: cf3c43a7dfde5bfb76f8001102fe6e85
+Source2: http://ranger.befunk.com/fink/qt-upstream-patches-0004.tar.bz2
+Source2-MD5: 1f27d5222813a0a29fe53fd8669e2239
Source2ExtractDir: qt-x11-free-%v
-Source-MD5: 655e21cf6a7e66daf8ec6ceda81aae1e
-Source2-MD5: cfe0cc6a7a8411bce151ebfaaa7e03e7
+SourceDirectory: qt-x11-free-%v
PatchScript: <<
#!/bin/sh -ex
sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
@@ -73,7 +107,9 @@
patches/0059-qpopup_has_mouse.patch \
patches/0060-qpopup_ignore_mousepos.patch \
patches/0061-qscrollview-propagate-horizontal-wheelevent.patch \
- patches/0069-fix-minsize.patch \
+ patches/0073-xinerama-aware-qpopup.patch \
+ patches/0076-fix-qprocess.diff \
+ patches/0077-utf8-decoder-fixes.diff \
; do
echo "patching with $patch"
patch -p0 --fuzz=4 < $patch
@@ -271,10 +307,28 @@
DocFiles: FAQ INSTALL LICENSE* MANIFEST PLATFORMS README* bin/findtr
bin/qt20fix bin/qtrename140
SplitOff: <<
Package: %N-shlibs
- Depends: fink (>= 0.24-1), freetype219-shlibs, libgl-shlibs,
libpng3-shlibs (>= 1.2.5-4), libjpeg-shlibs, x11-shlibs
- Conflicts: qt-shlibs, qt
- Replaces: qt-shlibs, qt, qt3
- Suggests: %N-designer, %N-linguist, %N-doc
+ Depends: <<
+ fink (>= 0.26.0-1),
+ freetype219-shlibs,
+ libgl-shlibs,
+ libpng3-shlibs (>= 1.2.5-4),
+ libjpeg-shlibs,
+ x11-shlibs
+ <<
+ Conflicts: <<
+ qt-shlibs,
+ qt
+ <<
+ Replaces: <<
+ qt-shlibs,
+ qt,
+ qt3
+ <<
+ Suggests: <<
+ %N-designer,
+ %N-linguist,
+ %N-doc
+ <<
RuntimeVars: QTDIR: %p/lib/qt3
Files: <<
lib/libqt-mt.*.dylib
@@ -310,24 +364,52 @@
<<
SplitOff2: <<
Package: %N-designer
- Depends: %N-shlibs (>= %v-%r), libjpeg-shlibs, libpng3-shlibs (>=
1.2.5-4), x11
+ Depends: <<
+ %N-designer-shlibs (= %v-%r),
+ x11
+ <<
Conflicts: qt2
- Replaces: %N-bin, qt2
+ Replaces: <<
+ %N-bin,
+ qt2
+ <<
Files: <<
bin/designer
- lib/libdesigner*
share/applnk/Development/designer.desktop
lib/%N/bin/designer
- lib/%N/lib/libdesigner*
- lib/%N/plugins/designer
lib/%N/templates
<<
<<
SplitOff3: <<
+ Package: %N-designer-shlibs
+ Depends: <<
+ %N-shlibs (= %v-%r),
+ x11-shlibs
+ <<
+ Conflicts: qt2
+ Replaces: <<
+ %N-designer,
+ qt2
+ <<
+ Files: <<
+ lib/libdesignercore.*.dylib
+ lib/%N/lib/libdesignercore.*.dylib
+ lib/%N/plugins/designer
+ <<
+<<
+SplitOff4: <<
Package: %N-linguist
- Depends: %N-shlibs (>= %v-%r), libjpeg-shlibs, libpng3-shlibs (>=
1.2.5-4), x11
+ Depends: <<
+ %N-shlibs (= %v-%r),
+ libjpeg-shlibs,
+ libpng3-shlibs (>= 1.2.5-4),
+ x11
+ <<
Conflicts: qt2
- Replaces: %N-bin, qt2
+ Replaces: <<
+ %N-bin,
+ qt2
+ <<
Files: <<
bin/l*
bin/qm2ts
@@ -339,10 +421,19 @@
lib/%N/phrasebooks
<<
<<
-SplitOff4: <<
+SplitOff5: <<
Package: %N-doc
- Conflicts: qt-doc, qt2, qt
- Replaces: qt-doc, qt2, qt, qt3
+ Conflicts: <<
+ qt-doc,
+ qt2,
+ qt
+ <<
+ Replaces: <<
+ qt-doc,
+ qt2,
+ qt,
+ qt3
+ <<
Files: share/doc/%N lib/%N/doc
<<
--- NEW FILE: xfonts-intl.info ---
Package: xfonts-intl
Version: 1.2.1
Revision: 1
Depends: x11, xfontpath
BuildDepends: type1inst, ttfmkfontdir, xfontpath, x11-dev
Source: mirror:gnu:/intlfonts/intlfonts-%v.tar.gz
Source-MD5: d77e9c4ec066a985687e5c67992677e4
ConfigureParams: --with-fontdir="%d`xfontpath basedir`/intl" --with-pcf=yes
--with-bdf=no --with-type1=yes --with-truetype=yes
CompileScript:
InstallScript: <<
make install
(cd %d`xfontpath basedir`/intl/TrueType && ttfmkfontdir -o fonts.dir)
(cd %d`xfontpath basedir`/intl/Type1 && type1inst --nolog)
<<
DocFiles: ChangeLog NEWS README
PostInstScript: %p/bin/xfontpath --silent install intl intl/TrueType intl/Type1
PostRmScript: %p/bin/xfontpath --silent remove intl intl/TrueType intl/Type1
Description: International Fonts
DescDetail: <<
Free X11 fonts (BDF format) for all characters that Emacs 20 can handle.
<<
License: GPL
Maintainer: None <[EMAIL PROTECTED]>
DescPackaging: <<
Originally packaged by Masanori Sekino.
<<
Homepage: http://www.gnu.org/directory/intlfonts.html
Index: qt3.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11/qt3.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- qt3.patch 14 Jul 2007 15:34:04 -0000 1.4
+++ qt3.patch 23 Jul 2007 12:01:09 -0000 1.5
@@ -1,5 +1,6 @@
---- qt-x11-free-3.3.6/Makefile 2005-01-03 11:08:00.000000000 -0500
-+++ qt-x11-free-3.3.6-new/Makefile 2006-03-19 19:02:19.000000000 -0500
+
+--- qt-x11-free-3.3.7/Makefile 2005-01-03 11:08:00.000000000 -0500
++++ qt-x11-free-3.3.7-new/Makefile 2006-12-11 14:27:23.000000000 -0500
@@ -11,7 +11,7 @@
install: FORCE
@$(MAKE) qt.install
@@ -9,8 +10,8 @@
@echo
@echo "The Qt library is now built in ./lib"
@echo "The Qt examples are built in the directories in ./examples"
---- qt-x11-free-3.3.6/configure 2006-03-08 07:11:24.000000000 -0500
-+++ qt-x11-free-3.3.6-new/configure 2006-03-19 19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/configure 2006-03-08 07:11:24.000000000 -0500
++++ qt-x11-free-3.3.7-new/configure 2006-12-11 14:29:31.000000000 -0500
@@ -36,7 +36,7 @@
# need that throughout the script
@@ -20,6 +21,18 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+@@ -554,9 +554,9 @@
+ QMAKE_PROJECTS="$QMAKE_PROJECTS $relpath/$VAL"
+ else
+ if [ -d $relpath/$VAL ]; then
+- QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/$VAL -name
'*.pro' -print`"
++ QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/$VAL -name
'*.pro' -print | grep -v /examples/ | grep -v /tutorial/`"
+ else
+- QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/. -name '*.pro'
-print`"
++ QMAKE_PROJECTS="$QMAKE_PROJECTS `find $relpath/. -name '*.pro'
-print | grep -v /examples/ | grep -v /tutorial/`"
+ fi
+ fi
+ ;;
@@ -1051,8 +1051,8 @@
[ -z "$QT_INSTALL_DATA" ] && QT_INSTALL_DATA=$QT_INSTALL_PREFIX
# default PREFIX/translations
@@ -40,11 +53,20 @@
;;
*)
;;
---- qt-x11-free-3.3.6/include/qglobal.h 2006-03-08 11:47:38.000000000
-0500
-+++ qt-x11-free-3.3.6-new/include/qglobal.h 2006-03-19 19:02:19.000000000
-0500
+@@ -3509,7 +3509,7 @@
+
+ echo "Finding project files. Please wait..."
+ if [ -z "$QMAKE_PROJECTS" ]; then
+- QMAKE_PROJECTS=`find $relpath/. -name '*.pro' -print | sed 's-/\./-/-'`
++ QMAKE_PROJECTS=`find $relpath/. -name '*.pro' -print | grep -v /examples/
| grep -v /tutorial/ | sed 's-/\./-/-'`
+ else
+ QT_PROJECTS=
+ for a in `echo $QMAKE_PROJECTS`; do
+--- qt-x11-free-3.3.7/include/qglobal.h 2006-10-19 10:25:01.000000000
-0400
++++ qt-x11-free-3.3.7-new/include/qglobal.h 2006-12-11 14:27:23.000000000
-0500
@@ -44,6 +44,10 @@
*/
- #define QT_VERSION 0x030306
+ #define QT_VERSION 0x030307
+#ifndef __DARWIN_X11__
+#define __DARWIN_X11__
@@ -73,8 +95,8 @@
#else
# undef QT_MAKEDLL /* ignore these for other platforms */
# undef QT_DLL
---- qt-x11-free-3.3.6/mkspecs/darwin-g++/qmake.conf 2006-03-08
11:48:20.000000000 -0500
-+++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qmake.conf 2006-03-20
10:03:17.000000000 -0500
+--- qt-x11-free-3.3.7/mkspecs/darwin-g++/qmake.conf 2006-10-19
10:26:15.000000000 -0400
++++ qt-x11-free-3.3.7-new/mkspecs/darwin-g++/qmake.conf 2006-12-11
14:27:23.000000000 -0500
@@ -9,10 +9,10 @@
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
@@ -169,8 +191,8 @@
+QMAKE_DEL_DIR = /bin/rmdir
+QMAKE_CHK_DIR_EXISTS = /bin/test -d
+QMAKE_MKDIR = /bin/mkdir -p
---- qt-x11-free-3.3.6/mkspecs/darwin-g++/qplatformdefs.h 2003-05-27
11:19:20.000000000 -0400
-+++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qplatformdefs.h 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/mkspecs/darwin-g++/qplatformdefs.h 2003-05-27
11:19:20.000000000 -0400
++++ qt-x11-free-3.3.7-new/mkspecs/darwin-g++/qplatformdefs.h 2006-12-11
14:27:23.000000000 -0500
@@ -74,12 +74,13 @@
#define QT_SIGNAL_ARGS int
#define QT_SIGNAL_IGNORE SIG_IGN
@@ -186,8 +208,8 @@
+#define QT_MITSHM
#endif // QPLATFORMDEFS_H
---- qt-x11-free-3.3.6/qmake/Makefile.unix 2006-02-28 05:32:54.000000000
-0500
-+++ qt-x11-free-3.3.6-new/qmake/Makefile.unix 2006-03-19 19:02:19.000000000
-0500
+--- qt-x11-free-3.3.7/qmake/Makefile.unix 2006-02-28 05:32:54.000000000
-0500
++++ qt-x11-free-3.3.7-new/qmake/Makefile.unix 2006-12-11 14:27:23.000000000
-0500
@@ -36,8 +36,8 @@
-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
[EMAIL PROTECTED]@/include/qmake [EMAIL PROTECTED]@/include [EMAIL
PROTECTED]@/include \
@@ -199,8 +221,8 @@
qmake: $(OBJS) $(QOBJS)
$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
---- qt-x11-free-3.3.6/qmake/main.cpp 2006-03-08 11:48:02.000000000 -0500
-+++ qt-x11-free-3.3.6-new/qmake/main.cpp 2006-03-19 19:02:19.000000000
-0500
+--- qt-x11-free-3.3.7/qmake/main.cpp 2006-10-19 10:25:42.000000000 -0400
++++ qt-x11-free-3.3.7-new/qmake/main.cpp 2006-12-11 14:27:23.000000000
-0500
@@ -49,7 +49,7 @@
// for Borland, main is defined to qMain which breaks qmake
@@ -210,8 +232,8 @@
// for qurl
bool qt_resolve_symlinks = FALSE;
#endif
---- qt-x11-free-3.3.6/src/kernel/qprocess_unix.cpp 2006-03-08
11:47:45.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/kernel/qprocess_unix.cpp 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/kernel/qprocess_unix.cpp 2006-10-19
10:25:12.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/kernel/qprocess_unix.cpp 2006-12-11
14:27:24.000000000 -0500
@@ -761,7 +761,7 @@
#endif
i++;
@@ -248,8 +270,8 @@
arglistQ[0] = fileInfo.absFilePath().local8Bit();
#else
arglistQ[0] = fileInfo.filePath().local8Bit();
---- qt-x11-free-3.3.6/src/moc/moc.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/moc/moc.pro 2006-03-19 19:02:19.000000000
-0500
+--- qt-x11-free-3.3.7/src/moc/moc.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/src/moc/moc.pro 2006-12-11 14:27:24.000000000
-0500
@@ -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
@@ -259,8 +281,8 @@
target.path=$$bins.path
INSTALLS += target
---- qt-x11-free-3.3.6/src/network/qdns.cpp 2006-03-08 11:47:43.000000000
-0500
-+++ qt-x11-free-3.3.6-new/src/network/qdns.cpp 2006-03-19 19:02:19.000000000
-0500
+--- qt-x11-free-3.3.7/src/network/qdns.cpp 2006-10-19 10:25:09.000000000
-0400
++++ qt-x11-free-3.3.7-new/src/network/qdns.cpp 2006-12-11 14:27:24.000000000
-0500
@@ -76,7 +76,7 @@
#include "qcleanuphandler.h"
#include <limits.h>
@@ -270,8 +292,8 @@
#endif
//#define QDNS_DEBUG
---- qt-x11-free-3.3.6/src/qt_professional.pri 2004-02-06 07:08:19.000000000
-0500
-+++ qt-x11-free-3.3.6-new/src/qt_professional.pri 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/qt_professional.pri 2004-02-06 07:08:19.000000000
-0500
++++ qt-x11-free-3.3.7-new/src/qt_professional.pri 2006-12-11
14:27:24.000000000 -0500
@@ -25,7 +25,6 @@
unix {
NETWORK_H = $$NETWORK_CPP
@@ -280,8 +302,8 @@
INCLUDEPATH += $$QT_SOURCE_TREE/src/network
include( $$QT_SOURCE_TREE/src/network/qt_network.pri )
DEFINES *= QT_MODULE_NETWORK
---- qt-x11-free-3.3.6/src/qtmain.pro 2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/qtmain.pro 2006-03-19 19:02:19.000000000
-0500
+--- qt-x11-free-3.3.7/src/qtmain.pro 2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/src/qtmain.pro 2006-12-11 14:27:24.000000000
-0500
@@ -2,6 +2,7 @@
TEMPLATE = lib
TARGET = qtmain
@@ -290,8 +312,8 @@
DESTDIR = $$QMAKE_LIBDIR_QT
CONFIG += qt staticlib warn_on release
---- qt-x11-free-3.3.6/src/tools/qdir_unix.cpp 2006-03-08 11:47:38.000000000
-0500
-+++ qt-x11-free-3.3.6-new/src/tools/qdir_unix.cpp 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qdir_unix.cpp 2006-10-19 10:25:02.000000000
-0400
++++ qt-x11-free-3.3.7-new/src/tools/qdir_unix.cpp 2006-12-11
14:27:24.000000000 -0500
@@ -88,7 +88,7 @@
bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
@@ -301,8 +323,8 @@
QString name = dirName;
if (dirName[dirName.length() - 1] == "/")
name = dirName.left( dirName.length() - 1 );
---- qt-x11-free-3.3.6/src/tools/qglobal.cpp 2006-03-08 11:47:40.000000000
-0500
-+++ qt-x11-free-3.3.6-new/src/tools/qglobal.cpp 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qglobal.cpp 2006-10-19 10:25:04.000000000
-0400
++++ qt-x11-free-3.3.7-new/src/tools/qglobal.cpp 2006-12-11
14:27:24.000000000 -0500
@@ -161,7 +161,7 @@
return TRUE;
}
@@ -312,11 +334,11 @@
#include "qt_mac.h"
---- qt-x11-free-3.3.6/src/tools/qglobal.h 2006-03-08 11:47:38.000000000
-0500
-+++ qt-x11-free-3.3.6-new/src/tools/qglobal.h 2006-03-19 19:02:19.000000000
-0500
+--- qt-x11-free-3.3.7/src/tools/qglobal.h 2006-10-19 10:25:01.000000000
-0400
++++ qt-x11-free-3.3.7-new/src/tools/qglobal.h 2006-12-11 14:27:24.000000000
-0500
@@ -44,6 +44,10 @@
*/
- #define QT_VERSION 0x030306
+ #define QT_VERSION 0x030307
+#ifndef __DARWIN_X11__
+#define __DARWIN_X11__
@@ -345,8 +367,8 @@
#else
# undef QT_MAKEDLL /* ignore these for other platforms */
# undef QT_DLL
---- qt-x11-free-3.3.6/src/tools/qgpluginmanager.cpp 2006-03-08
11:47:38.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qgpluginmanager.cpp 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qgpluginmanager.cpp 2006-10-19
10:25:01.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qgpluginmanager.cpp 2006-12-11
14:27:24.000000000 -0500
@@ -316,7 +316,7 @@
#if defined(Q_OS_WIN32)
@@ -356,8 +378,8 @@
QString filter = "*.dylib; *.so; *.bundle";
#elif defined(Q_OS_HPUX)
QString filter = "*.sl";
---- qt-x11-free-3.3.6/src/tools/qlibrary.cpp 2006-03-08 11:47:37.000000000
-0500
-+++ qt-x11-free-3.3.6-new/src/tools/qlibrary.cpp 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qlibrary.cpp 2006-10-19 10:25:00.000000000
-0400
++++ qt-x11-free-3.3.7-new/src/tools/qlibrary.cpp 2006-12-11
14:27:24.000000000 -0500
@@ -400,7 +400,7 @@
filename += ".dll";
#else
@@ -367,8 +389,8 @@
filters << ".so";
filters << ".bundle";
filters << ".dylib"; //the last one is also the default one..
---- qt-x11-free-3.3.6/src/tools/qmutex_unix.cpp 2006-03-08
11:47:37.000000000 -0500
-+++ qt-x11-free-3.3.6-new/src/tools/qmutex_unix.cpp 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qmutex_unix.cpp 2006-10-19
10:25:01.000000000 -0400
++++ qt-x11-free-3.3.7-new/src/tools/qmutex_unix.cpp 2006-12-11
14:27:24.000000000 -0500
@@ -44,7 +44,7 @@
// POSIX threads mutex types
#if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \
@@ -378,8 +400,19 @@
// 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-x11-free-3.3.6/src/tools/qstring.cpp 2006-03-08 11:47:39.000000000
-0500
-+++ qt-x11-free-3.3.6-new/src/tools/qstring.cpp 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qsettings.cpp 2006-10-19 10:25:00.000000000
-0400
++++ qt-x11-free-3.3.7-new/src/tools/qsettings.cpp 2006-12-11
14:27:25.000000000 -0500
+@@ -981,7 +981,7 @@
+
+ if ( filename.isEmpty() ) {
+
+-#ifdef QT_CHECK_STATE
++#if 0 // this error is damn annoying
+ qWarning("QSettings::sync: filename is null/empty");
+ #endif // QT_CHECK_STATE
+
+--- qt-x11-free-3.3.7/src/tools/qstring.cpp 2006-10-19 10:25:03.000000000
-0400
++++ qt-x11-free-3.3.7-new/src/tools/qstring.cpp 2006-12-11
14:27:24.000000000 -0500
@@ -1362,7 +1362,7 @@
QStringData* QString::makeSharedNull()
{
@@ -416,8 +449,8 @@
if ( sl == 1 )
return findRev( *str.unicode(), index, cs );
#endif
---- qt-x11-free-3.3.6/src/tools/qt_tools.pri 2004-04-01 05:20:06.000000000
-0500
-+++ qt-x11-free-3.3.6-new/src/tools/qt_tools.pri 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/src/tools/qt_tools.pri 2004-04-01 05:20:06.000000000
-0500
++++ qt-x11-free-3.3.7-new/src/tools/qt_tools.pri 2006-12-11
14:27:24.000000000 -0500
@@ -101,10 +101,6 @@
$$TOOLS_CPP/qwaitcondition_unix.cpp
@@ -429,8 +462,8 @@
unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
SOURCES += $$TOOLS_CPP/qbitarray.cpp \
---- qt-x11-free-3.3.6/tools/assistant/assistant.pro 2003-11-17
07:40:25.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/assistant/assistant.pro 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/assistant/assistant.pro 2003-11-17
07:40:25.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/assistant/assistant.pro 2006-12-11
14:27:24.000000000 -0500
@@ -32,6 +32,8 @@
win32:RC_FILE = assistant.rc
@@ -440,8 +473,8 @@
target.path = $$bins.path
INSTALLS += target
---- qt-x11-free-3.3.6/tools/designer/app/app.pro 2004-01-16
19:51:08.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/designer/app/app.pro 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/designer/app/app.pro 2004-01-16
19:51:08.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/designer/app/app.pro 2006-12-11
14:27:24.000000000 -0500
@@ -20,7 +20,8 @@
QMAKE_INFO_PLIST = Info_mac.plist
staticlib:CONFIG -= global_init_link_order #yuck
@@ -452,8 +485,8 @@
target.path=$$bins.path
INSTALLS += target
---- qt-x11-free-3.3.6/tools/designer/designer/designer.pro 2006-02-15
10:48:20.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/designer/designer/designer.pro 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/designer/designer/designer.pro 2006-02-15
10:48:20.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/designer/designer/designer.pro 2006-12-11
14:27:24.000000000 -0500
@@ -1,6 +1,6 @@
TEMPLATE = lib
@@ -462,8 +495,8 @@
CONFIG -= dll
!force_static:!win32:contains(QT_PRODUCT,qt-internal) {
CONFIG -= staticlib
---- qt-x11-free-3.3.6/tools/designer/editor/editor.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/designer/editor/editor.pro 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/designer/editor/editor.pro 2003-10-31
09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/designer/editor/editor.pro 2006-12-11
14:27:24.000000000 -0500
@@ -1,5 +1,5 @@
TEMPLATE = lib
-CONFIG += qt warn_on staticlib
@@ -471,8 +504,8 @@
CONFIG -= dll
HEADERS = editor.h \
parenmatcher.h \
---- qt-x11-free-3.3.6/tools/designer/uic/uic.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/designer/uic/uic.pro 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/designer/uic/uic.pro 2003-10-31
09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/designer/uic/uic.pro 2006-12-11
14:27:24.000000000 -0500
@@ -40,3 +40,6 @@
LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
SOURCES += mwerks_mac.cpp
@@ -480,8 +513,8 @@
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
+
---- qt-x11-free-3.3.6/tools/linguist/linguist/linguist.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/linguist/linguist/linguist.pro 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/linguist/linguist/linguist.pro 2003-10-31
09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/linguist/linguist/linguist.pro 2006-12-11
14:27:24.000000000 -0500
@@ -43,6 +43,8 @@
staticlib:CONFIG -= global_init_link_order #yuck
RC_FILE = linguist.icns
@@ -491,8 +524,8 @@
PROJECTNAME = Qt Linguist
---- qt-x11-free-3.3.6/tools/linguist/linguist.pro 2004-06-08
04:06:56.000000000 -0400
-+++ qt-x11-free-3.3.6-new/tools/linguist/linguist.pro 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/linguist/linguist.pro 2004-06-08
04:06:56.000000000 -0400
++++ qt-x11-free-3.3.7-new/tools/linguist/linguist.pro 2006-12-11
14:27:24.000000000 -0500
@@ -1,8 +1,5 @@
TEMPLATE = subdirs
SUBDIRS = linguist \
@@ -502,8 +535,8 @@
lrelease \
lupdate \
qm2ts
---- qt-x11-free-3.3.6/tools/linguist/lrelease/lrelease.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/linguist/lrelease/lrelease.pro 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/linguist/lrelease/lrelease.pro 2003-10-31
09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/linguist/lrelease/lrelease.pro 2006-12-11
14:27:24.000000000 -0500
@@ -15,3 +15,6 @@
target.path=$$bins.path
@@ -511,8 +544,8 @@
+
+QMAKE_CFLAGS += -mdynamic-no-pic
+QMAKE_CXXFLAGS += -mdynamic-no-pic
---- qt-x11-free-3.3.6/tools/linguist/lupdate/lupdate.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/linguist/lupdate/lupdate.pro 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/linguist/lupdate/lupdate.pro 2003-10-31
09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/linguist/lupdate/lupdate.pro 2006-12-11
14:27:25.000000000 -0500
@@ -19,3 +19,7 @@
target.path=$$bins.path
@@ -521,8 +554,8 @@
+macx:CFLAGS += -mdynamic-no-pic
+macx:CXXFLAGS += -mdynamic-no-pic
+
---- qt-x11-free-3.3.6/tools/linguist/qm2ts/qm2ts.pro 2003-10-31
09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.6-new/tools/linguist/qm2ts/qm2ts.pro 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/linguist/qm2ts/qm2ts.pro 2003-10-31
09:36:28.000000000 -0500
++++ qt-x11-free-3.3.7-new/tools/linguist/qm2ts/qm2ts.pro 2006-12-11
14:27:25.000000000 -0500
@@ -13,3 +13,6 @@
target.path=$$bins.path
@@ -530,8 +563,8 @@
+
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
---- qt-x11-free-3.3.6/tools/qtconfig/qtconfig.pro 2005-07-19
20:59:24.000000000 -0400
-+++ qt-x11-free-3.3.6-new/tools/qtconfig/qtconfig.pro 2006-03-19
19:02:19.000000000 -0500
+--- qt-x11-free-3.3.7/tools/qtconfig/qtconfig.pro 2005-07-19
20:59:24.000000000 -0400
++++ qt-x11-free-3.3.7-new/tools/qtconfig/qtconfig.pro 2006-12-11
14:27:25.000000000 -0500
@@ -15,4 +15,7 @@
INSTALLS += target
INCLUDEPATH += .
@@ -540,17 +573,6 @@
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
REQUIRES=full-config nocrosscompiler !win32*
---- 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 @@
-
- if ( filename.isEmpty() ) {
-
--#ifdef QT_CHECK_STATE
-+#if 0 // this error is damn annoying
- qWarning("QSettings::sync: filename is null/empty");
- #endif // QT_CHECK_STATE
-
diff -ruN qt-x11-free-3.3.7/config.tests/x11/xfreetype.test
qt-x11-free-3.3.7-patched/config.tests/x11/xfreetype.test
--- qt-x11-free-3.3.7/config.tests/x11/xfreetype.test 2004-08-09
13:16:57.000000000 -0700
+++ qt-x11-free-3.3.7-patched/config.tests/x11/xfreetype.test 2007-07-12
13:31:03.000000000 -0700
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
