Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web
In directory vz-cvs-3.sog:/tmp/cvs-serv19731/main/finkinfo/web

Added Files:
        qtwebkit-mac.info qtwebkit-x11.info qtwebkit.patch 
Log Message:
Qt4 4.7, completely revamped. Also some other related changes.

--- NEW FILE: qtwebkit-mac.info ---
Info4: <<
Package: qtwebkit-mac
Version: 2.0.0
Revision: 6
Description: Qt browser framework
Type: qtwebkit (mac)
License: LGPL
Maintainer: Benjamin Reed <qtweb...@fink.raccoonfink.com>

Depends: %N-shlibs (>= %v-%r)
BuildDepends: <<
        fink (>= 0.30.0-1),
        flag-dedup (>= 0.2-1),
        flag-sort (>= 0.4-1),
        libiconv-dev,
        libpng15 (>= 1.5.2-1),
        phonon-%type_pkg[qtwebkit],
        sqlite3-dev (>= 3.7.6.2-1),
        system-openssl-dev,
        qt4-base-%type_pkg[qtwebkit] (>= 4.7.3-1)
<<
Replaces: qt4-%type_pkg[qtwebkit] (<< 4.7.3-1)
GCC: 4.0

CustomMirror: <<
        Primary: http://www.finkproject.org/~ranger/distfiles
        eur-NL: http://www.finkproject.org/~ranger/distfiles
        nam-US: http://ranger.befunk.com/fink
<<
Source: mirror:custom:qt/qt-4.7.3-mac-0cc7b7e.tar.gz
Source-MD5: 26281f4bab98f2600cbf71e10aad1e0c
SourceDirectory: qt-kde-qt-mac
PatchFile: qtwebkit.patch
PatchFile-MD5: a776ce2d634430ee613deff6135f9694

UseMaxBuildJobs: true
CompileScript: <<
        #!/bin/sh -ev
        
        [ -z "$CC"  ] && CC=gcc
        [ -z "$CXX" ] && CXX=g++
        
        QTDIR=`pwd` bin/syncqt -check-includes
        pushd src/3rdparty/webkit
        %p/lib/qt4-%type_pkg[qtwebkit]/bin/qmake WebKit.pro
        
        for dir in JavaScriptCore WebCore WebKit/qt/declarative 
WebKit/qt/tests; do
        make $dir/Makefile || :
        make $dir/Makefile.Release || :
        make $dir/Makefile.Debug || :
        done
        
        if [ -x /usr/bin/gcc-4.2 ]; then
        CC="gcc-4.2"
        CXX="g++-4.2"
        fi
        
        find . -name Makefile\* | xargs perl -pi -e 's/-framework 
/-Wl,-framework,/g; s/-pipe /-pipe -Os /g; s/-g / /g;'
        perl -pi -e 's,^INCPATH *=,INCPATH = -I../../sqlite ,' WebCore/Makefile*
        make CC="%p/bin/flag-dedup %p/bin/flag-sort -r -v $CC" 
CXX="%p/bin/flag-dedup %p/bin/flag-sort -r -v $CXX" LINK="%p/bin/flag-dedup 
%p/bin/flag-sort -r -v $CXX"
        
        # dunno why I need to do this manually, but...
        pushd WebKit/qt/declarative
        if [ -f Makefile.Release ]; then
        make -f Makefile.Release
        else
        make
        fi
        popd
        popd
<<

InstallScript: <<
#!/bin/sh -ev

        pushd src/3rdparty/webkit
                make -j1 install INSTALL_ROOT="%d"
                pushd WebKit/qt/declarative
                        if [ -f Makefile.Release ]; then
                                make -f Makefile.Release -j1 install 
INSTALL_ROOT="%d"
                        else
                                make -j1 install INSTALL_ROOT="%d"
                        fi
                popd
        popd
        rsync -avr --exclude='*.h' include/QtWebKit/ 
%i/lib/qt4-%type_pkg[qtwebkit]/include/QtWebKit/

        find %i -name \*.prl -o -name \*.pc -o -name \*.la | xargs perl -pi -e 
's,%b/lib,%p/lib/qt4-%type_pkg[qtwebkit]/lib,g; s/-framework 
/-Wl,-framework,/g;'
        install_name_tool -id 
"%p/lib/qt4-%type_pkg[qtwebkit]/lib/QtWebKit.framework/Versions/4/QtWebKit" 
"%i/lib/qt4-%type_pkg[qtwebkit]/lib/QtWebKit.framework/Versions/4/QtWebKit"
        for file in "%i/lib/qt4-%type_pkg[qtwebkit]/imports/QtWebKit"/*.bundle; 
do
                install_name_tool -change 
"../lib/QtWebKit.framework/Versions/4/QtWebKit" 
"%p/lib/qt4-%type_pkg[qtwebkit]/lib/QtWebKit.framework/Versions/4/QtWebKit" 
"$file"
        done
<<
SplitOff: <<
        Package: %N-shlibs
        Description: Shared libraries for QtWebKit
        Depends: <<
                libpng15-shlibs (>= 1.5.2-1),
                phonon-%type_pkg[qtwebkit]-shlibs (>= 4.5.0-1),
                qt4-base-%type_pkg[qtwebkit]-qtcore-shlibs (>= 4.7.3-1),
                qt4-base-%type_pkg[qtwebkit]-qtdeclarative-shlibs (>= 4.7.3-1),
                qt4-base-%type_pkg[qtwebkit]-qtgui-shlibs (>= 4.7.3-1),
                qt4-base-%type_pkg[qtwebkit]-qtnetwork-shlibs (>= 4.7.3-1),
                qt4-base-%type_pkg[qtwebkit]-qtscript-shlibs (>= 4.7.3-1),
                qt4-base-%type_pkg[qtwebkit]-qtsql-shlibs (>= 4.7.3-1),
                qt4-base-%type_pkg[qtwebkit]-qtsvg-shlibs (>= 4.7.3-1),
                qt4-base-%type_pkg[qtwebkit]-qtxmlpatterns-shlibs (>= 4.7.3-1),
                sqlite3-shlibs (>= 3.7.6.2-1)
        <<
        Replaces: <<
                qt4-%type_pkg[qtwebkit]-gui-shlibs (<< 4.7.3-1),
                qt4-%type_pkg[qtwebkit] (<< 4.7.3-1)
        <<
        Files: <<
                
lib/qt4-%type_pkg[qtwebkit]/lib/QtWebKit.framework/Versions/4/QtWebKit
                
lib/qt4-%type_pkg[qtwebkit]/lib/QtWebKit.framework/Versions/Current
                lib/qt4-%type_pkg[qtwebkit]/lib/QtWebKit.framework/QtWebKit
                lib/qt4-%type_pkg[qtwebkit]/imports
        <<
        Shlibs: 
%p/lib/qt4-%type_pkg[qtwebkit]/lib/QtWebKit.framework/Versions/4/QtWebKit 4.7.0 
%n (>= 2.0.0-1)
<<

DescDetail: <<
QtWebKit provides a Web browser engine that makes it easy to
embed content from the World Wide Web into your Qt application.
<<
<<


--- NEW FILE: qtwebkit-x11.info ---
Info4: <<
Package: qtwebkit-x11
Version: 2.0.0
Revision: 6
Description: Qt browser framework
Type: qtwebkit (x11)
License: LGPL
Maintainer: Benjamin Reed <qtweb...@fink.raccoonfink.com>

Depends: %N-shlibs (>= %v-%r)
BuildDepends: <<
        fink (>= 0.30.0-1),
        flag-dedup (>= 0.2-1),
        flag-sort (>= 0.4-1),
        libiconv-dev,
        libpng15 (>= 1.5.2-1),
        phonon-%type_pkg[qtwebkit],
        sqlite3-dev (>= 3.7.6.2-1),
        system-openssl-dev,
        qt4-base-%type_pkg[qtwebkit] (>= 4.7.3-1)
<<
Replaces: qt4-%type_pkg[qtwebkit] (<< 4.7.3-1)
GCC: 4.0

CustomMirror: <<
        Primary: http://www.finkproject.org/~ranger/distfiles
        eur-NL: http://www.finkproject.org/~ranger/distfiles
        nam-US: http://ranger.befunk.com/fink
<<
Source: mirror:custom:qt/qt-4.7.3-mac-0cc7b7e.tar.gz
Source-MD5: 26281f4bab98f2600cbf71e10aad1e0c
SourceDirectory: qt-kde-qt-mac
PatchFile: qtwebkit.patch
PatchFile-MD5: a776ce2d634430ee613deff6135f9694

UseMaxBuildJobs: true
CompileScript: <<
        #!/bin/sh -ev
        
        [ -z "$CC"  ] && CC=gcc
        [ -z "$CXX" ] && CXX=g++
        
        QTDIR=`pwd` bin/syncqt -check-includes
        pushd src/3rdparty/webkit
        %p/lib/qt4-%type_pkg[qtwebkit]/bin/qmake WebKit.pro
        
        for dir in JavaScriptCore WebCore WebKit/qt/declarative 
WebKit/qt/tests; do
        make $dir/Makefile || :
        make $dir/Makefile.Release || :
        make $dir/Makefile.Debug || :
        done
        
        if [ -x /usr/bin/gcc-4.2 ]; then
        CC="gcc-4.2"
        CXX="g++-4.2"
        fi
        
        find . -name Makefile\* | xargs perl -pi -e 's/-framework 
/-Wl,-framework,/g; s/-pipe /-pipe -Os /g; s/-g / /g;'
        perl -pi -e 's,^INCPATH *=,INCPATH = -I../../sqlite ,' WebCore/Makefile*
        make CC="%p/bin/flag-dedup %p/bin/flag-sort -r -v $CC" 
CXX="%p/bin/flag-dedup %p/bin/flag-sort -r -v $CXX" LINK="%p/bin/flag-dedup 
%p/bin/flag-sort -r -v $CXX"
        
        # dunno why I need to do this manually, but...
        pushd WebKit/qt/declarative
        if [ -f Makefile.Release ]; then
        make -f Makefile.Release
        else
        make
        fi
        popd
        popd
<<

InstallScript: <<
#!/bin/sh -ev

        pushd src/3rdparty/webkit
                make -j1 install INSTALL_ROOT="%d"
                pushd WebKit/qt/declarative
                        if [ -f Makefile.Release ]; then
                                make -f Makefile.Release -j1 install 
INSTALL_ROOT="%d"
                        else
                                make -j1 install INSTALL_ROOT="%d"
                        fi
                popd
        popd
        rsync -avr --exclude='*.h' include/QtWebKit/ 
%i/lib/qt4-%type_pkg[qtwebkit]/include/QtWebKit/

        find %i -name \*.prl -o -name \*.pc -o -name \*.la | xargs perl -pi -e 
's,%b/lib,%p/lib/qt4-%type_pkg[qtwebkit]/lib,g; s/-framework 
/-Wl,-framework,/g;'
        install_name_tool -id 
"%p/lib/qt4-%type_pkg[qtwebkit]/lib/libQtWebKit.4.dylib" 
"%i/lib/qt4-%type_pkg[qtwebkit]/lib/libQtWebKit.4.dylib"
        for file in "%i/lib/qt4-%type_pkg[qtwebkit]/imports/QtWebKit"/*.so; do
                install_name_tool -change "../lib/libQtWebKit.4.dylib" 
"%p/lib/qt4-%type_pkg[qtwebkit]/lib/libQtWebKit.4.dylib" "$file"
        done
<<
SplitOff: <<
        Package: %N-shlibs
        Description: Shared libraries for QtWebKit
        Depends: <<
                libpng15-shlibs (>= 1.5.2-1),
                phonon-%type_pkg[qtwebkit]-shlibs (>= 4.5.0-1),
                qt4-base-%type_pkg[qtwebkit]-qtcore-shlibs (>= 4.7.3-1),
                qt4-base-%type_pkg[qtwebkit]-qtdeclarative-shlibs (>= 4.7.3-1),
                qt4-base-%type_pkg[qtwebkit]-qtgui-shlibs (>= 4.7.3-1),
                qt4-base-%type_pkg[qtwebkit]-qtnetwork-shlibs (>= 4.7.3-1),
                qt4-base-%type_pkg[qtwebkit]-qtscript-shlibs (>= 4.7.3-1),
                qt4-base-%type_pkg[qtwebkit]-qtsql-shlibs (>= 4.7.3-1),
                qt4-base-%type_pkg[qtwebkit]-qtsvg-shlibs (>= 4.7.3-1),
                qt4-base-%type_pkg[qtwebkit]-qtxmlpatterns-shlibs (>= 4.7.3-1),
                sqlite3-shlibs (>= 3.7.6.2-1)
        <<
        Replaces: <<
                qt4-%type_pkg[qtwebkit]-gui-shlibs (<< 4.7.3-1),
                qt4-%type_pkg[qtwebkit] (<< 4.7.3-1)
        <<
        Files: <<
                lib/qt4-%type_pkg[qtwebkit]/lib/libQtWebKit.4*.dylib
                lib/qt4-%type_pkg[qtwebkit]/imports
        <<
        Shlibs: %p/lib/qt4-%type_pkg[qtwebkit]/lib/libQtWebKit.4.dylib 4.7.0 %n 
(>= 2.0.0-1)
<<

DescDetail: <<
QtWebKit provides a Web browser engine that makes it easy to
embed content from the World Wide Web into your Qt application.
<<
<<


--- NEW FILE: qtwebkit.patch ---
diff -Nurd qt-kde-qt-mac/src/3rdparty/webkit/WebCore/WebCore.pro 
qt-kde-qt-mac-new/src/3rdparty/webkit/WebCore/WebCore.pro
--- qt-kde-qt-mac/src/3rdparty/webkit/WebCore/WebCore.pro       2011-05-08 
23:25:04.000000000 -0400
+++ qt-kde-qt-mac-new/src/3rdparty/webkit/WebCore/WebCore.pro   2011-05-17 
00:11:07.000000000 -0400
@@ -2,6 +2,8 @@
 CONFIG += building-libs
 CONFIG += depend_includepath
 
+contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
+
 symbian: {
     TARGET.EPOCALLOWDLLDATA=1
     TARGET.CAPABILITY = All -Tcb
diff -Nurd 
qt-kde-qt-mac/src/3rdparty/webkit/WebCore/platform/sql/SQLiteDatabase.cpp 
qt-kde-qt-mac-new/src/3rdparty/webkit/WebCore/platform/sql/SQLiteDatabase.cpp
--- qt-kde-qt-mac/src/3rdparty/webkit/WebCore/platform/sql/SQLiteDatabase.cpp   
2010-12-27 15:22:06.000000000 -0500
+++ 
qt-kde-qt-mac-new/src/3rdparty/webkit/WebCore/platform/sql/SQLiteDatabase.cpp   
    2011-05-16 23:24:29.000000000 -0400
@@ -374,9 +374,9 @@
     m_lockingMutex.unlock();
 }
 
-bool SQLiteDatabase::isAutoCommitOn() const
+bool SQLiteDatabase::isAutoCommitOn()
 {
-    return sqlite3_get_autocommit(m_db);
+    return (sqlite3_get_autocommit(m_db) != 0);
 }
 
 } // namespace WebCore
diff -Nurd 
qt-kde-qt-mac/src/3rdparty/webkit/WebCore/platform/sql/SQLiteDatabase.h 
qt-kde-qt-mac-new/src/3rdparty/webkit/WebCore/platform/sql/SQLiteDatabase.h
--- qt-kde-qt-mac/src/3rdparty/webkit/WebCore/platform/sql/SQLiteDatabase.h     
2010-12-27 15:22:06.000000000 -0500
+++ qt-kde-qt-mac-new/src/3rdparty/webkit/WebCore/platform/sql/SQLiteDatabase.h 
2011-05-16 23:24:29.000000000 -0400
@@ -106,7 +106,7 @@
     // (un)locks the database like a mutex
     void lock();
     void unlock();
-    bool isAutoCommitOn() const;
+    bool isAutoCommitOn();
 
     // Set this flag to allow access from multiple threads.  Not all 
multi-threaded accesses are safe!
     // See http://www.sqlite.org/cvstrac/wiki?p=MultiThreading for more info.


------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to