Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/web
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15109/web
Modified Files:
webkit-1.0.2.info webkit-1.0.2.patch
Log Message:
latest gnome and kde3 to stable, along with .la cleaning and associated build
fixes and others uncovered while working on it, and other related packages
Index: webkit-1.0.2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/web/webkit-1.0.2.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- webkit-1.0.2.info 13 Feb 2010 20:10:44 -0000 1.3
+++ webkit-1.0.2.info 2 Nov 2010 15:46:19 -0000 1.4
@@ -1,66 +1,68 @@
Package: webkit-1.0.2
-Version: 1.1.10
-Revision: 5
+Version: 1.1.15.4
+Revision: 3
Source: http://webkitgtk.org/webkit-%v.tar.gz
-Source-MD5: b852753b3e21f010f565312132f88311
+Source-MD5: 47301fb7120421ac38bf714db8f5d428
BuildDepends: <<
- atk1 (>= 1.26.0-1),
- cairo (>= 1.8-1),
+ atk1 (>= 1.28.0-1),
+ bison,
+ cairo (>= 1.8.8-3),
enchant1-dev (>= 1.4.2-1),
- expat1,
fink (>= 0.24.12),
- fontconfig2-dev (>= 2.4.1-1),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
flex-devel,
- freetype219 (>= 2.3.8-2),
+ freetype219 (>= 2.3.12-1),
gettext-bin,
gettext-tools,
gperf,
- glib2-dev (>= 2.20.0-1),
+ glib2-dev (>= 2.22.0-1),
glitz,
- gtk-doc (>= 1.11-1),
- gnutls26 (>= 2.8.0-1),
- gtk+2-dev (>= 2.16.0-1),
+ gtk-doc (>= 1.13-5),
+ gtk+2-dev (>= 2.18.0-1),
intltool40,
- libgcrypt (>= 1.4.3-2),
- libgettext3-dev,
- libgpg-error,
+ libgettext8-dev,
libiconv-dev,
libicu32-dev | libicu36-dev,
- libjpeg,
- libpng3,
- libsoup2.4.1-ssl (>= 2.26.0-1),
- libtasn1-3,
+ libjpeg8,
+ libpng14,
+ libsoup2.4.1-ssl (>= 2.28.0-1),
libxml2 (>= 2.6.30-1),
libxslt,
- pango1-xft2-ft219-dev (>= 1.24.0-1),
- pixman (>= 0.14.0-1),
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
+ pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
sqlite3-dev,
x11-dev
<<
-Depends: %n-shlibs (= %v-%r)
+Depends: <<
+ %n-shlibs (= %v-%r),
+ glib2-shlibs (>= 2.22.0-1)
+<<
Conflicts: webkit-1.0.1
Replaces: webkit-1.0.1
BuildDependsOnly: true
GCC: 4.0
PatchFile: %n.patch
-PatchFile-MD5: 4bad707429fffc5cfb104be4174daa33
+PatchFile-MD5: f917b226ce8ba3b74c1d4b25bb08542e
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
perl -pi -e 's/webkit\.pot/\$(DOMAIN).pot/g' GNUmakefile.in
WebKit/gtk/po/GNUmakefile.am
mv WebKit/gtk/po/webkit.pot WebKit/gtk/po/webkit-1.0.2.pot
+ perl -pi -e 's/\$\(no_undefined\)/-no-undefined/' GNUmakefile.in
+ perl -pi -e 's,libpng12,libpng14,' configure
<<
ConfigureParams: <<
- --disable-dependency-tracking \
+ --enable-dependency-tracking \
--enable-gtk-doc \
--disable-video \
--disable-jit \
- PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH" \
+
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
\
XT_CFLAGS=" " XT_LIBS="-L/usr/X11R6/lib -lXt -lX11"
<<
NoSetMAKEFLAGS: true
@@ -73,9 +75,10 @@
export PATH="%p/lib/flex/bin:$PATH"
./configure %c
- mkdir DerivedSources
+# mkdir DerivedSources
make
make -C WebKit/gtk/docs
+ fink-package-precedence --prohibit-bdep %n .
<<
InstallScript: <<
@@ -101,32 +104,25 @@
Package: %N-shlibs
Files: lib/libwebkit-1.0.2.dylib
Depends: <<
- atk1-shlibs (>= 1.26.0-1),
- cairo-shlibs (>= 1.8-1),
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
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,
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
+ glib2-shlibs (>= 2.22.0-1),
+ gtk+2-shlibs (>= 2.18.0-1),
+ libgettext8-shlibs,
libiconv,
- libjpeg-shlibs,
- libpng3-shlibs,
- libsoup2.4.1-ssl-shlibs (>= 2.26.0-1),
- libtasn1-3-shlibs,
+ libjpeg8-shlibs,
+ libpng14-shlibs,
+ libsoup2.4.1-ssl-shlibs (>= 2.28.0-1),
libxml2-shlibs (>= 2.6.30-1),
libxslt-shlibs,
- pango1-xft2-ft219-shlibs (>= 1.24.0-1),
- pixman-shlibs (>= 0.14.0-1),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
sqlite3-shlibs,
x11
<<
- Shlibs: %p/lib/libwebkit-1.0.2.dylib 10.0.0 %n (>= 1.1.10-1)
+ Shlibs: %p/lib/libwebkit-1.0.2.dylib 14.0.0 %n (>= 1.1.15.4-1)
DocFiles: <<
ChangeLog
JavaScriptCore/ChangeLog:ChangeLog.JavaScriptCore
@@ -158,6 +154,15 @@
webkit_web_view_open() can break on local paths (workaround in
devhelp-0.23-2). See:
https://bugs.webkit.org/show_bug.cgi?id=26588
+
+ Seems to build okay (just deprecation warnings) against
+ libpng14 (even though primarily seems to expect libpng3/12).
+
+ Need newer bison than 10.4 has. See:
+ http://trac.webkit.org/wiki/BuildingQtOnLinux#Incompatibleversionofbison
+
+ Make sure we look for correct libpng (x11 may supply an older
+ one that confuses configure test)
<<
DescPort: <<
fink's libicuXX-dev are just headers and lib-links for apple's
@@ -189,6 +194,12 @@
DOMAIN)--not sure why it does work sometimes! Fix to use our
correct domain. See:
https://bugs.webkit.org/show_bug.cgi?id=30292
+
+ Recent glib doesn't publish -lintl, so pass it directly.
+
+ Link DumpRenderTree against private convenience lib before
+ public shared lib to avoid multiply-defined symbols. See:
+ https://bugs.webkit.org/show_bug.cgi?id=36088
<<
DescDetail: <<
Index: webkit-1.0.2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/web/webkit-1.0.2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- webkit-1.0.2.patch 15 Nov 2009 15:31:12 -0000 1.1
+++ webkit-1.0.2.patch 2 Nov 2010 15:46:19 -0000 1.2
@@ -1,7 +1,26 @@
-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 @@
+diff -Nurd -x'*~' webkit-1.1.15.4.orig/GNUmakefile.in
webkit-1.1.15.4/GNUmakefile.in
+--- webkit-1.1.15.4.orig/GNUmakefile.in 2009-11-27 08:54:41.000000000
-0500
++++ webkit-1.1.15.4/GNUmakefile.in 2010-03-13 13:42:52.000000000 -0500
+@@ -8400,7 +8400,7 @@
+ $(GEOCLUE_LIBS) \
+ $(GLIB_LIBS) \
+ $(GSTREAMER_LIBS) \
+- $(GTK_LIBS) \
++ $(GTK_LIBS) -lintl \
+ $(HILDON_LIBS) \
+ $(JPEG_LIBS) \
+ $(LIBSOUP_LIBS) \
+@@ -8707,8 +8707,8 @@
+ $(LIBSOUP_CFLAGS)
+
+ Programs_DumpRenderTree_LDADD = \
+- libwebkit-1.0.la \
+ libJavaScriptCore.la \
++ libwebkit-1.0.la \
+ $(GLOBALDEPS_LIBS) \
+ $(CAIRO_LIBS) \
+ $(GTK_LIBS) \
+@@ -8727,7 +8727,7 @@
@TARGET_X11_TRUE@ -I$(srcdir)/WebCore/plugins \
@TARGET_X11_TRUE@
-I$(srcdir)/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj \
@TARGET_X11_TRUE@ $(global_cppflags) \
@@ -10,32 +29,28 @@
@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
+diff -Nurd -x'*~' webkit-1.1.15.4.orig/configure webkit-1.1.15.4/configure
+--- webkit-1.1.15.4.orig/configure 2009-11-27 08:54:42.000000000 -0500
++++ webkit-1.1.15.4/configure 2010-03-12 02:29:19.000000000 -0500
+@@ -16722,7 +16722,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if dolt supports this host"
>&5
+ $as_echo_n "checking if dolt supports this host... " >&6; }
+-dolt_supported=yes
+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
+ if test x$DOLT_BASH = x; then
+ dolt_supported=no
+ fi
+@@ -17726,7 +17726,7 @@
# 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"
+ case "$host" in
+- *-*-darwin*)
++ *-*-darwin*-but-not-fink-because-it-has-icu-config)
+ UNICODE_CFLAGS="-I$srcdir/JavaScriptCore/icu
-I$srcdir/WebCore/icu"
UNICODE_LIBS="-licucore"
- elif test "$os_win32" = "yes"; then
-@@ -19758,7 +19759,7 @@
+ ;;
+@@ -17903,7 +17903,7 @@
done
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
