Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory
fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24310/stable/main/finkinfo/graphics
Modified Files:
qt3mac.patch qt3mac.info
Removed Files:
qt3mac.patch2
Log Message:
unify patchfiles so can convert to PatchFile syntax
Index: qt3mac.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/qt3mac.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- qt3mac.info 30 Aug 2008 23:32:27 -0000 1.7
+++ qt3mac.info 6 Apr 2009 01:29:46 -0000 1.8
@@ -18,13 +18,14 @@
SourceDirectory: qt-mac-free-%v
Description: Aqua version of QT3: Headers and dev tools
Depends: %N-shlibs (>= %v-%r), pkgconfig
-BuildDepends: cctools (>= 446) | cctools-single-module, cups-dev, freetype219,
libpng3 (>= 1.2.5-4), libjpeg
+BuildDepends: cctools (>= 446) | cctools-single-module, cups-dev, freetype219,
libpng3 (>= 1.2.5-4), libjpeg, fink (>= 0.24.12)
BuildConflicts: qt3, qt3-designer, qt3-dev, autogen-dev
BuildDependsOnly: true
+PatchFile: %n.patch
+PatchFile-MD5: 0d8284e13cf042eb52ede81e4a318549
PatchScript: <<
#!/bin/sh -ex
- sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
- patch -p1 < %a/qt3mac.patch2
+ sed -e 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
perl -pi.bak -e 's|cp \-P|cp \-Rp|' qmake/Makefile.unix
<<
NoSetLDFLAGS: true
--- qt3mac.patch2 DELETED ---
Index: qt3mac.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/qt3mac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qt3mac.patch 31 Oct 2006 09:35:53 -0000 1.1
+++ qt3mac.patch 6 Apr 2009 01:29:44 -0000 1.2
@@ -96,3 +96,64 @@
unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
SOURCES += $$TOOLS_CPP/qbitarray.cpp \
+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);
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
