Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs17:/tmp/cvs-serv23960
Modified Files:
qt3mac.info
Added Files:
qt3mac.patch2
Log Message:
Make it work on Leopard:
1. Teach it about existence of OSX 10.5
2. Work around PC (posixly correct) make/echo behavior (thanks drm)
3. Avoid rotted-away QuickDraw code by activating FAKE_CURSOR code,
and making FAKE_CURSOR code self-contained (fingers crossed)
4. Work around undocumented PC /bin/pwd behavior (bug filed)
And now on to those packages depending on this...
Index: qt3mac.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/qt3mac.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- qt3mac.info 17 Oct 2007 20:44:14 -0000 1.13
+++ qt3mac.info 29 Oct 2007 16:05:34 -0000 1.14
@@ -1,7 +1,6 @@
Package: qt3mac
Version: 3.3.8
-Revision: 11
-Distribution: 10.4
+Revision: 12
GCC: 4.0
CustomMirror: <<
Primary: ftp://ftp.trolltech.com/qt/source
@@ -25,6 +24,7 @@
PatchScript: <<
#!/bin/sh -ex
sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
+ patch -p1 < %a/qt3mac.patch2
perl -pi.bak -e 's|cp \-P|cp \-Rp|' qmake/Makefile.unix
<<
NoSetLDFLAGS: true
@@ -54,7 +54,7 @@
# attempt to counterfix qmake's warped fileFixify logic that makes install
break
# when %p is a symlink and something exists already at -libdir or -datadir etc
# second, better attempt at unfixifying %p:
- pushd %p; FixifiedSW=`/bin/pwd`; popd
+ pushd %p; FixifiedSW=`/bin/pwd -P`; popd
/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e
"s,\\$\\(INSTALL_ROOT\\)$FixifiedSW,\\$\\(INSTALL_ROOT\\)%p,g"
#
make
@@ -116,8 +116,8 @@
in /Applications/Fink/.
Since it installs into %p/lib/qt3mac and %/share/qt3mac, it can coexist with
the qt3 packages. To use its dylibs, set QTDIR to %p/lib/qt3mac.
- Fink packages that want to use it will also have to set
- "BuildConflicts: qt3".
+ Fink packages that want to use it will also have to use
+ BuildConflicts: qt3, qt3-dev
<<
DescPort: Adapted from Benjamin Reed's qt3 package
Maintainer: Martin Costabel <[EMAIL PROTECTED]>
--- NEW FILE: qt3mac.patch2 ---
diff -ruN qt-mac-free-3.3.8/config.tests/mac/mac_version.test
qt-mac-free-3.3.8-patched/config.tests/mac/mac_version.test
--- qt-mac-free-3.3.8/config.tests/mac/mac_version.test 2004-04-23
09:40:40.000000000 -0700
+++ qt-mac-free-3.3.8-patched/config.tests/mac/mac_version.test 2007-09-10
09:46:37.000000000 -0700
@@ -21,7 +21,7 @@
echo "#include <stdio.h>" >>$TSTFILE
echo "int main() {" >>$TSTFILE
echo " long gestalt_version;" >>$TSTFILE
-echo " fprintf(stdout, \"%d\\n\", (Gestalt(gestaltSystemVersion,
&gestalt_version) == noErr) ? gestalt_version : 0);" >>$TSTFILE
+/bin/echo " fprintf(stdout, \"%d\\n\", (Gestalt(gestaltSystemVersion,
&gestalt_version) == noErr) ? gestalt_version : 0);" >>$TSTFILE
echo " return 1;" >>$TSTFILE
echo "}" >>$TSTFILE
diff -ruN qt-mac-free-3.3.8/src/tools/qglobal.h
qt-mac-free-3.3.8-patched/src/tools/qglobal.h
--- qt-mac-free-3.3.8/src/tools/qglobal.h 2007-02-02 06:01:04.000000000
-0800
+++ qt-mac-free-3.3.8-patched/src/tools/qglobal.h 2007-09-10
09:31:43.000000000 -0700
@@ -183,7 +183,10 @@
# if !defined(MAC_OS_X_VERSION_10_4)
# define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1
# endif
-# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
+# if !defined(MAC_OS_X_VERSION_10_5)
+# define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1
+# endif
+# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)
# error "This version of Mac OS X is unsupported"
# endif
#endif
--- qt-mac-free-3.3.8/src/kernel/qt_mac.h 2007-02-02 15:01:13.000000000
+0100
+++ qt-mac-free-3.3.8-patched/src/kernel/qt_mac.h 2007-10-29
13:14:12.000000000 +0100
@@ -54,7 +54,7 @@
# define QMAC_DEFAULT_STYLE "QMacStyle" //DefaultStyle
#endif
-#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || QT_MACOSX_VERSION >=
0x1030
+#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || (QT_MACOSX_VERSION >=
0x1030 && QT_MACOSX_VERSION <= 0x1040)
# define QMAC_NO_FAKECURSOR
#endif
--- qt-mac-free-3.3.8/src/kernel/qcursor_mac.cpp 2007-02-02
15:01:16.000000000 +0100
+++ qt-mac-free-3.3.8-patched/src/kernel/qcursor_mac.cpp 2007-10-29
15:02:36.000000000 +0100
@@ -177,7 +177,9 @@
#ifdef QMAC_USE_BIG_CURSOR_API
char *big_cursor_name;
#endif
+#ifdef QMAC_NO_FAKECURSOR
CursorImageRec *ci;
+#endif
struct {
QMacAnimateCursor *anim;
ThemeCursor curs;
@@ -257,8 +259,10 @@
if(type == TYPE_CursPtr) {
if(curs.cp.hcurs && curs.cp.my_cursor)
free(curs.cp.hcurs);
+#ifdef QMAC_NO_FAKECURSOR
} else if(type == TYPE_CursorImage) {
free(curs.ci);
+#endif
#ifdef QMAC_USE_BIG_CURSOR_API
} else if(type == TYPE_BigCursor) {
QDUnregisterNamedPixMapCursur(curs.big_cursor_name);
-------------------------------------------------------------------------
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
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
