Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/web
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14289

Modified Files:
        webkit-1.0.1.info 
Added Files:
        webkit-1.0.2.info webkit-1.0.2.patch 
Log Message:
new version


--- NEW FILE: webkit-1.0.2.info ---
Package: webkit-1.0.2
Version: 1.1.10
Revision: 1

Source: http://webkitgtk.org/webkit-%v.tar.gz
Source-MD5: b852753b3e21f010f565312132f88311

BuildDepends: <<
        atk1 (>= 1.26.0-1),
        cairo (>= 1.8-1),
        enchant1-dev (>= 1.4.2-1),
        expat1,
        fink (>= 0.24.12),
        fontconfig2-dev (>= 2.4.1-1),
        flex-devel,
        freetype219 (>= 2.3.8-2),
        gperf,
        glib2-dev (>= 2.20.0-1),
        glitz,
        gtk-doc (>= 1.11-1),
        gnutls26 (>= 2.8.0-1),
        gtk+2-dev (>= 2.16.0-1),
        libgcrypt (>= 1.4.3-2),
        libgettext3-dev,
        libgpg-error,
        libiconv-dev,
        libjpeg,
        libpng3,
        libsoup2.4.1-ssl (>= 2.26.0-1),
        libtasn1-3,
        libxml2 (>= 2.6.30-1),
        libxslt,
        pango1-xft2-ft219-dev (>= 1.24.0-1),
        pixman (>= 0.14.0-1),
        pkgconfig (>= 0.23),
        sqlite3-dev,
        x11-dev
<<
Depends: %n-shlibs (= %v-%r)
Conflicts: webkit-1.0.1
Replaces: webkit-1.0.1
BuildDependsOnly: true
GCC: 4.0

PatchFile: %n.patch
PatchFile-MD5: 4bad707429fffc5cfb104be4174daa33
PatchScript: <<
        %{default_script}
        echo "WebKit is open source software with portions licensed under the 
LGPL, BSD, and APSL licenses. Complete license and copyright information can be 
found within the code and in the other LICENSE* files." > LICENSE
<<

ConfigureParams: <<
        --disable-dependency-tracking \
        --disable-video \
        PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH" \
        XT_CFLAGS=" " XT_LIBS=-lXt
<<
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1

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

        # for new version of flex
        export PATH="%p/lib/flex/bin:$PATH"

        ./configure %c
        mkdir DerivedSources
        make
<<

InstallScript: make install DESTDIR=%d
DocFiles: <<
        ChangeLog
        JavaScriptCore/ChangeLog:ChangeLog.JavaScriptCore
        WebCore/ChangeLog:ChangeLog.WebCore
        WebKit/gtk/ChangeLog:ChangeLog.WebKit.gtk
        WebKit/gtk/po/ChangeLog:ChangeLog.WebKit.gtk.po
        LICENSE
        JavaScriptCore/icu/LICENSE:LICENSE.JavaScriptCore.icu
        WebCore/icu/LICENSE:LICENSE.WebCore.icu
        WebCore/LICENSE-APPLE:LICENSE-LGPL-APPLE.WebCore
        WebCore/LICENSE-LGPL-2:LICENSE-LGPL-2.WebCore
        WebCore/LICENSE-LGPL-2.1:LICENSE-LGPL-2.1.WebCore
        WebKit/LICENSE:LICENSE.WebKit
<<

SplitOff: <<
        Package: %N-shlibs
        Files: lib/libwebkit-1.0.2.dylib
        Depends: <<
                atk1-shlibs (>= 1.26.0-1),
                cairo-shlibs (>= 1.8-1),
                enchant1-shlibs (>= 1.4.2-1),
                expat1-shlibs,
                fontconfig2-shlibs (>= 2.4.1-1),
                freetype219-shlibs (>= 2.3.8-2),
                glib2-shlibs (>= 2.20.0-1),
                glitz-shlibs,
                gnutls26-shlibs (>= 2.8.0-1),
                gtk+2-shlibs (>= 2.16.0-1),
                libgcrypt-shlibs (>= 1.4.3-2),
                libgettext3-shlibs,
                libgpg-error-shlibs,
                libiconv,
                libjpeg-shlibs,
                libpng3-shlibs,
                libsoup2.4.1-ssl-shlibs (>= 2.26.0-1),
                libtasn1-3-shlibs,
                libxml2-shlibs (>= 2.6.30-1),
                libxslt-shlibs,
                pango1-xft2-ft219-shlibs (>= 1.24.0-1),
                pixman-shlibs (>= 0.14.0-1),
                sqlite3-shlibs,
                x11
        <<
        Shlibs: %p/lib/libwebkit-1.0.2.dylib 10.0.0 %n (>= 1.1.10-1)
        DocFiles: <<
                ChangeLog
                JavaScriptCore/ChangeLog:ChangeLog.JavaScriptCore
                WebCore/ChangeLog:ChangeLog.WebCore
                WebKit/gtk/ChangeLog:ChangeLog.WebKit.gtk
                WebKit/gtk/po/ChangeLog:ChangeLog.WebKit.gtk.po
                LICENSE
                JavaScriptCore/icu/LICENSE:LICENSE.JavaScriptCore.icu
                WebCore/icu/LICENSE:LICENSE.WebCore.icu
                WebCore/LICENSE-APPLE:LICENSE-APPLE.WebCore
                WebCore/LICENSE-LGPL-2:LICENSE-LGPL-2.WebCore
                WebCore/LICENSE-LGPL-2.1:LICENSE-LGPL-2.1.WebCore
                WebKit/LICENSE:LICENSE.WebKit
        <<
<<

DescPackaging: <<
        Use webkitgtk upstream so we get stable release versioning and
        a complete source distro with autotools, etc.

        Disable video to avoid gst* dep-chain.

        Force use of libtool instead of dolt (would only use dolt on
        intel anyway, better to have consistent build on all platforms
        for packaging).

        Make gettext domain match versioned lib.
<<
DescPort: <<
        fink's libicuXX-dev are just headers and lib-links for apple's
        libicu library and only the "correct" one is available for
        each OS X version, so libversion-alternatives will "work
        correctly" on the local machine at build-time (and we assume
        that apple's libs are backward-compatible). But hack configure
        to use system icu instead of onboard lib.

        If --disable-dependency-tracking, DerivedSources/Lexer.lut.h
        is used as target of STDOUT redirect of create_hash_table
        script before DerivedSources/ exists (it can be created by
        that script, but that's too late!). If dependency-tracking
        enabled, dir is created during depfiles or similar mechanism
        prior to trying to create a file in it. See:
        http://bugs.gentoo.org/show_bug.cgi?format=multiple&id=269765

        Need XP_UNIX so that npapi.h doesn't load QuickDraw (we're
        doing x11, not native Mac). See:
        https://bugs.webkit.org/show_bug.cgi?id=17001
<<

DescDetail: <<
        Various parts are licensed under LGPL, BSD, and APSL
<<
Description: Web browser engine based on khtml/kjs
License: OSI-Approved
Homepage: http://webkitgtk.org
Maintainer: Daniel Macks <dma...@netspace.org>

Index: webkit-1.0.1.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/web/webkit-1.0.1.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- webkit-1.0.1.info   9 May 2009 17:21:16 -0000       1.2
+++ webkit-1.0.1.info   18 Jun 2009 06:23:54 -0000      1.3
@@ -1,6 +1,6 @@
 Package: webkit-1.0.1
 Version: r35788
-Revision: 1
+Revision: 2
 
 Source: http://builds.nightly.webkit.org/files/trunk/src/WebKit-%v.tar.bz2
 Source-MD5: 012d6fb23253164d055ba344b4cab66e
@@ -38,6 +38,8 @@
        xft2-dev
 <<
 Depends: %n-shlibs (= %v-%r)
+Conflicts: webkit-1.0.2
+Replaces: webkit-1.0.2
 BuildDependsOnly: true
 GCC: 4.0
 

--- NEW FILE: webkit-1.0.2.patch ---
diff -Nurd -x'*~' webkit-1.1.10.orig/GNUmakefile.in webkit-1.1.10/GNUmakefile.in
--- webkit-1.1.10.orig/GNUmakefile.in   2009-06-15 11:23:16.000000000 -0400
+++ webkit-1.1.10/GNUmakefile.in        2009-06-17 13:09:03.000000000 -0400
@@ -8111,7 +8111,7 @@
 @TARGET_X11_TRUE@      -I$(srcdir)/WebCore/plugins \
 @TARGET_X11_TRUE@      
-I$(srcdir)/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj \
 @TARGET_X11_TRUE@      $(global_cppflags) \
-...@target_x11_true@   $(javascriptcore_cppflags)
+...@target_x11_true@   $(javascriptcore_cppflags) -DXP_UNIX
 
 @target_x11_t...@testnetscapeplugin_libtestnetscapeplugin_la_sources = \
 @TARGET_X11_TRUE@      
WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h
 \
diff -Nurd -x'*~' webkit-1.1.10.orig/configure webkit-1.1.10/configure
--- webkit-1.1.10.orig/configure        2009-06-15 11:23:17.000000000 -0400
+++ webkit-1.1.10/configure     2009-06-17 13:50:53.000000000 -0400
@@ -18141,9 +18141,10 @@
     dolt_supported=no
     ;;
 esac
+dolt_supported=no
 if test x$dolt_supported = xno ; then
-    { $as_echo "$as_me:$LINENO: result: no, falling back to libtool" >&5
-$as_echo "no, falling back to libtool" >&6; }
+    { $as_echo "$as_me:$LINENO: result: disabled for fink packaging, falling 
back to libtool" >&5
+$as_echo "disabled for fink packaging, falling back to libtool" >&6; }
     LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(COMPILE)'
     LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(CXXCOMPILE)'
 else
@@ -19566,7 +19567,7 @@
 # with the WTF Unicode backend being based on GLib while text codecs and 
TextBreakIterator
 # keep the ICU dependency. That's why we temporarily add icu headers and libs 
for glib config case as well.
 if test "$with_unicode_backend" = "icu" -o "$with_unicode_backend" = "glib"; 
then
-       if test "$os_darwin" = "yes"; then
+       if test "$os_darwin" = "fink has icu-config"; then
                UNICODE_CFLAGS="-I\$(srcdir)/JavaScriptCore/icu 
-I\$(srcdir)/WebCore/icu"
                UNICODE_LIBS="-licucore"
        elif test "$os_win32" = "yes"; then
@@ -19758,7 +19759,7 @@
 done
 
 
-GETTEXT_PACKAGE=$PACKAGE
+GETTEXT_PACKAGE="${PACKAGE}-1.0.2"
 
 
 cat >>confdefs.h <<_ACEOF


------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing 
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to