OpenPKG Specs / changeset

     1.1 --- a/qt/qt.spec	Sat Oct 16 12:53:55 2010 +0200
     1.2 +++ b/qt/qt.spec	Sat Oct 16 17:18:32 2010 +0200
     1.3 @@ -28,9 +28,6 @@
     1.4  #   FIXME: MSvB: The effects of these bugs are platform dependent.
     1.5  #   FIXME: MSvB: Solaris 11 IA-32 builds fail while Linux 2.6.25.18
     1.6  #   FIXME: MSvB: AMD64 builds succeed.
     1.7 -#   FIXME: MSvB:
     1.8 -#   FIXME: MSvB: -no-webkit added to broken static buildconf
     1.9 -#   FIXME: MSvB: as work around for 'ld: cannot find -ljscore'
    1.10  
    1.11  #   package information
    1.12  Name:         qt
    1.13 @@ -43,7 +40,7 @@
    1.14  Group:        Development
    1.15  License:      GPL
    1.16  Version:      4.7.0
    1.17 -Release:      20101014
    1.18 +Release:      20101015
    1.19  
    1.20  #   build options
    1.21  %option       with_tools     yes
    1.22 @@ -215,9 +212,11 @@
    1.23      %{l_shtool} subst \
    1.24          -e 's;\(CONFIG[\t ]*+=[\t ]*qt\);\1 x11;' \
    1.25          tools/qtconfig/qtconfig.pro
    1.26 -    #%{l_shtool} subst \
    1.27 -    #    -e "s;\(\\title\) All Classes;\1 Qt's Classes;" \
    1.28 -    #    doc/src/classes.qdoc
    1.29 +    %{l_shtool} subst \
    1.30 +        -e 's;webkit;web-broken-kit;g' \
    1.31 +        tools/assistant/tools/assistant/assistant.pro
    1.32 +    echo "DEFINES += QT_NO_WEBKIT" \
    1.33 +        >>tools/assistant/tools/assistant/assistant.pro
    1.34      %{l_shtool} subst \
    1.35          -e "s;Qt.s Classes;All Classes;" \
    1.36          tools/assistant/tools/assistant/doc/assistant.qdoc \
    1.37 @@ -397,7 +396,7 @@
    1.38          -openssl-linked \
    1.39          -xmlpatterns \
    1.40          -svg \
    1.41 -        -no-webkit \
    1.42 +        -webkit \
    1.43          -system-zlib \
    1.44          -qt-gif \
    1.45          -system-libpng \