r20608 - in /packages/unstable/pywebkitgtk/debian: changelog patches/ patches/00list patches/01_fix_codegen_error.dpatch patches/02_fix_m4_directory.dpatch patches/03_autoreconf.dpatch
huats-guest at users.alioth.debian.org
huats-guest at users.alioth.debian.org
Wed Jul 8 13:14:54 UTC 2009
Author: huats-guest
Date: Wed Jul 8 13:14:53 2009
New Revision: 20608
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20608
Log:
Add the forgotten patch dir
Added:
packages/unstable/pywebkitgtk/debian/patches/
packages/unstable/pywebkitgtk/debian/patches/00list
packages/unstable/pywebkitgtk/debian/patches/01_fix_codegen_error.dpatch (with props)
packages/unstable/pywebkitgtk/debian/patches/02_fix_m4_directory.dpatch (with props)
packages/unstable/pywebkitgtk/debian/patches/03_autoreconf.dpatch (with props)
Modified:
packages/unstable/pywebkitgtk/debian/changelog
Modified: packages/unstable/pywebkitgtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pywebkitgtk/debian/changelog?rev=20608&op=diff
==============================================================================
--- packages/unstable/pywebkitgtk/debian/changelog (original)
+++ packages/unstable/pywebkitgtk/debian/changelog Wed Jul 8 13:14:53 2009
@@ -8,7 +8,7 @@
debian/tmp/usr/lib/python*/*-packages/* for python2.6 transition.
* Fix the codegen error path related to multiple python build :
- debian/patches/01_codegen_error.dpatch: added to fix the error.
- - debian/patches/02_autoreconf.dpatch added.
+ - debian/patches/03_autoreconf.dpatch added.
* Fix the wrong m4 directory lookup:
- debian/patches/02_fix_m4_directory : inclusion of the m4 directory to
ACLOCAL_AMFLAGS.
Added: packages/unstable/pywebkitgtk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pywebkitgtk/debian/patches/00list?rev=20608&op=file
==============================================================================
--- packages/unstable/pywebkitgtk/debian/patches/00list (added)
+++ packages/unstable/pywebkitgtk/debian/patches/00list Wed Jul 8 13:14:53 2009
@@ -1,0 +1,3 @@
+01_fix_codegen_error
+02_fix_m4_directory
+03_autoreconf
Added: packages/unstable/pywebkitgtk/debian/patches/01_fix_codegen_error.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pywebkitgtk/debian/patches/01_fix_codegen_error.dpatch?rev=20608&op=file
==============================================================================
--- packages/unstable/pywebkitgtk/debian/patches/01_fix_codegen_error.dpatch (added)
+++ packages/unstable/pywebkitgtk/debian/patches/01_fix_codegen_error.dpatch Wed Jul 8 13:14:53 2009
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix_codegen_error.dpatch by Christophe Sauthier <christophe.sauthier at objectif-libre.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Avoid to change to the srcdir directory, and stay in the build one, which## DP: is needed due to the multiple python build .
+
+ at DPATCH@
+diff -urNad pywebkitgtk-1.1.4~/Makefile.am pywebkitgtk-1.1.4/Makefile.am
+--- pywebkitgtk-1.1.4~/Makefile.am 2009-05-31 00:50:04.000000000 +0200
++++ pywebkitgtk-1.1.4/Makefile.am 2009-05-31 12:40:02.000000000 +0200
+@@ -52,8 +54,7 @@
+ # disable for now since line is not really critical.
+ # && ! grep -q -v "^\*\*\*INFO\*\*\*" $(*D)/$(*F).errors
+ %.defs.c:
+- (cd $(srcdir) \
+- && $(PYGOBJECT_CODEGEN) \
++ ($(PYGOBJECT_CODEGEN) \
+ --register $(PYGTK_DEFSDIR)/gdk-types.defs \
+ --register $(PYGTK_DEFSDIR)/gtk-types.defs \
+ --override $(*D)/$(*F).override \
Propchange: packages/unstable/pywebkitgtk/debian/patches/01_fix_codegen_error.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/unstable/pywebkitgtk/debian/patches/02_fix_m4_directory.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pywebkitgtk/debian/patches/02_fix_m4_directory.dpatch?rev=20608&op=file
==============================================================================
--- packages/unstable/pywebkitgtk/debian/patches/02_fix_m4_directory.dpatch (added)
+++ packages/unstable/pywebkitgtk/debian/patches/02_fix_m4_directory.dpatch Wed Jul 8 13:14:53 2009
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_fix_m4_directory.dpatch by Christophe Sauthier <christophe.sauthier at objectif-libre.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add the m4 directory to ACLOCAL_AMFLAGS to find AM_CHECK_PYTHON_HEADERS.
+
+ at DPATCH@
+diff -urNad pywebkitgtk-1.1.4~/Makefile.am pywebkitgtk-1.1.4/Makefile.am
+--- pywebkitgtk-1.1.4~/Makefile.am 2009-05-31 00:50:04.000000000 +0200
++++ pywebkitgtk-1.1.4/Makefile.am 2009-05-31 12:40:02.000000000 +0200
+@@ -4,6 +4,8 @@
+ webkit_override :=
+ webkit_cflags :=
+
++ACLOCAL_AMFLAGS = -I m4
++
+ CREATEDEFS = $(PYTHON) $(PYGTK_CODEGENDIR)/createdefs.py
+
+ defsdir = $(pkgdatadir)/defs
Propchange: packages/unstable/pywebkitgtk/debian/patches/02_fix_m4_directory.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/unstable/pywebkitgtk/debian/patches/03_autoreconf.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pywebkitgtk/debian/patches/03_autoreconf.dpatch?rev=20608&op=file
==============================================================================
--- packages/unstable/pywebkitgtk/debian/patches/03_autoreconf.dpatch (added)
+++ packages/unstable/pywebkitgtk/debian/patches/03_autoreconf.dpatch Wed Jul 8 13:14:53 2009
@@ -1,0 +1,1457 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_autoreconf.dpatch by Christophe Sauthier <christophe.sauthier at objectif-libre.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Run of autoreconf, then removal of autom4te.cache .
+
+ at DPATCH@
+diff -urNad pywebkitgtk-1.1.5~/Makefile.in pywebkitgtk-1.1.5/Makefile.in
+--- pywebkitgtk-1.1.5~/Makefile.in 2009-05-28 23:42:31.000000000 +0200
++++ pywebkitgtk-1.1.5/Makefile.in 2009-05-31 13:09:13.000000000 +0200
+@@ -103,7 +103,7 @@
+ distuninstallcheck_listfiles = find . -type f -print
+ distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
++ACLOCAL_AMFLAGS = -I m4
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -813,8 +813,7 @@
+ # disable for now since line is not really critical.
+ # && ! grep -q -v "^\*\*\*INFO\*\*\*" $(*D)/$(*F).errors
+ %.defs.c:
+- (cd $(srcdir) \
+- && $(PYGOBJECT_CODEGEN) \
++ ($(PYGOBJECT_CODEGEN) \
+ --register $(PYGTK_DEFSDIR)/gdk-types.defs \
+ --register $(PYGTK_DEFSDIR)/gtk-types.defs \
+ --override $(*D)/$(*F).override \
+diff -urNad pywebkitgtk-1.1.5~/Makefile.in.rej pywebkitgtk-1.1.5/Makefile.in.rej
+--- pywebkitgtk-1.1.5~/Makefile.in.rej 1970-01-01 01:00:00.000000000 +0100
++++ pywebkitgtk-1.1.5/Makefile.in.rej 2009-05-31 13:08:43.000000000 +0200
+@@ -0,0 +1,45 @@
++***************
++*** 1,4 ****
++- # Makefile.in generated by automake 1.10.1 from Makefile.am.
++ # @configure_input@
++
++ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++--- 1,4 ----
+++ # Makefile.in generated by automake 1.10.2 from Makefile.am.
++ # @configure_input@
++
++ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++***************
++*** 481,487 ****
++ -rm -rf webkit/.libs webkit/_libs
++
++ distclean-libtool:
++- -rm -f libtool
++ install-defsDATA: $(defs_DATA)
++ @$(NORMAL_INSTALL)
++ test -z "$(defsdir)" || $(MKDIR_P) "$(DESTDIR)$(defsdir)"
++--- 481,487 ----
++ -rm -rf webkit/.libs webkit/_libs
++
++ distclean-libtool:
+++ -rm -f libtool config.lt
++ install-defsDATA: $(defs_DATA)
++ @$(NORMAL_INSTALL)
++ test -z "$(defsdir)" || $(MKDIR_P) "$(DESTDIR)$(defsdir)"
++***************
++*** 505,511 ****
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ mkid -fID $$unique
++ tags: TAGS
++--- 505,511 ----
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
+++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ mkid -fID $$unique
++ tags: TAGS
+diff -urNad pywebkitgtk-1.1.5~/aclocal.m4 pywebkitgtk-1.1.5/aclocal.m4
+--- pywebkitgtk-1.1.5~/aclocal.m4 2009-05-28 23:42:29.000000000 +0200
++++ pywebkitgtk-1.1.5/aclocal.m4 2009-05-31 13:09:11.000000000 +0200
+@@ -468,59 +468,61 @@
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-#serial 4
++#serial 5
+
+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
+ # ------------------------------
+ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
+-# are listed without --file. Let's play safe and only enable the eval
+-# if we detect the quoting.
+-case $CONFIG_FILES in
+-*\'*) eval set x "$CONFIG_FILES" ;;
+-*) set x $CONFIG_FILES ;;
+-esac
+-shift
+-for mf
+-do
+- # Strip MF so we end up with the name of the file.
+- mf=`echo "$mf" | sed -e 's/:.*$//'`
+- # Check whether this is an Automake generated Makefile or not.
+- # We used to match only the files named `Makefile.in', but
+- # some people rename them; so instead we look at the file content.
+- # Grep'ing the first line is not enough: some people post-process
+- # each Makefile.in and add a new line on top of each file to say so.
+- # Grep'ing the whole file is not good either: AIX grep has a line
+- # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+- dirpart=`AS_DIRNAME("$mf")`
+- else
+- continue
+- fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+- test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+- # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+- # Make sure the directory exists.
+- test -f "$dirpart/$file" && continue
+- fdir=`AS_DIRNAME(["$file"])`
+- AS_MKDIR_P([$dirpart/$fdir])
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
++[{
++ # Autoconf 2.62 quotes --file arguments for eval, but not when files
++ # are listed without --file. Let's play safe and only enable the eval
++ # if we detect the quoting.
++ case $CONFIG_FILES in
++ *\'*) eval set x "$CONFIG_FILES" ;;
++ *) set x $CONFIG_FILES ;;
++ esac
++ shift
++ for mf
++ do
++ # Strip MF so we end up with the name of the file.
++ mf=`echo "$mf" | sed -e 's/:.*$//'`
++ # Check whether this is an Automake generated Makefile or not.
++ # We used to match only the files named `Makefile.in', but
++ # some people rename them; so instead we look at the file content.
++ # Grep'ing the first line is not enough: some people post-process
++ # each Makefile.in and add a new line on top of each file to say so.
++ # Grep'ing the whole file is not good either: AIX grep has a line
++ # limit of 2048, but all sed's we know have understand at least 4000.
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++ dirpart=`AS_DIRNAME("$mf")`
++ else
++ continue
++ fi
++ # Extract the definition of DEPDIR, am__include, and am__quote
++ # from the Makefile without running `make'.
++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++ test -z "$DEPDIR" && continue
++ am__include=`sed -n 's/^am__include = //p' < "$mf"`
++ test -z "am__include" && continue
++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++ # When using ansi2knr, U may be empty or an underscore; expand it
++ U=`sed -n 's/^U = //p' < "$mf"`
++ # Find all dependency output files, they are included files with
++ # $(DEPDIR) in their names. We invoke sed twice because it is the
++ # simplest approach to changing $(DEPDIR) to its actual value in the
++ # expansion.
++ for file in `sed -n "
++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++ # Make sure the directory exists.
++ test -f "$dirpart/$file" && continue
++ fdir=`AS_DIRNAME(["$file"])`
++ AS_MKDIR_P([$dirpart/$fdir])
++ # echo "creating $dirpart/$file"
++ echo '# dummy' > "$dirpart/$file"
++ done
+ done
+-done
++}
+ ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+@@ -994,7 +996,13 @@
+ dnl doesn't work.
+ AC_CACHE_CHECK([for $am_display_PYTHON script directory],
+ [am_cv_python_pythondir],
+- [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
++ [if test "x$prefix" = xNONE
++ then
++ py_prefix_arg=
++ else
++ py_prefix_arg=",prefix='$prefix'"
++ fi
++ am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null ||
+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
+ AC_SUBST([pythondir], [$am_cv_python_pythondir])
+
+@@ -1011,8 +1019,14 @@
+ dnl doesn't work.
+ AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
+ [am_cv_python_pyexecdir],
+- [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
+- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
++ [if test "x$exec_prefix" = xNONE
++ then
++ py_exec_prefix_arg=$py_prefix_arg
++ else
++ py_exec_prefix_arg=",prefix='$exec_prefix'"
++ fi
++ am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0$py_exec_prefix_arg)" -n -q install $py_exec_prefix_arg 2>/dev/null ||
++ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
+ AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
+
+ dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
+diff -urNad pywebkitgtk-1.1.5~/aclocal.m4.rej pywebkitgtk-1.1.5/aclocal.m4.rej
+--- pywebkitgtk-1.1.5~/aclocal.m4.rej 1970-01-01 01:00:00.000000000 +0100
++++ pywebkitgtk-1.1.5/aclocal.m4.rej 2009-05-31 13:08:43.000000000 +0200
+@@ -0,0 +1,285 @@
++***************
++*** 1,4 ****
++- # generated automatically by aclocal 1.10.1 -*- Autoconf -*-
++
++ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++ # 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++--- 1,4 ----
+++ # generated automatically by aclocal 1.10.2 -*- Autoconf -*-
++
++ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++ # 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++***************
++*** 13,19 ****
++
++ m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++- m4_if(AC_AUTOCONF_VERSION, [2.63],,
++ [m4_warning([this file was generated for autoconf 2.63.
++ You have another version of autoconf. It may work, but is not guaranteed to.
++ If you have problems, you may need to regenerate the build system entirely.
++--- 13,19 ----
++
++ m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+++ m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
++ [m4_warning([this file was generated for autoconf 2.63.
++ You have another version of autoconf. It may work, but is not guaranteed to.
++ If you have problems, you may need to regenerate the build system entirely.
++***************
++*** 177,183 ****
++ fi[]dnl
++ ])# PKG_CHECK_MODULES
++
++- # Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
++ #
++ # This file is free software; the Free Software Foundation
++ # gives unlimited permission to copy and/or distribute it,
++--- 177,183 ----
++ fi[]dnl
++ ])# PKG_CHECK_MODULES
++
+++ # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++ #
++ # This file is free software; the Free Software Foundation
++ # gives unlimited permission to copy and/or distribute it,
++***************
++*** 192,198 ****
++ [am__api_version='1.10'
++ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
++ dnl require some minimum version. Point them to the right macro.
++- m4_if([$1], [1.10.1], [],
++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
++ ])
++
++--- 192,198 ----
++ [am__api_version='1.10'
++ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
++ dnl require some minimum version. Point them to the right macro.
+++ m4_if([$1], [1.10.2], [],
++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
++ ])
++
++***************
++*** 206,217 ****
++ # AM_SET_CURRENT_AUTOMAKE_VERSION
++ # -------------------------------
++ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
++- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
++- [AM_AUTOMAKE_VERSION([1.10.1])dnl
++ m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++- _AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
++
++ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
++
++--- 206,217 ----
++ # AM_SET_CURRENT_AUTOMAKE_VERSION
++ # -------------------------------
++ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+++ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
++ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+++ [AM_AUTOMAKE_VERSION([1.10.2])dnl
++ m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+++ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
++
++ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
++
++***************
++*** 461,517 ****
++
++ # Generate code to set up dependency tracking. -*- Autoconf -*-
++
++- # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++ # Free Software Foundation, Inc.
++ #
++ # This file is free software; the Free Software Foundation
++ # gives unlimited permission to copy and/or distribute it,
++ # with or without modifications, as long as this notice is preserved.
++
++- #serial 3
++
++ # _AM_OUTPUT_DEPENDENCY_COMMANDS
++ # ------------------------------
++ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
++- [for mf in $CONFIG_FILES; do
++- # Strip MF so we end up with the name of the file.
++- mf=`echo "$mf" | sed -e 's/:.*$//'`
++- # Check whether this is an Automake generated Makefile or not.
++- # We used to match only the files named `Makefile.in', but
++- # some people rename them; so instead we look at the file content.
++- # Grep'ing the first line is not enough: some people post-process
++- # each Makefile.in and add a new line on top of each file to say so.
++- # Grep'ing the whole file is not good either: AIX grep has a line
++- # limit of 2048, but all sed's we know have understand at least 4000.
++- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++- dirpart=`AS_DIRNAME("$mf")`
++- else
++- continue
++- fi
++- # Extract the definition of DEPDIR, am__include, and am__quote
++- # from the Makefile without running `make'.
++- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++- test -z "$DEPDIR" && continue
++- am__include=`sed -n 's/^am__include = //p' < "$mf"`
++- test -z "am__include" && continue
++- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++- # When using ansi2knr, U may be empty or an underscore; expand it
++- U=`sed -n 's/^U = //p' < "$mf"`
++- # Find all dependency output files, they are included files with
++- # $(DEPDIR) in their names. We invoke sed twice because it is the
++- # simplest approach to changing $(DEPDIR) to its actual value in the
++- # expansion.
++- for file in `sed -n "
++- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++- # Make sure the directory exists.
++- test -f "$dirpart/$file" && continue
++- fdir=`AS_DIRNAME(["$file"])`
++- AS_MKDIR_P([$dirpart/$fdir])
++- # echo "creating $dirpart/$file"
++- echo '# dummy' > "$dirpart/$file"
++ done
++- done
++ ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
++
++
++--- 461,528 ----
++
++ # Generate code to set up dependency tracking. -*- Autoconf -*-
++
+++ # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
++ # Free Software Foundation, Inc.
++ #
++ # This file is free software; the Free Software Foundation
++ # gives unlimited permission to copy and/or distribute it,
++ # with or without modifications, as long as this notice is preserved.
++
+++ #serial 5
++
++ # _AM_OUTPUT_DEPENDENCY_COMMANDS
++ # ------------------------------
++ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+++ [{
+++ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+++ # are listed without --file. Let's play safe and only enable the eval
+++ # if we detect the quoting.
+++ case $CONFIG_FILES in
+++ *\'*) eval set x "$CONFIG_FILES" ;;
+++ *) set x $CONFIG_FILES ;;
+++ esac
+++ shift
+++ for mf
+++ do
+++ # Strip MF so we end up with the name of the file.
+++ mf=`echo "$mf" | sed -e 's/:.*$//'`
+++ # Check whether this is an Automake generated Makefile or not.
+++ # We used to match only the files named `Makefile.in', but
+++ # some people rename them; so instead we look at the file content.
+++ # Grep'ing the first line is not enough: some people post-process
+++ # each Makefile.in and add a new line on top of each file to say so.
+++ # Grep'ing the whole file is not good either: AIX grep has a line
+++ # limit of 2048, but all sed's we know have understand at least 4000.
+++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+++ dirpart=`AS_DIRNAME("$mf")`
+++ else
+++ continue
+++ fi
+++ # Extract the definition of DEPDIR, am__include, and am__quote
+++ # from the Makefile without running `make'.
+++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+++ test -z "$DEPDIR" && continue
+++ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+++ test -z "am__include" && continue
+++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+++ # When using ansi2knr, U may be empty or an underscore; expand it
+++ U=`sed -n 's/^U = //p' < "$mf"`
+++ # Find all dependency output files, they are included files with
+++ # $(DEPDIR) in their names. We invoke sed twice because it is the
+++ # simplest approach to changing $(DEPDIR) to its actual value in the
+++ # expansion.
+++ for file in `sed -n "
+++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+++ # Make sure the directory exists.
+++ test -f "$dirpart/$file" && continue
+++ fdir=`AS_DIRNAME(["$file"])`
+++ AS_MKDIR_P([$dirpart/$fdir])
+++ # echo "creating $dirpart/$file"
+++ echo '# dummy' > "$dirpart/$file"
+++ done
++ done
+++ }
++ ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
++
++
++***************
++*** 741,754 ****
++ rm -f confinc confmf
++ ])
++
++- # Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
++ # Free Software Foundation, Inc.
++ #
++ # This file is free software; the Free Software Foundation
++ # gives unlimited permission to copy and/or distribute it,
++ # with or without modifications, as long as this notice is preserved.
++
++- # serial 5
++
++ # AM_PROG_CC_C_O
++ # --------------
++--- 752,765 ----
++ rm -f confinc confmf
++ ])
++
+++ # Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
++ # Free Software Foundation, Inc.
++ #
++ # This file is free software; the Free Software Foundation
++ # gives unlimited permission to copy and/or distribute it,
++ # with or without modifications, as long as this notice is preserved.
++
+++ # serial 6
++
++ # AM_PROG_CC_C_O
++ # --------------
++***************
++*** 760,767 ****
++ # FIXME: we rely on the cache variable name because
++ # there is no other way.
++ set dummy $CC
++- ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
++- if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
++ # Losing compiler, so override with the script.
++ # FIXME: It is wrong to rewrite CC.
++ # But if we don't then we get into trouble of one sort or another.
++--- 771,779 ----
++ # FIXME: we rely on the cache variable name because
++ # there is no other way.
++ set dummy $CC
+++ am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+++ eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+++ if test "$am_t" != yes; then
++ # Losing compiler, so override with the script.
++ # FIXME: It is wrong to rewrite CC.
++ # But if we don't then we get into trouble of one sort or another.
++***************
++*** 723,729 ****
++ # ----------------------------------
++ # OPTIONS is a space-separated list of Automake options.
++ AC_DEFUN([_AM_SET_OPTIONS],
++- [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++
++ # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
++ # -------------------------------------------
++--- 735,741 ----
++ # ----------------------------------
++ # OPTIONS is a space-separated list of Automake options.
++ AC_DEFUN([_AM_SET_OPTIONS],
+++ [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++
++ # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
++ # -------------------------------------------
+diff -urNad pywebkitgtk-1.1.5~/config.guess pywebkitgtk-1.1.5/config.guess
+--- pywebkitgtk-1.1.5~/config.guess 2009-05-04 01:55:47.000000000 +0200
++++ pywebkitgtk-1.1.5/config.guess 2009-05-31 13:09:13.000000000 +0200
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-04-27'
++timestamp='2008-01-23'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -324,9 +324,6 @@
+ case `/usr/bin/uname -p` in
+ sparc) echo sparc-icl-nx7; exit ;;
+ esac ;;
+- s390x:SunOS:*:*)
+- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+- exit ;;
+ sun4H:SunOS:5.*:*)
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+@@ -334,20 +331,7 @@
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+- eval $set_cc_for_build
+- SUN_ARCH="i386"
+- # If there is a compiler, see if it is configured for 64-bit objects.
+- # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+- # This test works for both compilers.
+- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+- if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+- grep IS_64BIT_ARCH >/dev/null
+- then
+- SUN_ARCH="x86_64"
+- fi
+- fi
+- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+@@ -812,7 +796,7 @@
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+- EM64T | authenticamd | genuineintel)
++ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+@@ -951,9 +935,6 @@
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
+- padre:Linux:*:*)
+- echo sparc-unknown-linux-gnu
+- exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -1004,6 +985,9 @@
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit ;;
++ coff-i386)
++ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
++ exit ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+@@ -1118,11 +1102,8 @@
+ pc:*:*:*)
+ # Left here for compatibility:
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+- # the processor, so we play safe by assuming i586.
+- # Note: whatever this is, it MUST be the same as what config.sub
+- # prints for the "djgpp" host, or else GDB configury will decide that
+- # this is a cross-build.
+- echo i586-pc-msdosdjgpp
++ # the processor, so we play safe by assuming i386.
++ echo i386-pc-msdosdjgpp
+ exit ;;
+ Intel:Mach:3*:*)
+ echo i386-pc-mach3
+@@ -1160,16 +1141,6 @@
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4; exit; } ;;
+- NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+- OS_REL='.3'
+- test -r /etc/.relid \
+- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+- /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+@@ -1245,9 +1216,6 @@
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+ exit ;;
+- BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
+- echo i586-pc-haiku
+- exit ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit ;;
+@@ -1356,9 +1324,6 @@
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
+ exit ;;
+- i*86:AROS:*:*)
+- echo ${UNAME_MACHINE}-pc-aros
+- exit ;;
+ esac
+
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+diff -urNad pywebkitgtk-1.1.5~/config.h.in~ pywebkitgtk-1.1.5/config.h.in~
+--- pywebkitgtk-1.1.5~/config.h.in~ 1970-01-01 01:00:00.000000000 +0100
++++ pywebkitgtk-1.1.5/config.h.in~ 2009-05-28 23:42:30.000000000 +0200
+@@ -0,0 +1,74 @@
++/* config.h.in. Generated from configure.ac by autoheader. */
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#undef HAVE_DLFCN_H
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#undef HAVE_INTTYPES_H
++
++/* Define to 1 if you have the <memory.h> header file. */
++#undef HAVE_MEMORY_H
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#undef HAVE_STDINT_H
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#undef HAVE_STDLIB_H
++
++/* Define to 1 if you have the <strings.h> header file. */
++#undef HAVE_STRINGS_H
++
++/* Define to 1 if you have the <string.h> header file. */
++#undef HAVE_STRING_H
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#undef HAVE_SYS_STAT_H
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#undef HAVE_SYS_TYPES_H
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#undef HAVE_UNISTD_H
++
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++ */
++#undef LT_OBJDIR
++
++/* Define to 1 if your C compiler doesn't accept -c and -o together. */
++#undef NO_MINUS_C_MINUS_O
++
++/* Name of package */
++#undef PACKAGE
++
++/* Define to the address where bug reports for this package should be sent. */
++#undef PACKAGE_BUGREPORT
++
++/* Define to the full name of this package. */
++#undef PACKAGE_NAME
++
++/* Define to the full name and version of this package. */
++#undef PACKAGE_STRING
++
++/* Define to the one symbol short name of this package. */
++#undef PACKAGE_TARNAME
++
++/* Define to the version of this package. */
++#undef PACKAGE_VERSION
++
++/* The major version of Python WebKit Gtk+. */
++#undef PYWEBKITGTK_MAJOR_VERSION
++
++/* The micro version of Python WebKit Gtk+. */
++#undef PYWEBKITGTK_MICRO_VERSION
++
++/* The minor version of Python WebKit Gtk+. */
++#undef PYWEBKITGTK_MINOR_VERSION
++
++/* The release version of Python WebKit Gtk+ */
++#undef PYWEBKITGTK_VERSION
++
++/* Define to 1 if you have the ANSI C header files. */
++#undef STDC_HEADERS
++
++/* Version number of package */
++#undef VERSION
+diff -urNad pywebkitgtk-1.1.5~/config.sub pywebkitgtk-1.1.5/config.sub
+--- pywebkitgtk-1.1.5~/config.sub 2009-05-04 01:55:47.000000000 +0200
++++ pywebkitgtk-1.1.5/config.sub 2009-05-31 13:09:13.000000000 +0200
+@@ -4,7 +4,7 @@
+ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-04-17'
++timestamp='2008-01-16'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -122,7 +122,6 @@
+ case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+- kopensolaris*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+@@ -250,16 +249,13 @@
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+- | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+- | maxq | mb | microblaze | mcore | mep | metag \
++ | maxq | mb | microblaze | mcore | mep \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+- | mips64octeon | mips64octeonel \
+- | mips64orion | mips64orionel \
+- | mips64r5900 | mips64r5900el \
+ | mips64vr | mips64vrel \
++ | mips64orion | mips64orionel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+@@ -272,7 +268,6 @@
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipstx39 | mipstx39el \
+ | mn10200 | mn10300 \
+- | moxie \
+ | mt \
+ | msp430 \
+ | nios | nios2 \
+@@ -282,7 +277,7 @@
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
+ | score \
+- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+@@ -291,7 +286,7 @@
+ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+- | z8k | z80)
++ | z8k)
+ basic_machine=$basic_machine-unknown
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12)
+@@ -334,17 +329,14 @@
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
+- | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+- | mips64octeon-* | mips64octeonel-* \
+- | mips64orion-* | mips64orionel-* \
+- | mips64r5900-* | mips64r5900el-* \
+ | mips64vr-* | mips64vrel-* \
++ | mips64orion-* | mips64orionel-* \
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
+@@ -366,20 +358,20 @@
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+ | romp-* | rs6000-* \
+- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
++ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tron-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa*-* \
+ | ymp-* \
+- | z8k-* | z80-*)
++ | z8k-*)
+ ;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+@@ -447,10 +439,6 @@
+ basic_machine=m68k-apollo
+ os=-bsd
+ ;;
+- aros)
+- basic_machine=i386-pc
+- os=-aros
+- ;;
+ aux)
+ basic_machine=m68k-apple
+ os=-aux
+@@ -471,10 +459,6 @@
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
+- cegcc)
+- basic_machine=arm-unknown
+- os=-cegcc
+- ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=-bsd
+@@ -542,10 +526,6 @@
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
+- dicos)
+- basic_machine=i686-pc
+- os=-dicos
+- ;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+@@ -1148,10 +1128,6 @@
+ basic_machine=z8k-unknown
+ os=-sim
+ ;;
+- z80-*-coff)
+- basic_machine=z80-unknown
+- os=-sim
+- ;;
+ none)
+ basic_machine=none-none
+ os=-none
+@@ -1190,7 +1166,7 @@
+ we32k)
+ basic_machine=we32k-att
+ ;;
+- sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
++ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+ basic_machine=sh-unknown
+ ;;
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+@@ -1262,9 +1238,8 @@
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+- | -kopensolaris* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+- | -aos* | -aros* \
++ | -aos* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+@@ -1273,7 +1248,7 @@
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+- | -chorusos* | -chorusrdb* | -cegcc* \
++ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+@@ -1413,9 +1388,6 @@
+ -zvmoe)
+ os=-zvmoe
+ ;;
+- -dicos*)
+- os=-dicos
+- ;;
+ -none)
+ ;;
+ *)
+diff -urNad pywebkitgtk-1.1.5~/configure pywebkitgtk-1.1.5/configure
+--- pywebkitgtk-1.1.5~/configure 2009-05-28 23:42:31.000000000 +0200
++++ pywebkitgtk-1.1.5/configure 2009-05-31 13:09:12.000000000 +0200
+@@ -8193,9 +8193,6 @@
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+- linux* | k*bsd*-gnu)
+- link_all_deplibs=no
+- ;;
+ esac
+
+ ld_shlibs=yes
+@@ -10890,7 +10887,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 10893 "configure"
++#line 10890 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -10986,7 +10983,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 10989 "configure"
++#line 10986 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12654,7 +12651,13 @@
+ if test "${am_cv_python_pythondir+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
++ if test "x$prefix" = xNONE
++ then
++ py_prefix_arg=
++ else
++ py_prefix_arg=",prefix='$prefix'"
++ fi
++ am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null ||
+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+@@ -12671,8 +12674,14 @@
+ if test "${am_cv_python_pyexecdir+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
+- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
++ if test "x$exec_prefix" = xNONE
++ then
++ py_exec_prefix_arg=$py_prefix_arg
++ else
++ py_exec_prefix_arg=",prefix='$exec_prefix'"
++ fi
++ am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0$py_exec_prefix_arg)" -n -q install $py_exec_prefix_arg 2>/dev/null ||
++ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+ $as_echo "$am_cv_python_pyexecdir" >&6; }
+@@ -14715,27 +14724,28 @@
+
+
+ case $ac_file$ac_mode in
+- "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
+-# are listed without --file. Let's play safe and only enable the eval
+-# if we detect the quoting.
+-case $CONFIG_FILES in
+-*\'*) eval set x "$CONFIG_FILES" ;;
+-*) set x $CONFIG_FILES ;;
+-esac
+-shift
+-for mf
+-do
+- # Strip MF so we end up with the name of the file.
+- mf=`echo "$mf" | sed -e 's/:.*$//'`
+- # Check whether this is an Automake generated Makefile or not.
+- # We used to match only the files named `Makefile.in', but
+- # some people rename them; so instead we look at the file content.
+- # Grep'ing the first line is not enough: some people post-process
+- # each Makefile.in and add a new line on top of each file to say so.
+- # Grep'ing the whole file is not good either: AIX grep has a line
+- # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+- dirpart=`$as_dirname -- "$mf" ||
++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
++ # Autoconf 2.62 quotes --file arguments for eval, but not when files
++ # are listed without --file. Let's play safe and only enable the eval
++ # if we detect the quoting.
++ case $CONFIG_FILES in
++ *\'*) eval set x "$CONFIG_FILES" ;;
++ *) set x $CONFIG_FILES ;;
++ esac
++ shift
++ for mf
++ do
++ # Strip MF so we end up with the name of the file.
++ mf=`echo "$mf" | sed -e 's/:.*$//'`
++ # Check whether this is an Automake generated Makefile or not.
++ # We used to match only the files named `Makefile.in', but
++ # some people rename them; so instead we look at the file content.
++ # Grep'ing the first line is not enough: some people post-process
++ # each Makefile.in and add a new line on top of each file to say so.
++ # Grep'ing the whole file is not good either: AIX grep has a line
++ # limit of 2048, but all sed's we know have understand at least 4000.
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++ dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$mf" : 'X\(//\)[^/]' \| \
+ X"$mf" : 'X\(//\)$' \| \
+@@ -14758,28 +14768,28 @@
+ q
+ }
+ s/.*/./; q'`
+- else
+- continue
+- fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+- test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+- # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+- # Make sure the directory exists.
+- test -f "$dirpart/$file" && continue
+- fdir=`$as_dirname -- "$file" ||
++ else
++ continue
++ fi
++ # Extract the definition of DEPDIR, am__include, and am__quote
++ # from the Makefile without running `make'.
++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++ test -z "$DEPDIR" && continue
++ am__include=`sed -n 's/^am__include = //p' < "$mf"`
++ test -z "am__include" && continue
++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++ # When using ansi2knr, U may be empty or an underscore; expand it
++ U=`sed -n 's/^U = //p' < "$mf"`
++ # Find all dependency output files, they are included files with
++ # $(DEPDIR) in their names. We invoke sed twice because it is the
++ # simplest approach to changing $(DEPDIR) to its actual value in the
++ # expansion.
++ for file in `sed -n "
++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++ # Make sure the directory exists.
++ test -f "$dirpart/$file" && continue
++ fdir=`$as_dirname -- "$file" ||
+ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$file" : 'X\(//\)[^/]' \| \
+ X"$file" : 'X\(//\)$' \| \
+@@ -14802,7 +14812,7 @@
+ q
+ }
+ s/.*/./; q'`
+- { as_dir=$dirpart/$fdir
++ { as_dir=$dirpart/$fdir
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+@@ -14843,10 +14853,11 @@
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
++ # echo "creating $dirpart/$file"
++ echo '# dummy' > "$dirpart/$file"
++ done
+ done
+-done
++}
+ ;;
+ "libtool":C)
+
+diff -urNad pywebkitgtk-1.1.5~/configure.rej pywebkitgtk-1.1.5/configure.rej
+--- pywebkitgtk-1.1.5~/configure.rej 1970-01-01 01:00:00.000000000 +0100
++++ pywebkitgtk-1.1.5/configure.rej 2009-05-31 13:08:43.000000000 +0200
+@@ -0,0 +1,249 @@
++***************
++*** 3792,3799 ****
++ # FIXME: we rely on the cache variable name because
++ # there is no other way.
++ set dummy $CC
++- ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
++- if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
++ # Losing compiler, so override with the script.
++ # FIXME: It is wrong to rewrite CC.
++ # But if we don't then we get into trouble of one sort or another.
++--- 3792,3800 ----
++ # FIXME: we rely on the cache variable name because
++ # there is no other way.
++ set dummy $CC
+++ am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+++ eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+++ if test "$am_t" != yes; then
++ # Losing compiler, so override with the script.
++ # FIXME: It is wrong to rewrite CC.
++ # But if we don't then we get into trouble of one sort or another.
++***************
++*** 4505,4517 ****
++ else
++ lt_cv_nm_interface="BSD nm"
++ echo "int some_variable = 0;" > conftest.$ac_ext
++- (eval echo "\"\$as_me:4508: $ac_compile\"" >&5)
++ (eval "$ac_compile" 2>conftest.err)
++ cat conftest.err >&5
++- (eval echo "\"\$as_me:4511: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
++ cat conftest.err >&5
++- (eval echo "\"\$as_me:4514: output\"" >&5)
++ cat conftest.out >&5
++ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
++ lt_cv_nm_interface="MS dumpbin"
++--- 4506,4518 ----
++ else
++ lt_cv_nm_interface="BSD nm"
++ echo "int some_variable = 0;" > conftest.$ac_ext
+++ (eval echo "\"\$as_me:4509: $ac_compile\"" >&5)
++ (eval "$ac_compile" 2>conftest.err)
++ cat conftest.err >&5
+++ (eval echo "\"\$as_me:4512: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
++ cat conftest.err >&5
+++ (eval echo "\"\$as_me:4515: output\"" >&5)
++ cat conftest.out >&5
++ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
++ lt_cv_nm_interface="MS dumpbin"
++***************
++*** 5717,5723 ****
++ ;;
++ *-*-irix6*)
++ # Find out which ABI we are using.
++- echo '#line 5720 "configure"' > conftest.$ac_ext
++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++--- 5718,5724 ----
++ ;;
++ *-*-irix6*)
++ # Find out which ABI we are using.
+++ echo '#line 5721 "configure"' > conftest.$ac_ext
++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++***************
++*** 7574,7584 ****
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++ -e 's:$: $lt_compiler_flag:'`
++- (eval echo "\"\$as_me:7577: $lt_compile\"" >&5)
++ (eval "$lt_compile" 2>conftest.err)
++ ac_status=$?
++ cat conftest.err >&5
++- echo "$as_me:7581: \$? = $ac_status" >&5
++ if (exit $ac_status) && test -s "$ac_outfile"; then
++ # The compiler can only warn and ignore the option if not recognized
++ # So say no if there are warnings other than the usual output.
++--- 7575,7585 ----
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++ -e 's:$: $lt_compiler_flag:'`
+++ (eval echo "\"\$as_me:7578: $lt_compile\"" >&5)
++ (eval "$lt_compile" 2>conftest.err)
++ ac_status=$?
++ cat conftest.err >&5
+++ echo "$as_me:7582: \$? = $ac_status" >&5
++ if (exit $ac_status) && test -s "$ac_outfile"; then
++ # The compiler can only warn and ignore the option if not recognized
++ # So say no if there are warnings other than the usual output.
++***************
++*** 7913,7923 ****
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++ -e 's:$: $lt_compiler_flag:'`
++- (eval echo "\"\$as_me:7916: $lt_compile\"" >&5)
++ (eval "$lt_compile" 2>conftest.err)
++ ac_status=$?
++ cat conftest.err >&5
++- echo "$as_me:7920: \$? = $ac_status" >&5
++ if (exit $ac_status) && test -s "$ac_outfile"; then
++ # The compiler can only warn and ignore the option if not recognized
++ # So say no if there are warnings other than the usual output.
++--- 7914,7924 ----
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++ -e 's:$: $lt_compiler_flag:'`
+++ (eval echo "\"\$as_me:7917: $lt_compile\"" >&5)
++ (eval "$lt_compile" 2>conftest.err)
++ ac_status=$?
++ cat conftest.err >&5
+++ echo "$as_me:7921: \$? = $ac_status" >&5
++ if (exit $ac_status) && test -s "$ac_outfile"; then
++ # The compiler can only warn and ignore the option if not recognized
++ # So say no if there are warnings other than the usual output.
++***************
++*** 8018,8028 ****
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++ -e 's:$: $lt_compiler_flag:'`
++- (eval echo "\"\$as_me:8021: $lt_compile\"" >&5)
++ (eval "$lt_compile" 2>out/conftest.err)
++ ac_status=$?
++ cat out/conftest.err >&5
++- echo "$as_me:8025: \$? = $ac_status" >&5
++ if (exit $ac_status) && test -s out/conftest2.$ac_objext
++ then
++ # The compiler can only warn and ignore the option if not recognized
++--- 8019,8029 ----
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++ -e 's:$: $lt_compiler_flag:'`
+++ (eval echo "\"\$as_me:8022: $lt_compile\"" >&5)
++ (eval "$lt_compile" 2>out/conftest.err)
++ ac_status=$?
++ cat out/conftest.err >&5
+++ echo "$as_me:8026: \$? = $ac_status" >&5
++ if (exit $ac_status) && test -s out/conftest2.$ac_objext
++ then
++ # The compiler can only warn and ignore the option if not recognized
++***************
++*** 8073,8083 ****
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++ -e 's:$: $lt_compiler_flag:'`
++- (eval echo "\"\$as_me:8076: $lt_compile\"" >&5)
++ (eval "$lt_compile" 2>out/conftest.err)
++ ac_status=$?
++ cat out/conftest.err >&5
++- echo "$as_me:8080: \$? = $ac_status" >&5
++ if (exit $ac_status) && test -s out/conftest2.$ac_objext
++ then
++ # The compiler can only warn and ignore the option if not recognized
++--- 8074,8084 ----
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++ -e 's:$: $lt_compiler_flag:'`
+++ (eval echo "\"\$as_me:8077: $lt_compile\"" >&5)
++ (eval "$lt_compile" 2>out/conftest.err)
++ ac_status=$?
++ cat out/conftest.err >&5
+++ echo "$as_me:8081: \$? = $ac_status" >&5
++ if (exit $ac_status) && test -s out/conftest2.$ac_objext
++ then
++ # The compiler can only warn and ignore the option if not recognized
++***************
++*** 10886,10892 ****
++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++ lt_status=$lt_dlunknown
++ cat > conftest.$ac_ext <<_LT_EOF
++- #line 10889 "configure"
++ #include "confdefs.h"
++
++ #if HAVE_DLFCN_H
++--- 10887,10893 ----
++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++ lt_status=$lt_dlunknown
++ cat > conftest.$ac_ext <<_LT_EOF
+++ #line 10890 "configure"
++ #include "confdefs.h"
++
++ #if HAVE_DLFCN_H
++***************
++*** 10982,10988 ****
++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++ lt_status=$lt_dlunknown
++ cat > conftest.$ac_ext <<_LT_EOF
++- #line 10985 "configure"
++ #include "confdefs.h"
++
++ #if HAVE_DLFCN_H
++--- 10983,10989 ----
++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++ lt_status=$lt_dlunknown
++ cat > conftest.$ac_ext <<_LT_EOF
+++ #line 10986 "configure"
++ #include "confdefs.h"
++
++ #if HAVE_DLFCN_H
++***************
++*** 14712,14729 ****
++
++
++ case $ac_file$ac_mode in
++- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
++- # Strip MF so we end up with the name of the file.
++- mf=`echo "$mf" | sed -e 's/:.*$//'`
++- # Check whether this is an Automake generated Makefile or not.
++- # We used to match only the files named `Makefile.in', but
++- # some people rename them; so instead we look at the file content.
++- # Grep'ing the first line is not enough: some people post-process
++- # each Makefile.in and add a new line on top of each file to say so.
++- # Grep'ing the whole file is not good either: AIX grep has a line
++- # limit of 2048, but all sed's we know have understand at least 4000.
++- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++- dirpart=`$as_dirname -- "$mf" ||
++ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$mf" : 'X\(//\)[^/]' \| \
++ X"$mf" : 'X\(//\)$' \| \
++--- 14725,14752 ----
++
++
++ case $ac_file$ac_mode in
+++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+++ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+++ # are listed without --file. Let's play safe and only enable the eval
+++ # if we detect the quoting.
+++ case $CONFIG_FILES in
+++ *\'*) eval set x "$CONFIG_FILES" ;;
+++ *) set x $CONFIG_FILES ;;
+++ esac
+++ shift
+++ for mf
+++ do
+++ # Strip MF so we end up with the name of the file.
+++ mf=`echo "$mf" | sed -e 's/:.*$//'`
+++ # Check whether this is an Automake generated Makefile or not.
+++ # We used to match only the files named `Makefile.in', but
+++ # some people rename them; so instead we look at the file content.
+++ # Grep'ing the first line is not enough: some people post-process
+++ # each Makefile.in and add a new line on top of each file to say so.
+++ # Grep'ing the whole file is not good either: AIX grep has a line
+++ # limit of 2048, but all sed's we know have understand at least 4000.
+++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+++ dirpart=`$as_dirname -- "$mf" ||
++ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$mf" : 'X\(//\)[^/]' \| \
++ X"$mf" : 'X\(//\)$' \| \
+diff -urNad pywebkitgtk-1.1.5~/ltmain.sh pywebkitgtk-1.1.5/ltmain.sh
+--- pywebkitgtk-1.1.5~/ltmain.sh 2009-04-07 23:40:40.000000000 +0200
++++ pywebkitgtk-1.1.5/ltmain.sh 2009-05-31 13:09:09.000000000 +0200
+@@ -65,7 +65,7 @@
+ # compiler: $LTCC
+ # compiler flags: $LTCFLAGS
+ # linker: $LD (gnu? $with_gnu_ld)
+-# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
++# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1
+ # automake: $automake_version
+ # autoconf: $autoconf_version
+ #
+@@ -73,7 +73,7 @@
+
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION="2.2.6 Debian-2.2.6a-4"
++VERSION="2.2.6 Debian-2.2.6a-1ubuntu1"
+ TIMESTAMP=""
+ package_revision=1.3012
+
+@@ -5347,19 +5347,19 @@
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
+- tmp_libs=
+- for deplib in $dependency_libs; do
+- deplibs="$deplib $deplibs"
+- if $opt_duplicate_deps ; then
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
+- fi
+- tmp_libs="$tmp_libs $deplib"
+- done
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ func_fatal_error "\`$lib' is not a convenience library"
+ fi
++ tmp_libs=
++ for deplib in $dependency_libs; do
++ deplibs="$deplib $deplibs"
++ if $opt_duplicate_deps ; then
++ case "$tmp_libs " in
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ esac
++ fi
++ tmp_libs="$tmp_libs $deplib"
++ done
+ continue
+ fi # $pass = conv
+
+@@ -5896,7 +5896,6 @@
+ if test "$link_all_deplibs" != no; then
+ # Add the search paths of all dependency libraries
+ for deplib in $dependency_libs; do
+- path=
+ case $deplib in
+ -L*) path="$deplib" ;;
+ *.la)
+diff -urNad pywebkitgtk-1.1.5~/ltmain.sh.rej pywebkitgtk-1.1.5/ltmain.sh.rej
+--- pywebkitgtk-1.1.5~/ltmain.sh.rej 1970-01-01 01:00:00.000000000 +0100
++++ pywebkitgtk-1.1.5/ltmain.sh.rej 2009-05-31 13:08:43.000000000 +0200
+@@ -0,0 +1,34 @@
++***************
++*** 65,71 ****
++ # compiler: $LTCC
++ # compiler flags: $LTCFLAGS
++ # linker: $LD (gnu? $with_gnu_ld)
++- # $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1
++ # automake: $automake_version
++ # autoconf: $autoconf_version
++ #
++--- 65,71 ----
++ # compiler: $LTCC
++ # compiler flags: $LTCFLAGS
++ # linker: $LD (gnu? $with_gnu_ld)
+++ # $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1
++ # automake: $automake_version
++ # autoconf: $autoconf_version
++ #
++***************
++*** 73,79 ****
++
++ PROGRAM=ltmain.sh
++ PACKAGE=libtool
++- VERSION="2.2.6 Debian-2.2.6a-1"
++ TIMESTAMP=""
++ package_revision=1.3012
++
++--- 73,79 ----
++
++ PROGRAM=ltmain.sh
++ PACKAGE=libtool
+++ VERSION="2.2.6 Debian-2.2.6a-1ubuntu1"
++ TIMESTAMP=""
++ package_revision=1.3012
++
+diff -urNad pywebkitgtk-1.1.5~/m4/libtool.m4 pywebkitgtk-1.1.5/m4/libtool.m4
+--- pywebkitgtk-1.1.5~/m4/libtool.m4 2009-04-07 23:40:40.000000000 +0200
++++ pywebkitgtk-1.1.5/m4/libtool.m4 2009-05-31 13:09:09.000000000 +0200
+@@ -4261,9 +4261,6 @@
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+- linux* | k*bsd*-gnu)
+- _LT_TAGVAR(link_all_deplibs, $1)=no
+- ;;
+ esac
+
+ _LT_TAGVAR(ld_shlibs, $1)=yes
Propchange: packages/unstable/pywebkitgtk/debian/patches/03_autoreconf.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the pkg-gnome-commits
mailing list