Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31922/main/finkinfo/libs
Modified Files:
qt4-mac.info qt4-mac.patch
Log Message:
new upstream, 4.5.2
Index: qt4-mac.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/qt4-mac.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- qt4-mac.patch 25 Apr 2009 14:06:35 -0000 1.5
+++ qt4-mac.patch 30 Jun 2009 14:19:06 -0000 1.6
@@ -1,82 +1,82 @@
-diff -Nurd qt-copy/config.tests/unix/3dnow/3dnow.pro
qt-copy-new/config.tests/unix/3dnow/3dnow.pro
---- qt-copy/config.tests/unix/3dnow/3dnow.pro 2009-04-24 09:20:32.000000000
-0400
-+++ qt-copy-new/config.tests/unix/3dnow/3dnow.pro 2009-04-24
09:42:31.000000000 -0400
+diff -Nurd kde-qt/config.tests/unix/3dnow/3dnow.pro
kde-qt-new/config.tests/unix/3dnow/3dnow.pro
+--- kde-qt/config.tests/unix/3dnow/3dnow.pro 2009-06-25 12:37:50.000000000
-0400
++++ kde-qt-new/config.tests/unix/3dnow/3dnow.pro 2009-06-28
09:57:30.000000000 -0400
@@ -1,3 +1,2 @@
SOURCES = 3dnow.cpp
-CONFIG -= x11 qt
-mac:CONFIG -= app_bundle
+CONFIG -= x11 qt app_bundle
[...1145 lines suppressed...]
- #include <sys/types.h>
--#if defined(Q_OS_DARWIN)
-+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
- # define Q_NO_SEMAPHORE
- # include <sys/stat.h>
- # include <sys/file.h>
--#else // Q_OS_DARWIN
-+#else // Q_OS_DARWIN || Q_OS_MAC
- # include <sys/sem.h>
- # if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) &&
!defined(QT_LINUXBASE)) \
- || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD)
\
-@@ -64,7 +64,7 @@
- unsigned short *array; /* array for GETALL, SETALL */
- };
- # endif
--#endif // Q_OS_DARWIN
-+#endif // Q_OS_DARWIN || Q_OS_MAC
- #include <sys/ipc.h>
- #include <string.h>
- #include <errno.h>
Index: qt4-mac.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/qt4-mac.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- qt4-mac.info 25 Jun 2009 16:23:37 -0000 1.16
+++ qt4-mac.info 30 Jun 2009 14:19:06 -0000 1.17
@@ -1,6 +1,6 @@
Info4: <<
Package: qt4-mac
-Version: 4.5.1
+Version: 4.5.2
Revision: 1
GCC: 4.0
CustomMirror: <<
@@ -10,15 +10,12 @@
nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
nam-CA: http://www.southofheaven.net/befunk
<<
-Source: mirror:custom:qt/qt-copy-958635.tar.bz2
-Source-MD5: e68ea8dcf3999bd4d7a8980aab131f49
-SourceDirectory: qt-copy
+Source: mirror:custom:qt/kde-qt-%v-patched-mac.tar.bz2
+Source-MD5: c55b70322916e0c62f438aa1c45d7c5a
+SourceDirectory: kde-qt
PatchFile: %n.patch
-PatchFile-MD5: 4e2cac64c8bf572887dd64a3362338ab
+PatchFile-MD5: 8ddcec0dfe15b8568a9f1874cc797516
PatchScript: <<
- mkdir .svn
- ./apply_patches
- patch -p0 --fuzz=4 < patches/notsafe/0231-mac-plugins.diff
patch -p1 --fuzz=4 < %{PatchFile}
perl -pi -e 's,const char,char,g' config.tests/unix/*iconv/*.cpp
perl -pi -e 's,CFG_MAC_XARCH=auto,CFG_MAC_XARCH=no,g' configure
@@ -59,6 +56,7 @@
CompileScript: <<
#!/bin/sh -ev
+ echo "makeflags = $MAKEFLAGS"
if [ -z "$CC" ]; then
export CC=gcc
export CXX=g++
@@ -125,37 +123,55 @@
Package: %N-gui-shlibs
DocFiles: LGPL* LICENSE*
Suggests: %N-designer, %N-linguist, %N-doc
- Replaces: %N-core-shlibs (<< 4.5.0-5), %N (<< 4.5.1-1)
+ Replaces: %N-core-shlibs (<< 4.5.0-5), %N (<< 4.5.1-2)
Depends: <<
%N-core-shlibs (= %v-%r),
libmng2-shlibs,
libjpeg-shlibs,
<<
Files: <<
+ lib/%N/lib/Qt3Support.framework/Qt3Support
+ lib/%N/lib/Qt3Support.framework/Qt3Support_debug
lib/%N/lib/Qt3Support.framework/Versions/4/Qt3Support
lib/%N/lib/Qt3Support.framework/Versions/4/Qt3Support_debug
lib/%N/lib/Qt3Support.framework/Versions/Current
+ lib/%N/lib/QtAssistant.framework/QtAssistant
+ lib/%N/lib/QtAssistant.framework/QtAssistant_debug
lib/%N/lib/QtAssistant.framework/Versions/4/QtAssistant
lib/%N/lib/QtAssistant.framework/Versions/4/QtAssistant_debug
lib/%N/lib/QtAssistant.framework/Versions/Current
+ lib/%N/lib/QtGui.framework/QtGui
+ lib/%N/lib/QtGui.framework/QtGui_debug
lib/%N/lib/QtGui.framework/Versions/4/QtGui
lib/%N/lib/QtGui.framework/Versions/4/QtGui_debug
lib/%N/lib/QtGui.framework/Versions/Current
+ lib/%N/lib/QtHelp.framework/QtHelp
+ lib/%N/lib/QtHelp.framework/QtHelp_debug
lib/%N/lib/QtHelp.framework/Versions/4/QtHelp
lib/%N/lib/QtHelp.framework/Versions/4/QtHelp_debug
lib/%N/lib/QtHelp.framework/Versions/Current
+ lib/%N/lib/QtOpenGL.framework/QtOpenGL
+ lib/%N/lib/QtOpenGL.framework/QtOpenGL_debug
lib/%N/lib/QtOpenGL.framework/Versions/4/QtOpenGL
lib/%N/lib/QtOpenGL.framework/Versions/4/QtOpenGL_debug
lib/%N/lib/QtOpenGL.framework/Versions/Current
+ lib/%N/lib/QtScriptTools.framework/QtScriptTools
+ lib/%N/lib/QtScriptTools.framework/QtScriptTools_debug
lib/%N/lib/QtScriptTools.framework/Versions/4/QtScriptTools
lib/%N/lib/QtScriptTools.framework/Versions/4/QtScriptTools_debug
lib/%N/lib/QtScriptTools.framework/Versions/Current
+ lib/%N/lib/QtSvg.framework/QtSvg
+ lib/%N/lib/QtSvg.framework/QtSvg_debug
lib/%N/lib/QtSvg.framework/Versions/4/QtSvg
lib/%N/lib/QtSvg.framework/Versions/4/QtSvg_debug
lib/%N/lib/QtSvg.framework/Versions/Current
+ lib/%N/lib/QtWebKit.framework/QtWebKit
+ lib/%N/lib/QtWebKit.framework/QtWebKit_debug
lib/%N/lib/QtWebKit.framework/Versions/4/QtWebKit
lib/%N/lib/QtWebKit.framework/Versions/4/QtWebKit_debug
lib/%N/lib/QtWebKit.framework/Versions/Current
+ lib/%N/lib/phonon.framework/phonon
+ lib/%N/lib/phonon.framework/phonon_debug
lib/%N/lib/phonon.framework/Versions/4/phonon
lib/%N/lib/phonon.framework/Versions/4/phonon_debug
lib/%N/lib/phonon.framework/Versions/Current
@@ -207,27 +223,43 @@
Files: <<
lib/qt4-mac/lib/libQtCLucene.4*.dylib
lib/qt4-mac/lib/libQtCLucene_debug.4*.dylib
+ lib/%N/lib/QtCore.framework/QtCore
+ lib/%N/lib/QtCore.framework/QtCore_debug
lib/%N/lib/QtCore.framework/Versions/4/QtCore
lib/%N/lib/QtCore.framework/Versions/4/QtCore_debug
lib/%N/lib/QtCore.framework/Versions/Current
+ lib/%N/lib/QtDBus.framework/QtDBus
+ lib/%N/lib/QtDBus.framework/QtDBus_debug
lib/%N/lib/QtDBus.framework/Versions/4/QtDBus
lib/%N/lib/QtDBus.framework/Versions/4/QtDBus_debug
lib/%N/lib/QtDBus.framework/Versions/Current
+ lib/%N/lib/QtNetwork.framework/QtNetwork
+ lib/%N/lib/QtNetwork.framework/QtNetwork_debug
lib/%N/lib/QtNetwork.framework/Versions/4/QtNetwork
lib/%N/lib/QtNetwork.framework/Versions/4/QtNetwork_debug
lib/%N/lib/QtNetwork.framework/Versions/Current
+ lib/%N/lib/QtScript.framework/QtScript
+ lib/%N/lib/QtScript.framework/QtScript_debug
lib/%N/lib/QtScript.framework/Versions/4/QtScript
lib/%N/lib/QtScript.framework/Versions/4/QtScript_debug
lib/%N/lib/QtScript.framework/Versions/Current
+ lib/%N/lib/QtSql.framework/QtSql
+ lib/%N/lib/QtSql.framework/QtSql_debug
lib/%N/lib/QtSql.framework/Versions/4/QtSql
lib/%N/lib/QtSql.framework/Versions/4/QtSql_debug
lib/%N/lib/QtSql.framework/Versions/Current
+ lib/%N/lib/QtTest.framework/QtTest
+ lib/%N/lib/QtTest.framework/QtTest_debug
lib/%N/lib/QtTest.framework/Versions/4/QtTest
lib/%N/lib/QtTest.framework/Versions/4/QtTest_debug
lib/%N/lib/QtTest.framework/Versions/Current
+ lib/%N/lib/QtXml.framework/QtXml
+ lib/%N/lib/QtXml.framework/QtXml_debug
lib/%N/lib/QtXml.framework/Versions/4/QtXml
lib/%N/lib/QtXml.framework/Versions/4/QtXml_debug
lib/%N/lib/QtXml.framework/Versions/Current
+ lib/%N/lib/QtXmlPatterns.framework/QtXmlPatterns
+ lib/%N/lib/QtXmlPatterns.framework/QtXmlPatterns_debug
lib/%N/lib/QtXmlPatterns.framework/Versions/4/QtXmlPatterns
lib/%N/lib/QtXmlPatterns.framework/Versions/4/QtXmlPatterns_debug
lib/%N/lib/QtXmlPatterns.framework/Versions/Current
@@ -269,10 +301,15 @@
Package: %N-designer-shlibs
DocFiles: LGPL* LICENSE*
Depends: %N-gui-shlibs (= %v-%r)
+ Replaces: %N (<< 4.5.1-2)
Files: <<
+ lib/%N/lib/QtDesigner.framework/QtDesigner
+ lib/%N/lib/QtDesigner.framework/QtDesigner_debug
lib/%N/lib/QtDesigner.framework/Versions/4/QtDesigner
lib/%N/lib/QtDesigner.framework/Versions/4/QtDesigner_debug
lib/%N/lib/QtDesigner.framework/Versions/Current
+ lib/%N/lib/QtDesignerComponents.framework/QtDesignerComponents
+
lib/%N/lib/QtDesignerComponents.framework/QtDesignerComponents_debug
lib/%N/lib/QtDesignerComponents.framework/Versions/4/QtDesignerComponents
lib/%N/lib/QtDesignerComponents.framework/Versions/4/QtDesignerComponents_debug
lib/%N/lib/QtDesignerComponents.framework/Versions/Current
@@ -324,8 +361,8 @@
%p/lib/%N/bin/qmake %p/share/doc/%N/examples/examples.pro
make
<<
-DocFiles: FAQ KNOWN.ISSUES LGPL* LICENSE* README*
-License: GPL
+DocFiles: FAQ* LGPL* LICENSE* README*
+License: LGPL
Maintainer: Benjamin Reed <[email protected]>
Homepage: http://www.trolltech.com/
<<
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
