r20451 - in /desktop/unstable/epiphany-webkit/debian: changelog patches/14_webkit_temporary_gconf_rename.patch patches/99_autoreconf.patch
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Wed Jun 24 20:27:45 UTC 2009
Author: kov
Date: Wed Jun 24 20:27:44 2009
New Revision: 20451
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20451
Log:
Refreshed debian/patches/99_autoreconf.patch and debian/patches/14_webkit_temporary_gconf_rename.patch
Modified:
desktop/unstable/epiphany-webkit/debian/changelog
desktop/unstable/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch
desktop/unstable/epiphany-webkit/debian/patches/99_autoreconf.patch
Modified: desktop/unstable/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-webkit/debian/changelog?rev=20451&op=diff
==============================================================================
--- desktop/unstable/epiphany-webkit/debian/changelog (original)
+++ desktop/unstable/epiphany-webkit/debian/changelog Wed Jun 24 20:27:44 2009
@@ -10,6 +10,9 @@
- refreshed; one hunk is no longer needed
* debian/patches/08_python_path.patch:
- removed; python extensions no longer supported
+ * debian/patches/14_webkit_temporary_gconf_rename.patch,
+ debian/patches/99_autoreconf.patch:
+ - refreshed;
-- Gustavo Noronha Silva <kov at debian.org> Wed, 24 Jun 2009 17:12:24 -0300
Modified: desktop/unstable/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch?rev=20451&op=diff
==============================================================================
--- desktop/unstable/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch (original)
+++ desktop/unstable/epiphany-webkit/debian/patches/14_webkit_temporary_gconf_rename.patch Wed Jun 24 20:27:44 2009
@@ -1,7 +1,7 @@
-Index: epiphany-webkit-2.27.2/data/epiphany-lockdown.schemas.in
-===================================================================
---- epiphany-webkit-2.27.2.orig/data/epiphany-lockdown.schemas.in 2009-04-17 03:06:40.000000000 -0300
-+++ epiphany-webkit-2.27.2/data/epiphany-lockdown.schemas.in 2009-05-27 11:06:32.000000000 -0300
+Index: epiphany-webkit-2.27.3/data/epiphany-lockdown.schemas.in
+===================================================================
+--- epiphany-webkit-2.27.3.orig/data/epiphany-lockdown.schemas.in 2009-04-17 03:06:40.000000000 -0300
++++ epiphany-webkit-2.27.3/data/epiphany-lockdown.schemas.in 2009-06-24 17:22:58.000000000 -0300
@@ -1,8 +1,8 @@
<gconfschemafile>
<schemalist>
@@ -112,10 +112,10 @@
<owner>epiphany</owner>
<type>bool</type>
<default>0</default>
-Index: epiphany-webkit-2.27.2/data/epiphany.schemas.in
-===================================================================
---- epiphany-webkit-2.27.2.orig/data/epiphany.schemas.in 2009-04-17 03:06:40.000000000 -0300
-+++ epiphany-webkit-2.27.2/data/epiphany.schemas.in 2009-05-27 11:06:32.000000000 -0300
+Index: epiphany-webkit-2.27.3/data/epiphany.schemas.in
+===================================================================
+--- epiphany-webkit-2.27.3.orig/data/epiphany.schemas.in 2009-04-17 03:06:40.000000000 -0300
++++ epiphany-webkit-2.27.3/data/epiphany.schemas.in 2009-06-24 17:22:58.000000000 -0300
@@ -1,8 +1,8 @@
<gconfschemafile>
<schemalist>
@@ -611,10 +611,10 @@
<owner>epiphany</owner>
<type>bool</type>
<default>false</default>
-Index: epiphany-webkit-2.27.2/doc/reference/tmpl/ephy-permission-manager.sgml
-===================================================================
---- epiphany-webkit-2.27.2.orig/doc/reference/tmpl/ephy-permission-manager.sgml 2009-05-25 04:02:08.000000000 -0300
-+++ epiphany-webkit-2.27.2/doc/reference/tmpl/ephy-permission-manager.sgml 2009-05-27 11:06:32.000000000 -0300
+Index: epiphany-webkit-2.27.3/doc/reference/tmpl/ephy-permission-manager.sgml
+===================================================================
+--- epiphany-webkit-2.27.3.orig/doc/reference/tmpl/ephy-permission-manager.sgml 2009-06-15 14:51:00.000000000 -0300
++++ epiphany-webkit-2.27.3/doc/reference/tmpl/ephy-permission-manager.sgml 2009-06-24 17:22:58.000000000 -0300
@@ -21,9 +21,9 @@
<para>
The #EphyPermissionManager stores a list of site-specific permissions, but not
@@ -627,11 +627,14 @@
network.cookie.cookieBehavior preference. For images, the default is determined
by Mozilla's network.image.imageBehavior preference.
</para>
-Index: epiphany-webkit-2.27.2/embed/ephy-embed-prefs.h
-===================================================================
---- epiphany-webkit-2.27.2.orig/embed/ephy-embed-prefs.h 2009-04-28 05:45:24.000000000 -0300
-+++ epiphany-webkit-2.27.2/embed/ephy-embed-prefs.h 2009-05-27 11:07:47.000000000 -0300
-@@ -1,22 +1,22 @@
+Index: epiphany-webkit-2.27.3/embed/ephy-embed-prefs.h
+===================================================================
+--- epiphany-webkit-2.27.3.orig/embed/ephy-embed-prefs.h 2009-06-05 12:58:57.000000000 -0300
++++ epiphany-webkit-2.27.3/embed/ephy-embed-prefs.h 2009-06-24 17:24:19.000000000 -0300
+@@ -23,25 +23,25 @@
+
+ #include "ephy-embed.h"
+
-#define CONF_NETWORK_CACHE_SIZE "/apps/epiphany/web/cache_size"
-#define CONF_RENDERING_FONT "/apps/epiphany/web/font"
-#define CONF_RENDERING_FONT_MIN_SIZE "/apps/epiphany/web/minimum_font_size"
@@ -673,7 +676,7 @@
/* These are defined gnome wide now */
#define CONF_NETWORK_PROXY_MODE "/system/proxy/mode"
-@@ -34,10 +34,10 @@
+@@ -59,10 +59,10 @@
#define CONF_DESKTOP_FONT_FIXED_SIZE "/desktop/gnome/interface/monospace_font_name"
/* DEPRECATED, we migrate them */
@@ -688,10 +691,10 @@
#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
#error "Only <epiphany/epiphany.h> can be included directly."
-Index: epiphany-webkit-2.27.2/embed/ephy-encodings.c
-===================================================================
---- epiphany-webkit-2.27.2.orig/embed/ephy-encodings.c 2009-04-17 03:06:40.000000000 -0300
-+++ epiphany-webkit-2.27.2/embed/ephy-encodings.c 2009-05-27 11:06:32.000000000 -0300
+Index: epiphany-webkit-2.27.3/embed/ephy-encodings.c
+===================================================================
+--- epiphany-webkit-2.27.3.orig/embed/ephy-encodings.c 2009-04-17 03:06:40.000000000 -0300
++++ epiphany-webkit-2.27.3/embed/ephy-encodings.c 2009-06-24 17:22:58.000000000 -0300
@@ -146,7 +146,7 @@
DETECTORS_NODE_ID = 5
};
@@ -701,23 +704,10 @@
#define RECENT_MAX 4
static void ephy_encodings_class_init (EphyEncodingsClass *klass);
-Index: epiphany-webkit-2.27.2/embed/webkit/webkit-embed-prefs.c
-===================================================================
---- epiphany-webkit-2.27.2.orig/embed/webkit/webkit-embed-prefs.c 2009-04-28 05:45:24.000000000 -0300
-+++ epiphany-webkit-2.27.2/embed/webkit/webkit-embed-prefs.c 2009-05-27 11:06:32.000000000 -0300
-@@ -206,7 +206,7 @@
- {
- int i;
-
-- eel_gconf_monitor_add ("/apps/epiphany/web");
-+ eel_gconf_monitor_add ("/apps/epiphany-webkit/web");
-
- settings = webkit_web_settings_new ();
-
-Index: epiphany-webkit-2.27.2/lib/ephy-prefs.h
-===================================================================
---- epiphany-webkit-2.27.2.orig/lib/ephy-prefs.h 2009-04-17 03:06:40.000000000 -0300
-+++ epiphany-webkit-2.27.2/lib/ephy-prefs.h 2009-05-27 11:06:32.000000000 -0300
+Index: epiphany-webkit-2.27.3/lib/ephy-prefs.h
+===================================================================
+--- epiphany-webkit-2.27.3.orig/lib/ephy-prefs.h 2009-04-17 03:06:40.000000000 -0300
++++ epiphany-webkit-2.27.3/lib/ephy-prefs.h 2009-06-24 17:22:58.000000000 -0300
@@ -27,46 +27,46 @@
G_BEGIN_DECLS
@@ -801,10 +791,10 @@
G_END_DECLS
-Index: epiphany-webkit-2.27.2/src/bookmarks/ephy-bookmarks-editor.c
-===================================================================
---- epiphany-webkit-2.27.2.orig/src/bookmarks/ephy-bookmarks-editor.c 2009-04-17 03:06:40.000000000 -0300
-+++ epiphany-webkit-2.27.2/src/bookmarks/ephy-bookmarks-editor.c 2009-05-27 11:06:32.000000000 -0300
+Index: epiphany-webkit-2.27.3/src/bookmarks/ephy-bookmarks-editor.c
+===================================================================
+--- epiphany-webkit-2.27.3.orig/src/bookmarks/ephy-bookmarks-editor.c 2009-06-05 12:09:05.000000000 -0300
++++ epiphany-webkit-2.27.3/src/bookmarks/ephy-bookmarks-editor.c 2009-06-24 17:22:58.000000000 -0300
@@ -126,7 +126,7 @@
#define EPHY_BOOKMARKS_EDITOR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_BOOKMARKS_EDITOR, EphyBookmarksEditorPrivate))
@@ -814,11 +804,11 @@
#define RESERVED_STRING N_("Remove from this topic")
-Index: epiphany-webkit-2.27.2/src/ephy-extensions-manager.c
-===================================================================
---- epiphany-webkit-2.27.2.orig/src/ephy-extensions-manager.c 2009-04-17 03:06:40.000000000 -0300
-+++ epiphany-webkit-2.27.2/src/ephy-extensions-manager.c 2009-05-27 11:06:32.000000000 -0300
-@@ -64,7 +64,7 @@
+Index: epiphany-webkit-2.27.3/src/ephy-extensions-manager.c
+===================================================================
+--- epiphany-webkit-2.27.3.orig/src/ephy-extensions-manager.c 2009-06-05 18:22:48.000000000 -0300
++++ epiphany-webkit-2.27.3/src/ephy-extensions-manager.c 2009-06-24 17:22:58.000000000 -0300
+@@ -59,7 +59,7 @@
#include "ephy-seed-loader.h"
#endif
@@ -827,10 +817,10 @@
#define EE_GROUP "Epiphany Extension"
#define DOT_INI ".ephy-extension"
#define RELOAD_DELAY 333 /* ms */
-Index: epiphany-webkit-2.27.2/src/ephy-history-window.c
-===================================================================
---- epiphany-webkit-2.27.2.orig/src/ephy-history-window.c 2009-04-17 03:06:40.000000000 -0300
-+++ epiphany-webkit-2.27.2/src/ephy-history-window.c 2009-05-27 11:06:32.000000000 -0300
+Index: epiphany-webkit-2.27.3/src/ephy-history-window.c
+===================================================================
+--- epiphany-webkit-2.27.3.orig/src/ephy-history-window.c 2009-04-17 03:06:40.000000000 -0300
++++ epiphany-webkit-2.27.3/src/ephy-history-window.c 2009-06-24 17:22:58.000000000 -0300
@@ -98,8 +98,8 @@
#define EPHY_HISTORY_WINDOW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_HISTORY_WINDOW, EphyHistoryWindowPrivate))
@@ -842,11 +832,11 @@
struct _EphyHistoryWindowPrivate
{
-Index: epiphany-webkit-2.27.2/src/ephy-lockdown.c
-===================================================================
---- epiphany-webkit-2.27.2.orig/src/ephy-lockdown.c 2009-04-17 03:06:40.000000000 -0300
-+++ epiphany-webkit-2.27.2/src/ephy-lockdown.c 2009-05-27 11:06:32.000000000 -0300
-@@ -252,7 +252,7 @@
+Index: epiphany-webkit-2.27.3/src/ephy-lockdown.c
+===================================================================
+--- epiphany-webkit-2.27.3.orig/src/ephy-lockdown.c 2009-06-05 12:09:05.000000000 -0300
++++ epiphany-webkit-2.27.3/src/ephy-lockdown.c 2009-06-24 17:22:58.000000000 -0300
+@@ -254,7 +254,7 @@
* so we don't need to do notify here.
*/
@@ -855,7 +845,7 @@
eel_gconf_monitor_add ("/desktop/gnome/lockdown");
}
-@@ -269,7 +269,7 @@
+@@ -271,7 +271,7 @@
LOG ("EphyLockdown finalising");
@@ -864,10 +854,10 @@
eel_gconf_monitor_remove ("/desktop/gnome/lockdown");
for (i = 0; i < G_N_ELEMENTS (keys); i++)
-Index: epiphany-webkit-2.27.2/src/ephy-main.c
-===================================================================
---- epiphany-webkit-2.27.2.orig/src/ephy-main.c 2009-05-27 11:06:14.000000000 -0300
-+++ epiphany-webkit-2.27.2/src/ephy-main.c 2009-05-27 11:06:32.000000000 -0300
+Index: epiphany-webkit-2.27.3/src/ephy-main.c
+===================================================================
+--- epiphany-webkit-2.27.3.orig/src/ephy-main.c 2009-06-24 17:21:40.000000000 -0300
++++ epiphany-webkit-2.27.3/src/ephy-main.c 2009-06-24 17:22:58.000000000 -0300
@@ -755,7 +755,7 @@
/* Migrate profile */
_ephy_profile_migrate ();
@@ -886,11 +876,11 @@
save_accels ();
ephy_state_save ();
ephy_file_helpers_shutdown ();
-Index: epiphany-webkit-2.27.2/src/ephy-window.c
-===================================================================
---- epiphany-webkit-2.27.2.orig/src/ephy-window.c 2009-04-24 15:13:46.000000000 -0300
-+++ epiphany-webkit-2.27.2/src/ephy-window.c 2009-05-27 11:06:32.000000000 -0300
-@@ -411,7 +411,7 @@
+Index: epiphany-webkit-2.27.3/src/ephy-window.c
+===================================================================
+--- epiphany-webkit-2.27.3.orig/src/ephy-window.c 2009-06-15 14:25:27.000000000 -0300
++++ epiphany-webkit-2.27.3/src/ephy-window.c 2009-06-24 17:22:58.000000000 -0300
+@@ -407,7 +407,7 @@
#endif /* HAVE_X11_XF86KEYSYM_H */
};
@@ -899,7 +889,7 @@
#define BOOKMARKS_MENU_PATH "/menubar/BookmarksMenu"
-@@ -1057,7 +1057,7 @@
+@@ -1052,7 +1052,7 @@
/* We ignore the delete_event if the disable_quit lockdown has been set
*/
@@ -908,3 +898,16 @@
/* Workaround a crash when closing a window while in print preview mode. See
* mozilla bug #241809. /
+Index: epiphany-webkit-2.27.3/embed/ephy-embed-prefs.c
+===================================================================
+--- epiphany-webkit-2.27.3.orig/embed/ephy-embed-prefs.c 2009-06-24 17:25:11.000000000 -0300
++++ epiphany-webkit-2.27.3/embed/ephy-embed-prefs.c 2009-06-24 17:25:23.000000000 -0300
+@@ -205,7 +205,7 @@
+ {
+ int i;
+
+- eel_gconf_monitor_add ("/apps/epiphany/web");
++ eel_gconf_monitor_add ("/apps/epiphany-webkit/web");
+
+ settings = webkit_web_settings_new ();
+
Modified: desktop/unstable/epiphany-webkit/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-webkit/debian/patches/99_autoreconf.patch?rev=20451&op=diff
==============================================================================
--- desktop/unstable/epiphany-webkit/debian/patches/99_autoreconf.patch (original)
+++ desktop/unstable/epiphany-webkit/debian/patches/99_autoreconf.patch Wed Jun 24 20:27:44 2009
@@ -2,20 +2,20 @@
aclocal-1.10 -I m4
automake-1.10
autoconf
-Index: epiphany-webkit-2.27.2/configure
+Index: epiphany-webkit-2.27.3/configure
===================================================================
---- epiphany-webkit-2.27.2.orig/configure 2009-05-25 04:00:50.000000000 -0300
-+++ epiphany-webkit-2.27.2/configure 2009-05-27 11:16:53.000000000 -0300
+--- epiphany-webkit-2.27.3.orig/configure 2009-06-15 14:48:45.000000000 -0300
++++ epiphany-webkit-2.27.3/configure 2009-06-24 17:26:25.000000000 -0300
@@ -744,7 +744,7 @@
# Identity of this package.
PACKAGE_NAME='GNOME Web Browser'
-PACKAGE_TARNAME='epiphany'
+PACKAGE_TARNAME='epiphany-webkit'
- PACKAGE_VERSION='2.27.2'
- PACKAGE_STRING='GNOME Web Browser 2.27.2'
+ PACKAGE_VERSION='2.27.3'
+ PACKAGE_STRING='GNOME Web Browser 2.27.3'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
-@@ -1699,7 +1699,7 @@
+@@ -1674,7 +1674,7 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
@@ -24,25 +24,126 @@
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
-@@ -2645,7 +2645,7 @@
+@@ -1719,7 +1719,8 @@
+ Turn on compiler warnings
+ --enable-iso-c Try to warn if code is not ISO C
+ --enable-tests Wheter to build tests (default: yes)
+- --disable-schemas-install Disable the schemas installation
++ --disable-schemas-install
++ Disable the schemas installation
+ --enable-introspection Enable GObject introspection (default: disabled)
+ --enable-seed Enable Seed support (default: disabled)
+ --disable-zeroconf Whether to enable zeroconf bookmarks support
+@@ -2616,7 +2617,7 @@
# Define the identity of the package.
- PACKAGE='epiphany'
+ PACKAGE='epiphany-webkit'
- VERSION='2.27.2'
-
-
-@@ -14406,7 +14406,7 @@
-
-
- if test $USE_MAINTAINER_MODE = yes; then
-- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED"
-+ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
- else
- DISABLE_DEPRECATED=""
- fi
-@@ -14485,10 +14485,11 @@
+ VERSION='2.27.3'
+
+
+@@ -4739,13 +4740,13 @@
+ else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+- (eval echo "\"\$as_me:4742: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:4743: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:4745: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:4746: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:4748: output\"" >&5)
++ (eval echo "\"\$as_me:4749: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -5951,7 +5952,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 5954 "configure"' > conftest.$ac_ext
++ echo '#line 5955 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -7746,11 +7747,11 @@
+ -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:7749: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7750: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:7753: \$? = $ac_status" >&5
++ echo "$as_me:7754: \$? = $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.
+@@ -8085,11 +8086,11 @@
+ -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:8088: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8089: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8092: \$? = $ac_status" >&5
++ echo "$as_me:8093: \$? = $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.
+@@ -8190,11 +8191,11 @@
+ -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:8193: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8194: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:8197: \$? = $ac_status" >&5
++ echo "$as_me:8198: \$? = $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
+@@ -8245,11 +8246,11 @@
+ -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:8248: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8249: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:8252: \$? = $ac_status" >&5
++ echo "$as_me:8253: \$? = $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
+@@ -11048,7 +11049,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11051 "configure"
++#line 11052 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11144,7 +11145,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11147 "configure"
++#line 11148 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -14456,10 +14457,11 @@
{ $as_echo "$as_me:$LINENO: checking for DEPENDENCIES" >&5
$as_echo_n "checking for DEPENDENCIES... " >&6; }
@@ -58,7 +159,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
glib-2.0 >= \$GLIB_REQUIRED
gmodule-2.0
-@@ -14540,13 +14541,15 @@
+@@ -14511,13 +14513,15 @@
else
pkg_failed=yes
fi
@@ -80,19 +181,19 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
glib-2.0 >= \$GLIB_REQUIRED
gmodule-2.0
-@@ -14598,8 +14601,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -14612,7 +14616,7 @@
+@@ -14569,8 +14573,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -14583,7 +14588,7 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -101,7 +202,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gio-unix-2.0 >= $GLIB_REQUIRED
-@@ -14626,9 +14630,9 @@
+@@ -14597,9 +14602,9 @@
$LIBNOTIFY_PACKAGE
webkit-1.0 >= $WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
@@ -113,7 +214,7 @@
glib-2.0 >= $GLIB_REQUIRED
gmodule-2.0
gio-unix-2.0 >= $GLIB_REQUIRED
-@@ -14642,7 +14646,7 @@
+@@ -14613,7 +14618,7 @@
$LIBNOTIFY_PACKAGE
webkit-1.0 >= $WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
@@ -122,7 +223,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$DEPENDENCIES_PKG_ERRORS" >&5
-@@ -14739,10 +14743,11 @@
+@@ -14710,10 +14715,11 @@
{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
$as_echo_n "checking for DBUS... " >&6; }
@@ -138,7 +239,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
ac_status=$?
-@@ -14752,13 +14757,15 @@
+@@ -14723,13 +14729,15 @@
else
pkg_failed=yes
fi
@@ -160,19 +261,19 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED") 2>&5
ac_status=$?
-@@ -14768,8 +14775,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -14782,9 +14790,9 @@
+@@ -14739,8 +14747,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -14753,9 +14762,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -184,7 +285,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
-@@ -15515,10 +15523,11 @@
+@@ -15486,10 +15495,11 @@
{ $as_echo "$as_me:$LINENO: checking for INTROSPECTION" >&5
$as_echo_n "checking for INTROSPECTION... " >&6; }
@@ -200,7 +301,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
ac_status=$?
-@@ -15528,13 +15537,15 @@
+@@ -15499,13 +15509,15 @@
else
pkg_failed=yes
fi
@@ -222,19 +323,19 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
ac_status=$?
-@@ -15544,8 +15555,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -15558,9 +15570,9 @@
+@@ -15515,8 +15527,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -15529,9 +15542,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -246,7 +347,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$INTROSPECTION_PKG_ERRORS" >&5
-@@ -15679,10 +15691,11 @@
+@@ -15650,10 +15663,11 @@
{ $as_echo "$as_me:$LINENO: checking for SEED" >&5
$as_echo_n "checking for SEED... " >&6; }
@@ -262,7 +363,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seed >= \$SEED_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "seed >= $SEED_REQUIRED") 2>&5
ac_status=$?
-@@ -15692,13 +15705,15 @@
+@@ -15663,13 +15677,15 @@
else
pkg_failed=yes
fi
@@ -284,19 +385,19 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seed >= \$SEED_REQUIRED\"") >&5
($PKG_CONFIG --exists --print-errors "seed >= $SEED_REQUIRED") 2>&5
ac_status=$?
-@@ -15708,8 +15723,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -15722,9 +15738,9 @@
+@@ -15679,8 +15695,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -15693,9 +15710,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -308,69 +409,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$SEED_PKG_ERRORS" >&5
-@@ -16094,10 +16110,11 @@
- { $as_echo "$as_me:$LINENO: checking for PYGTK" >&5
- $as_echo_n "checking for PYGTK... " >&6; }
-
--if test -n "$PYGTK_CFLAGS"; then
-- pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$PYGTK_CFLAGS"; then
-+ pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= \$PYGTK_REQUIRED gnome-python-2.0 >= \$GNOME_PYTHON_REQUIRED\"") >&5
- ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= $PYGTK_REQUIRED gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED") 2>&5
- ac_status=$?
-@@ -16107,13 +16124,15 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$PYGTK_LIBS"; then
-- pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$PYGTK_LIBS"; then
-+ pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 >= \$PYGTK_REQUIRED gnome-python-2.0 >= \$GNOME_PYTHON_REQUIRED\"") >&5
- ($PKG_CONFIG --exists --print-errors "pygtk-2.0 >= $PYGTK_REQUIRED gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED") 2>&5
- ac_status=$?
-@@ -16123,8 +16142,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -16137,9 +16157,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pygtk-2.0 >= $PYGTK_REQUIRED gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED" 2>&1`
-+ PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pygtk-2.0 >= $PYGTK_REQUIRED gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED"`
- else
-- PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pygtk-2.0 >= $PYGTK_REQUIRED gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED" 2>&1`
-+ PYGTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pygtk-2.0 >= $PYGTK_REQUIRED gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$PYGTK_PKG_ERRORS" >&5
-@@ -16298,10 +16318,11 @@
+@@ -15799,10 +15816,11 @@
{ $as_echo "$as_me:$LINENO: checking for AVAHI" >&5
$as_echo_n "checking for AVAHI... " >&6; }
@@ -386,7 +425,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"avahi-gobject >= \$AVAHI_REQUIRED
avahi-client >= \$AVAHI_REQUIRED
\"") >&5
-@@ -16317,13 +16338,15 @@
+@@ -15818,13 +15836,15 @@
else
pkg_failed=yes
fi
@@ -408,19 +447,19 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"avahi-gobject >= \$AVAHI_REQUIRED
avahi-client >= \$AVAHI_REQUIRED
\"") >&5
-@@ -16339,8 +16362,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -16353,13 +16377,13 @@
+@@ -15840,8 +15860,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -15854,13 +15875,13 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -438,7 +477,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$AVAHI_PKG_ERRORS" >&5
-@@ -16425,10 +16449,11 @@
+@@ -15926,10 +15947,11 @@
{ $as_echo "$as_me:$LINENO: checking for NETWORK_MANAGER" >&5
$as_echo_n "checking for NETWORK_MANAGER... " >&6; }
@@ -454,7 +493,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager\"") >&5
($PKG_CONFIG --exists --print-errors "NetworkManager") 2>&5
ac_status=$?
-@@ -16438,13 +16463,15 @@
+@@ -15939,13 +15961,15 @@
else
pkg_failed=yes
fi
@@ -476,19 +515,19 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager\"") >&5
($PKG_CONFIG --exists --print-errors "NetworkManager") 2>&5
ac_status=$?
-@@ -16454,8 +16481,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -16468,9 +16496,9 @@
+@@ -15955,8 +15979,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -15969,9 +15994,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -500,7 +539,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$NETWORK_MANAGER_PKG_ERRORS" >&5
-@@ -16584,7 +16612,7 @@
+@@ -16085,7 +16110,7 @@
{ (exit 1); exit 1; }; }
fi
@@ -509,7 +548,7 @@
cat >>confdefs.h <<_ACEOF
-@@ -20346,7 +20374,16 @@
+@@ -19839,7 +19864,16 @@
case $ac_file$ac_mode in
@@ -527,17 +566,17 @@
# 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.
-Index: epiphany-webkit-2.27.2/lib/Makefile.in
+Index: epiphany-webkit-2.27.3/lib/Makefile.in
===================================================================
---- epiphany-webkit-2.27.2.orig/lib/Makefile.in 2009-05-25 04:00:53.000000000 -0300
-+++ epiphany-webkit-2.27.2/lib/Makefile.in 2009-05-27 11:16:56.000000000 -0300
+--- epiphany-webkit-2.27.3.orig/lib/Makefile.in 2009-06-15 14:48:50.000000000 -0300
++++ epiphany-webkit-2.27.3/lib/Makefile.in 2009-06-24 17:26:28.000000000 -0300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -423,7 +423,7 @@
+@@ -402,7 +402,7 @@
-I$(top_srcdir)/lib/egg \
-DDATADIR="\"$(datadir)\"" \
-DSHARE_DIR=\"$(pkgdatadir)\" \
@@ -546,7 +585,7 @@
$(AM_CPPFLAGS)
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
-@@ -456,8 +456,8 @@
+@@ -435,8 +435,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -557,7 +596,7 @@
exit 1;; \
esac; \
done; \
-@@ -819,7 +819,7 @@
+@@ -798,7 +798,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -566,10 +605,10 @@
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-Index: epiphany-webkit-2.27.2/ltmain.sh
+Index: epiphany-webkit-2.27.3/ltmain.sh
===================================================================
---- epiphany-webkit-2.27.2.orig/ltmain.sh 2009-05-25 04:00:38.000000000 -0300
-+++ epiphany-webkit-2.27.2/ltmain.sh 2009-05-27 11:16:39.000000000 -0300
+--- epiphany-webkit-2.27.3.orig/ltmain.sh 2009-06-15 14:48:31.000000000 -0300
++++ epiphany-webkit-2.27.3/ltmain.sh 2009-06-24 17:26:08.000000000 -0300
@@ -4202,6 +4202,11 @@
prev=
continue
@@ -582,17 +621,17 @@
esac
;;
expsyms)
-Index: epiphany-webkit-2.27.2/src/Makefile.in
+Index: epiphany-webkit-2.27.3/src/Makefile.in
===================================================================
---- epiphany-webkit-2.27.2.orig/src/Makefile.in 2009-05-25 04:00:54.000000000 -0300
-+++ epiphany-webkit-2.27.2/src/Makefile.in 2009-05-27 11:16:57.000000000 -0300
+--- epiphany-webkit-2.27.3.orig/src/Makefile.in 2009-06-15 14:48:51.000000000 -0300
++++ epiphany-webkit-2.27.3/src/Makefile.in 2009-06-24 17:26:29.000000000 -0300
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -540,8 +540,8 @@
+@@ -472,8 +472,8 @@
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
@@ -603,18 +642,7 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
$(AM_CPPFLAGS)
-@@ -576,8 +576,8 @@
- @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src \
- @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src/bookmarks \
- @ENABLE_PYTHON_TRUE@ $(PYTHON_INCLUDES) \
-- at ENABLE_PYTHON_TRUE@ -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \
-- at ENABLE_PYTHON_TRUE@ -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \
-+ at ENABLE_PYTHON_TRUE@ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \
-+ at ENABLE_PYTHON_TRUE@ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \
- @ENABLE_PYTHON_TRUE@ -DDATADIR=\""$(datadir)"\" \
- @ENABLE_PYTHON_TRUE@ $(AM_CPPFLAGS)
-
-@@ -843,8 +843,8 @@
+@@ -569,8 +569,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -625,7 +653,7 @@
exit 1;; \
esac; \
done; \
-@@ -1435,7 +1435,7 @@
+@@ -1110,7 +1110,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
More information about the pkg-gnome-commits
mailing list