Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5700/main/finkinfo/x11
Modified Files:
qt4-x11.info qt4-x11.patch
Log Message:
new upstreams
Index: qt4-x11.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/qt4-x11.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- qt4-x11.patch 11 Feb 2009 19:33:58 -0000 1.7
+++ qt4-x11.patch 9 Mar 2009 18:00:17 -0000 1.8
@@ -1,6 +1,6 @@
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 2008-02-13 17:19:53.000000000
-0500
-+++ qt-copy-new/config.tests/unix/3dnow/3dnow.pro 2008-11-23
20:22:39.000000000 -0500
++++ qt-copy-new/config.tests/unix/3dnow/3dnow.pro 2009-03-08
21:13:11.000000000 -0400
@@ -1,3 +1,2 @@
SOURCES = 3dnow.cpp
-CONFIG -= x11 qt
@@ -8,7 +8,7 @@
+CONFIG -= x11 qt app_bundle
diff -Nurd qt-copy/config.tests/unix/clock-gettime/clock-gettime.pro
qt-copy-new/config.tests/unix/clock-gettime/clock-gettime.pro
--- qt-copy/config.tests/unix/clock-gettime/clock-gettime.pro 2008-02-13
17:19:53.000000000 -0500
[...1093 lines suppressed...]
-+++ qt-copy-new/tools/qvfb/qlock.cpp 2008-11-23 20:22:39.000000000 -0500
-@@ -42,11 +42,11 @@
+--- qt-copy/tools/qvfb/qlock.cpp 2009-03-03 04:55:54.000000000 -0500
++++ qt-copy-new/tools/qvfb/qlock.cpp 2009-03-08 21:13:12.000000000 -0400
+@@ -46,11 +46,11 @@
#include "qwssignalhandler_p.h"
#include <unistd.h>
#include <sys/types.h>
@@ -1038,9 +1117,9 @@
-#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_LSB)) \
+ # if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) &&
!defined(QT_LINUXBASE)) \
|| defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD)
\
-@@ -60,7 +60,7 @@
+@@ -64,7 +64,7 @@
unsigned short *array; /* array for GETALL, SETALL */
};
# endif
Index: qt4-x11.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/qt4-x11.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- qt4-x11.info 11 Feb 2009 19:33:58 -0000 1.13
+++ qt4-x11.info 9 Mar 2009 18:00:17 -0000 1.14
@@ -1,5 +1,6 @@
+Info4: <<
Package: qt4-x11
-Version: 4.4.3
+Version: 4.5.0
Revision: 1
GCC: 4.0
CustomMirror: <<
@@ -9,16 +10,17 @@
nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
nam-CA: http://www.southofheaven.net/befunk
<<
-Source: mirror:custom:qt/qt-copy-921759.tar.bz2
-Source-MD5: 8d6daa4db97e21ea4d27521f3d81c2ea
+Source: mirror:custom:qt/qt-copy-934706.tar.bz2
+Source-MD5: 84f0286ac030aeb82152fd3a6fa129fe
SourceDirectory: qt-copy
PatchFile: %n.patch
-PatchFile-MD5: 33299f8c63867792d0ea45af0f0c98a6
+PatchFile-MD5: 9b75b89de83466d27843b56f2fccaae7
PatchScript: <<
mkdir .svn
./apply_patches
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
<<
Description: Cross-Platform framework (X11 version)
Depends: <<
@@ -31,11 +33,10 @@
macosx (>= 10.4.3-1)
<<
BuildDepends: <<
- cctools (>= 446),
cups-dev,
dbus-dev (>= 1.2.1-1),
expat1,
- fink (>= 0.26.0-1),
+ fink (>= 0.28.0-1),
fontconfig2-dev (>= 2.3.2-13),
freetype219 (>= 2.3.7-7),
glib2-dev (>= 2.12.0-1),
@@ -54,9 +55,19 @@
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
CompileScript: <<
+#!/bin/sh -ev
+
+ if [ -x /usr/bin/gcc-4.2 ]; then
+ export CC=/usr/bin/gcc-4.2
+ export CXX=/usr/bin/g++-4.2
+ if [ -x %p/bin/ccache ]; then
+ export CC="%p/bin/ccache $CC"
+ export CXX="%p/bin/ccache $CXX"
+ fi
+ fi
find . -name ._\* -exec rm -rf {} \;
- sh ./configure-for-fink.sh "%p" "%N" -make "libs tools docs"
- find src/3rdparty/webkit src/3rdparty/clucene tools/assistant -name
Makefile\* -print0 | xargs -0 perl -pi -e 's,-I%p/include,-isystem %p/include,g'
+ sh ./configure-for-fink.sh "%p" "%N" -no-pch -make "libs tools docs"
+ find . -name Makefile\* -print0 | xargs -0 perl -pi -e
's,-I%p/include,-isystem %p/include,g'
make
<<
InstallScript: <<
@@ -135,6 +146,7 @@
<<
SplitOff: <<
Package: %N-gui-shlibs
+ DocFiles: LGPL* LICENSE*
Suggests: %N-designer, %N-linguist, %N-doc
Depends: <<
%N-core-shlibs (= %v-%r),
@@ -152,19 +164,23 @@
lib/%N/lib/libQtOpenGL.4*.dylib
lib/%N/lib/libQtSvg.4*.dylib
lib/%N/lib/libQtWebKit.4*.dylib
+ lib/%N/lib/libphonon.4*.dylib
lib/%N/plugins/accessible
+ lib/%N/plugins/graphicssystems
lib/%N/plugins/iconengines
lib/%N/plugins/imageformats
lib/%N/plugins/inputmethods
+ lib/%N/plugins/script
<<
Shlibs: <<
- %p/lib/%N/lib/libQt3Support.4.dylib 4.4.0 %n (>= 4.4.0-1)
- %p/lib/%N/lib/libQtAssistantClient.4.dylib 4.4.0 %n (>= 4.4.0-1)
- %p/lib/%N/lib/libQtGui.4.dylib 4.4.0 %n (>= 4.4.0-1)
- %p/lib/%N/lib/libQtHelp.4.dylib 4.4.0 %n (>= 4.4.0-1)
- %p/lib/%N/lib/libQtOpenGL.4.dylib 4.4.0 %n (>= 4.4.0-1)
- %p/lib/%N/lib/libQtSvg.4.dylib 4.4.0 %n (>= 4.4.0-1)
- %p/lib/%N/lib/libQtWebKit.4.dylib 4.4.0 %n (>= 4.4.0-1)
+ %p/lib/%N/lib/libQt3Support.4.dylib 4.5.0 %n (>= 4.5.0-1)
+ %p/lib/%N/lib/libQtAssistantClient.4.dylib 4.5.0 %n (>= 4.5.0-1)
+ %p/lib/%N/lib/libQtGui.4.dylib 4.5.0 %n (>= 4.5.0-1)
+ %p/lib/%N/lib/libQtHelp.4.dylib 4.5.0 %n (>= 4.5.0-1)
+ %p/lib/%N/lib/libQtOpenGL.4.dylib 4.5.0 %n (>= 4.5.0-1)
+ %p/lib/%N/lib/libQtSvg.4.dylib 4.5.0 %n (>= 4.5.0-1)
+ %p/lib/%N/lib/libQtWebKit.4.dylib 4.5.0 %n (>= 4.5.0-1)
+ %p/lib/%N/lib/libphonon.4.dylib 4.3.0 %n (>= 4.5.0-1)
<<
PostInstScript: <<
(/%p/lib/fontconfig2/bin/fc-cache -f || :) >/tmp/fc-cache.log
2>&1 || :
@@ -172,13 +188,19 @@
<<
SplitOff2: <<
Package: %N-core-shlibs
- Depends: dbus-shlibs (>= 1.2.1-1), fink (>= 0.17.1-1), glib2-shlibs (>=
2.12.0-1)
+ DocFiles: LGPL* LICENSE*
+ Depends: <<
+ dbus-shlibs (>= 1.2.1-1),
+ fink (>= 0.28.0-1),
+ glib2-shlibs (>= 2.12.0-1)
+ <<
Files: <<
lib/%N/lib/libQtCore.4*.dylib
lib/%N/lib/libQtCLucene.4*.dylib
lib/%N/lib/libQtDBus.4*.dylib
lib/%N/lib/libQtNetwork.4*.dylib
lib/%N/lib/libQtScript.4*.dylib
+ lib/%N/lib/libQtScriptTools.4*.dylib
lib/%N/lib/libQtSql.4*.dylib
lib/%N/lib/libQtTest.4*.dylib
lib/%N/lib/libQtXml.4*.dylib
@@ -187,15 +209,16 @@
lib/%N/plugins/sqldrivers
<<
Shlibs: <<
- %p/lib/%N/lib/libQtCore.4.dylib 4.4.0 %n (>= 4.4.0-1)
- %p/lib/%N/lib/libQtCLucene.4.dylib 4.4.0 %n (>= 4.4.0-1)
- %p/lib/%N/lib/libQtDBus.4.dylib 4.4.0 %n (>= 4.4.0-1)
- %p/lib/%N/lib/libQtNetwork.4.dylib 4.4.0 %n (>= 4.4.0-1)
- %p/lib/%N/lib/libQtScript.4.dylib 4.4.0 %n (>= 4.4.0-1)
- %p/lib/%N/lib/libQtSql.4.dylib 4.4.0 %n (>= 4.4.0-1)
- %p/lib/%N/lib/libQtTest.4.dylib 4.4.0 %n (>= 4.4.0-1)
- %p/lib/%N/lib/libQtXml.4.dylib 4.4.0 %n (>= 4.4.0-1)
- %p/lib/%N/lib/libQtXmlPatterns.4.dylib 4.4.0 %n (>= 4.4.0-1)
+ %p/lib/%N/lib/libQtCore.4.dylib 4.5.0 %n (>= 4.5.0-1)
+ %p/lib/%N/lib/libQtCLucene.4.dylib 4.5.0 %n (>= 4.5.0-1)
+ %p/lib/%N/lib/libQtDBus.4.dylib 4.5.0 %n (>= 4.5.0-1)
+ %p/lib/%N/lib/libQtNetwork.4.dylib 4.5.0 %n (>= 4.5.0-1)
+ %p/lib/%N/lib/libQtScript.4.dylib 4.5.0 %n (>= 4.5.0-1)
+ %p/lib/%N/lib/libQtScriptTools.4.dylib 4.5.0 %n (>= 4.5.0-1)
+ %p/lib/%N/lib/libQtSql.4.dylib 4.5.0 %n (>= 4.5.0-1)
+ %p/lib/%N/lib/libQtTest.4.dylib 4.5.0 %n (>= 4.5.0-1)
+ %p/lib/%N/lib/libQtXml.4.dylib 4.5.0 %n (>= 4.5.0-1)
+ %p/lib/%N/lib/libQtXmlPatterns.4.dylib 4.5.0 %n (>= 4.5.0-1)
<<
<<
@@ -212,15 +235,16 @@
<<
SplitOff4: <<
Package: %N-designer-shlibs
+ DocFiles: LGPL* LICENSE*
Depends: %N-gui-shlibs (= %v-%r), x11-shlibs
Files: <<
- lib/%N/lib/libQtDesigner.*.dylib
- lib/%N/lib/libQtDesignerComponents.*.dylib
+ lib/%N/lib/libQtDesigner.4*.dylib
+ lib/%N/lib/libQtDesignerComponents.4*.dylib
lib/%N/plugins/designer
<<
Shlibs: <<
- %p/lib/%N/lib/libQtDesigner.4.dylib 4.4.0 %n (>=
4.4.0-1)
- %p/lib/%N/lib/libQtDesignerComponents.4.dylib 4.4.0 %n (>=
4.4.0-1)
+ %p/lib/%N/lib/libQtDesigner.4.dylib 4.5.0 %n (>=
4.5.0-1)
+ %p/lib/%N/lib/libQtDesignerComponents.4.dylib 4.5.0 %n (>=
4.5.0-1)
<<
<<
SplitOff5: <<
@@ -263,7 +287,8 @@
%p/lib/%N/bin/qmake %p/share/doc/%N/examples/examples.pro
make
<<
-DocFiles: GPL* LICENSE.* OPENSOURCE-NOTICE.TXT README*
+DocFiles: FAQ KNOWN.ISSUES LGPL* LICENSE* README*
License: GPL
Maintainer: Benjamin Reed <[email protected]>
Homepage: http://www.trolltech.com/
+<<
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
