r25252 - in /desktop/unstable/gedit/debian: changelog patches/90_autoreconf.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Oct 2 11:55:16 UTC 2010
Author: joss
Date: Sat Oct 2 11:55:14 2010
New Revision: 25252
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25252
Log:
* New upstream translation release.
* 90_autoreconf.patch: updated for the new version.
Modified:
desktop/unstable/gedit/debian/changelog
desktop/unstable/gedit/debian/patches/90_autoreconf.patch
Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=25252&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog [utf-8] (original)
+++ desktop/unstable/gedit/debian/changelog [utf-8] Sat Oct 2 11:55:14 2010
@@ -1,3 +1,10 @@
+gedit (2.30.4-1) unstable; urgency=low
+
+ * New upstream translation release.
+ * 90_autoreconf.patch: updated for the new version.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 02 Oct 2010 13:55:04 +0200
+
gedit (2.30.3-1) unstable; urgency=low
* New upstream bugfix release.
Modified: desktop/unstable/gedit/debian/patches/90_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/90_autoreconf.patch?rev=25252&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/90_autoreconf.patch [utf-8] (original)
+++ desktop/unstable/gedit/debian/patches/90_autoreconf.patch [utf-8] Sat Oct 2 11:55:14 2010
@@ -1,537 +1,311 @@
diff '-x*config.guess' '-x*config.sub' -Naur gedit-2.30.2.old/aclocal.m4 gedit-2.30.2/aclocal.m4
-Index: gedit-2.30.3/aclocal.m4
+Index: gedit-2.30.4/aclocal.m4
===================================================================
---- gedit-2.30.3.orig/aclocal.m4 2010-07-17 02:21:43.897464538 +0200
-+++ gedit-2.30.3/aclocal.m4 2010-07-17 02:21:48.945463092 +0200
-@@ -1121,14 +1121,16 @@
- # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
- # ---------------------------------------------
- m4_define([_PKG_CONFIG],
--[if test -n "$$1"; then
-- pkg_cv_[]$1="$$1"
-- elif test -n "$PKG_CONFIG"; then
-- PKG_CHECK_EXISTS([$3],
-- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-- [pkg_failed=yes])
-- else
-- pkg_failed=untried
-+[if test -n "$PKG_CONFIG"; then
-+ if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ else
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+ [pkg_failed=yes])
-+ fi
-+else
-+ pkg_failed=untried
- fi[]dnl
- ])# _PKG_CONFIG
-
-@@ -1172,9 +1174,9 @@
- if test $pkg_failed = yes; then
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
- else
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-Index: gedit-2.30.3/configure
+--- gedit-2.30.4.orig/aclocal.m4 2010-09-28 09:31:52.000000000 +0200
++++ gedit-2.30.4/aclocal.m4 2010-10-02 13:54:03.276729431 +0200
+@@ -13,8 +13,8 @@
+
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
+-[m4_warning([this file was generated for autoconf 2.66.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
++[m4_warning([this file was generated for autoconf 2.67.
+ 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.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+@@ -730,7 +730,7 @@ msgstr ""
+
+ dnl These rules are solely for the distribution goal. While doing this
+ dnl we only have to keep exactly one list of the available catalogs
+- dnl in configure.ac.
++ dnl in configure.in.
+ for lang in $ALL_LINGUAS; do
+ GMOFILES="$GMOFILES $lang.gmo"
+ POFILES="$POFILES $lang.po"
+@@ -859,7 +859,7 @@ AC_DEFINE_UNQUOTED($1, "$localedir",
+ dnl
+ dnl Now the definitions that aclocal will find
+ dnl
+-ifdef(glib_configure_ac,[],[
++ifdef(glib_configure_in,[],[
+ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+ AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+ ])dnl
+@@ -1193,7 +1193,7 @@ $$1_PKG_ERRORS
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-_PKG_TEXT])
++_PKG_TEXT])dnl
+ ])
+ elif test $pkg_failed = untried; then
+ AC_MSG_RESULT([no])
+@@ -1204,7 +1204,7 @@ path to pkg-config.
+
+ _PKG_TEXT
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+ ])
+ else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+Index: gedit-2.30.4/configure
===================================================================
---- gedit-2.30.3.orig/configure 2010-07-17 02:21:43.917464295 +0200
-+++ gedit-2.30.3/configure 2010-07-17 02:22:55.637458005 +0200
-@@ -6009,11 +6009,11 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- else
-@@ -8446,7 +8446,7 @@
- lt_prog_compiler_static='-non_shared'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
-@@ -8895,6 +8895,9 @@
- openbsd*)
- with_gnu_ld=no
- ;;
-+ linux* | k*bsd*-gnu)
-+ link_all_deplibs=no
-+ ;;
+--- gedit-2.30.4.orig/configure 2010-09-28 09:31:53.000000000 +0200
++++ gedit-2.30.4/configure 2010-10-02 13:54:05.436224273 +0200
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.66 for gedit 2.30.4.
++# Generated by GNU Autoconf 2.67 for gedit 2.30.4.
+ #
+ # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gedit>.
+ #
+@@ -993,8 +993,9 @@ do
+ fi
+
+ case $ac_option in
+- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+- *) ac_optarg=yes ;;
++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *=) ac_optarg= ;;
++ *) ac_optarg=yes ;;
esac
- ld_shlibs=yes
-@@ -8916,6 +8919,7 @@
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -1703,7 +1704,7 @@ test -n "$ac_init_help" && exit $ac_stat
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ gedit configure 2.30.4
+-generated by GNU Autoconf 2.66
++generated by GNU Autoconf 2.67
+
+ Copyright (C) 2010 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+@@ -1890,7 +1891,7 @@ $as_echo "$ac_try_echo"; } >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; } >/dev/null && {
++ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+@@ -2062,7 +2063,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+ ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
+
+@@ -2110,7 +2111,7 @@ This file contains any messages produced
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by gedit $as_me 2.30.4, which was
+-generated by GNU Autoconf 2.66. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
+
+ $ $0 $@
+
+@@ -2368,7 +2369,7 @@ $as_echo "$as_me: loading site script $a
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "failed to load site script $ac_site_file
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ done
+
+@@ -2614,11 +2615,11 @@ am_lf='
+ '
+ case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ esac
+ case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ esac
+
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -3324,7 +3325,7 @@ fi
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -3439,7 +3440,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error 77 "C compiler cannot create executables
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -3482,7 +3483,7 @@ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+@@ -3541,7 +3542,7 @@ $as_echo "$ac_try_echo"; } >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
-+ *GNU\ gold*) supports_anon_versioning=yes ;;
- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -9007,7 +9011,7 @@
- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- gnu* | linux* | tpf* | k*bsd*-gnu)
-+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
- case $cc_basename in
-@@ -9077,7 +9081,7 @@
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -9252,6 +9256,7 @@
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
- fi
-+ link_all_deplibs=no
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
-@@ -9578,7 +9583,7 @@
- link_all_deplibs=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -10468,7 +10473,7 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -10508,13 +10513,10 @@
- # before this can be enabled.
- hardcode_into_libs=yes
-
-- # Add ABI-specific directories to the system library path.
-- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10526,6 +10528,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -11146,7 +11160,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 11149 "configure"
-+#line 11163 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -11242,7 +11256,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 11245 "configure"
-+#line 11259 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -11999,10 +12013,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IGE_MAC" >&5
- $as_echo_n "checking for IGE_MAC... " >&6; }
-
--if test -n "$IGE_MAC_CFLAGS"; then
-- pkg_cv_IGE_MAC_CFLAGS="$IGE_MAC_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$IGE_MAC_CFLAGS"; then
-+ pkg_cv_IGE_MAC_CFLAGS="$IGE_MAC_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5
- ac_status=$?
-@@ -12012,13 +12027,15 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$IGE_MAC_LIBS"; then
-- pkg_cv_IGE_MAC_LIBS="$IGE_MAC_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$IGE_MAC_LIBS"; then
-+ pkg_cv_IGE_MAC_LIBS="$IGE_MAC_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5
- ac_status=$?
-@@ -12028,8 +12045,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -12042,9 +12060,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ige-mac-integration" 2>&1`
-+ IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ige-mac-integration"`
- else
-- IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ige-mac-integration" 2>&1`
-+ IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ige-mac-integration"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$IGE_MAC_PKG_ERRORS" >&5
-@@ -13416,10 +13434,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSOUP" >&5
- $as_echo_n "checking for LIBSOUP... " >&6; }
-
--if test -n "$LIBSOUP_CFLAGS"; then
-- pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$LIBSOUP_CFLAGS"; then
-+ pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
- libsoup-2.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "\
-@@ -13432,13 +13451,15 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$LIBSOUP_LIBS"; then
-- pkg_cv_LIBSOUP_LIBS="$LIBSOUP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$LIBSOUP_LIBS"; then
-+ pkg_cv_LIBSOUP_LIBS="$LIBSOUP_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\
- libsoup-2.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "\
-@@ -13451,8 +13472,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -13465,11 +13487,11 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "\
-- libsoup-2.4" 2>&1`
-+ LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\
-+ libsoup-2.4"`
- else
-- LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
-- libsoup-2.4" 2>&1`
-+ LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
-+ libsoup-2.4"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBSOUP_PKG_ERRORS" >&5
-@@ -13528,10 +13550,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENCHANT" >&5
- $as_echo_n "checking for ENCHANT... " >&6; }
-
--if test -n "$ENCHANT_CFLAGS"; then
-- pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$ENCHANT_CFLAGS"; then
-+ pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= \$ENCHANT_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "enchant >= $ENCHANT_REQUIRED") 2>&5
- ac_status=$?
-@@ -13541,13 +13564,15 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$ENCHANT_LIBS"; then
-- pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$ENCHANT_LIBS"; then
-+ pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= \$ENCHANT_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "enchant >= $ENCHANT_REQUIRED") 2>&5
- ac_status=$?
-@@ -13557,8 +13582,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -13571,9 +13597,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "enchant >= $ENCHANT_REQUIRED" 2>&1`
-+ ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "enchant >= $ENCHANT_REQUIRED"`
- else
-- ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors "enchant >= $ENCHANT_REQUIRED" 2>&1`
-+ ENCHANT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "enchant >= $ENCHANT_REQUIRED"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$ENCHANT_PKG_ERRORS" >&5
-@@ -13709,10 +13735,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GEDIT" >&5
- $as_echo_n "checking for GEDIT... " >&6; }
-
--if test -n "$GEDIT_CFLAGS"; then
-- pkg_cv_GEDIT_CFLAGS="$GEDIT_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$GEDIT_CFLAGS"; then
-+ pkg_cv_GEDIT_CFLAGS="$GEDIT_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
-@@ -13746,13 +13773,15 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$GEDIT_LIBS"; then
-- pkg_cv_GEDIT_LIBS="$GEDIT_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$GEDIT_LIBS"; then
-+ pkg_cv_GEDIT_LIBS="$GEDIT_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
-@@ -13786,8 +13815,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -13800,7 +13830,7 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- GEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
-+ GEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-@@ -13808,9 +13838,9 @@
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
- gconf-2.0 >= 1.1.11
--" 2>&1`
-+"`
- else
-- GEDIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "
-+ GEDIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
- libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
- gthread-2.0 >= 2.13.0
-@@ -13818,7 +13848,7 @@
- gtk+-2.0 >= 2.16.0
- gtksourceview-2.0 >= 2.9.7
- gconf-2.0 >= 1.1.11
--" 2>&1`
-+"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GEDIT_PKG_ERRORS" >&5
-@@ -13870,10 +13900,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
- $as_echo_n "checking for X11... " >&6; }
-
--if test -n "$X11_CFLAGS"; then
-- pkg_cv_X11_CFLAGS="$X11_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$X11_CFLAGS"; then
-+ pkg_cv_X11_CFLAGS="$X11_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
- x11
- \""; } >&5
-@@ -13889,13 +13920,15 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$X11_LIBS"; then
-- pkg_cv_X11_LIBS="$X11_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$X11_LIBS"; then
-+ pkg_cv_X11_LIBS="$X11_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
- x11
- \""; } >&5
-@@ -13911,8 +13944,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -13925,13 +13959,13 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
-+ X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
- x11
-- " 2>&1`
-+ "`
- else
-- X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "
-+ X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
- x11
-- " 2>&1`
-+ "`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$X11_PKG_ERRORS" >&5
-@@ -14024,49 +14058,59 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGG_SMCLIENT" >&5
- $as_echo_n "checking for EGG_SMCLIENT... " >&6; }
-
--if test -n "$EGG_SMCLIENT_CFLAGS"; then
-- pkg_cv_EGG_SMCLIENT_CFLAGS="$EGG_SMCLIENT_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EGG_SMCLIENT_CFLAGS"; then
-+ pkg_cv_EGG_SMCLIENT_CFLAGS="$EGG_SMCLIENT_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
+ fi
+@@ -3593,7 +3594,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -4779,7 +4780,7 @@ fi
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+ esac
+ build=$ac_cv_build
+ ac_save_IFS=$IFS; IFS='-'
+@@ -4812,7 +4813,7 @@ fi
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+ esac
+ host=$ac_cv_host
+ ac_save_IFS=$IFS; IFS='-'
+@@ -7548,7 +7549,7 @@ else
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -7564,11 +7565,11 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ break
+ fi
+@@ -7607,7 +7608,7 @@ else
+ # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+@@ -7623,18 +7624,18 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+
+ ac_ext=c
+@@ -12209,7 +12210,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables IGE_MAC_CFLAGS
+ and IGE_MAC_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -12224,8 +12224,7 @@ and IGE_MAC_LIBS to avoid the need to ca
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ IGE_MAC_CFLAGS=$pkg_cv_IGE_MAC_CFLAGS
+ IGE_MAC_LIBS=$pkg_cv_IGE_MAC_LIBS
+@@ -14000,7 +13999,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables GEDIT_CFLAGS
+ and GEDIT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -14015,8 +14013,7 @@ and GEDIT_LIBS to avoid the need to call
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ GEDIT_CFLAGS=$pkg_cv_GEDIT_CFLAGS
+ GEDIT_LIBS=$pkg_cv_GEDIT_LIBS
+@@ -14112,7 +14109,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables X11_CFLAGS
+ and X11_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -14127,8 +14123,7 @@ and X11_LIBS to avoid the need to call p
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ X11_CFLAGS=$pkg_cv_X11_CFLAGS
+ X11_LIBS=$pkg_cv_X11_LIBS
+@@ -14197,15 +14192,18 @@ if test -n "$EGG_SMCLIENT_CFLAGS"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
sm >= 1.0.0
+ ice
@@ -549,22 +323,8 @@
" 2>/dev/null`
else
pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
--if test -n "$EGG_SMCLIENT_LIBS"; then
-- pkg_cv_EGG_SMCLIENT_LIBS="$EGG_SMCLIENT_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EGG_SMCLIENT_LIBS"; then
-+ pkg_cv_EGG_SMCLIENT_LIBS="$EGG_SMCLIENT_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
+@@ -14219,15 +14217,18 @@ if test -n "$EGG_SMCLIENT_LIBS"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
sm >= 1.0.0
+ ice
@@ -582,135 +342,148 @@
" 2>/dev/null`
else
pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -14079,19 +14123,22 @@
- _pkg_short_errors_supported=no
- fi
+@@ -14250,10 +14251,12 @@ fi
if test $_pkg_short_errors_supported = yes; then
-- EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
-+ EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
- sm >= 1.0.0
-- " 2>&1`
-+ ice
-+ "`
+ EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
+ sm >= 1.0.0
++ ice
+ " 2>&1`
else
-- EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "
-+ EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
- sm >= 1.0.0
-- " 2>&1`
-+ ice
-+ "`
+ EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+ sm >= 1.0.0
++ ice
+ " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$EGG_SMCLIENT_PKG_ERRORS" >&5
-
- as_fn_error "Package requirements (
+@@ -14261,6 +14264,7 @@ fi
+
+ as_fn_error $? "Package requirements (
sm >= 1.0.0
+ ice
) were not met:
$EGG_SMCLIENT_PKG_ERRORS
-@@ -14503,10 +14550,11 @@
- { $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
- pygobject-2.0 >= \$PYGOBJECT_REQUIRED
- pygtk-2.0 >= \$PYGTK_REQUIRED
-@@ -14525,13 +14573,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:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
- pygobject-2.0 >= \$PYGOBJECT_REQUIRED
- pygtk-2.0 >= \$PYGTK_REQUIRED
-@@ -14550,8 +14600,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -14564,15 +14615,15 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
-+ PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
- pygobject-2.0 >= $PYGOBJECT_REQUIRED
- pygtk-2.0 >= $PYGTK_REQUIRED
-- pygtksourceview-2.0 >= $PYGTKSOURCEVIEW_REQUIRED" 2>&1`
-+ pygtksourceview-2.0 >= $PYGTKSOURCEVIEW_REQUIRED"`
- else
-- PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "
-+ PYGTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
- pygobject-2.0 >= $PYGOBJECT_REQUIRED
- pygtk-2.0 >= $PYGTK_REQUIRED
-- pygtksourceview-2.0 >= $PYGTKSOURCEVIEW_REQUIRED" 2>&1`
-+ pygtksourceview-2.0 >= $PYGTKSOURCEVIEW_REQUIRED"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$PYGTK_PKG_ERRORS" >&5
-Index: gedit-2.30.3/ltmain.sh
+@@ -14271,7 +14275,6 @@ installed software in a non-standard pre
+ Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS
+ and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -14286,8 +14289,7 @@ and EGG_SMCLIENT_LIBS to avoid the need
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ EGG_SMCLIENT_CFLAGS=$pkg_cv_EGG_SMCLIENT_CFLAGS
+ EGG_SMCLIENT_LIBS=$pkg_cv_EGG_SMCLIENT_LIBS
+@@ -14341,7 +14343,7 @@ $as_echo "Using $GCONF_SCHEMA_FILE_DIR a
+ if test "${enable_schemas_install+set}" = set; then :
+ enableval=$enable_schemas_install; case ${enableval} in
+ yes|no) ;;
+- *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
+ esac
+ fi
+
+@@ -14626,7 +14628,7 @@ else
+ $as_echo "not found" >&6; }
+ have_python=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ CPPFLAGS="$save_CPPFLAGS"
+
+ fi
+@@ -15798,7 +15800,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+ # values after options handling.
+ ac_log="
+ This file was extended by gedit $as_me 2.30.4, which was
+-generated by GNU Autoconf 2.66. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -15865,7 +15867,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ gedit config.status 2.30.4
+-configured by $0, generated by GNU Autoconf 2.66,
++configured by $0, generated by GNU Autoconf 2.67,
+ with options \\"\$ac_cs_config\\"
+
+ Copyright (C) 2010 Free Software Foundation, Inc.
+@@ -15886,11 +15888,16 @@ ac_need_defaults=:
+ while test $# != 0
+ do
+ case $1 in
+- --*=*)
++ --*=?*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+ ac_shift=:
+ ;;
++ --*=)
++ ac_option=`expr "X$1" : 'X\([^=]*\)='`
++ ac_optarg=
++ ac_shift=:
++ ;;
+ *)
+ ac_option=$1
+ ac_optarg=$2
+@@ -15912,6 +15919,7 @@ do
+ $ac_shift
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++ '') as_fn_error $? "missing file argument" ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
+ ac_need_defaults=false;;
+@@ -16300,7 +16308,7 @@ do
+ "osx/Makefile") CONFIG_FILES="$CONFIG_FILES osx/Makefile" ;;
+ "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
+
+- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ esac
+ done
+
+@@ -16616,7 +16624,7 @@ do
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+@@ -16644,7 +16652,7 @@ do
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+ esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
+@@ -16671,7 +16679,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+
+ case $ac_tag in
+ *:-:* | *:-) cat >"$tmp/stdin" \
+- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ esac
+ ;;
+ esac
+Index: gedit-2.30.4/ltmain.sh
===================================================================
---- gedit-2.30.3.orig/ltmain.sh 2010-07-17 02:21:43.909465230 +0200
-+++ gedit-2.30.3/ltmain.sh 2010-07-17 02:21:49.009465383 +0200
-@@ -65,7 +65,7 @@
- # compiler: $LTCC
- # compiler flags: $LTCFLAGS
- # linker: $LD (gnu? $with_gnu_ld)
--# $progname: (GNU libtool) 2.2.6b
-+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
- # automake: $automake_version
- # autoconf: $autoconf_version
- #
-@@ -73,7 +73,7 @@
-
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=2.2.6b
-+VERSION="2.2.6b Debian-2.2.6b-2"
- TIMESTAMP=""
- package_revision=1.3017
-
-@@ -5033,7 +5033,10 @@
+--- gedit-2.30.4.orig/ltmain.sh 2010-09-28 09:31:48.000000000 +0200
++++ gedit-2.30.4/ltmain.sh 2010-10-02 13:53:33.764730330 +0200
+@@ -5359,7 +5359,10 @@ func_mode_link ()
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -722,7 +495,7 @@
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5344,19 +5347,19 @@
+@@ -5671,19 +5674,19 @@ func_mode_link ()
# 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"
@@ -752,181 +525,21 @@
continue
fi # $pass = conv
-@@ -5893,6 +5896,7 @@
- if test "$link_all_deplibs" != no; then
- # Add the search paths of all dependency libraries
+@@ -8373,6 +8376,7 @@ EOF
+ # Replace all uninstalled libtool libraries with the installed ones
+ newdependency_libs=
for deplib in $dependency_libs; do
+ path=
case $deplib in
- -L*) path="$deplib" ;;
*.la)
-@@ -6206,6 +6210,9 @@
- revision="$number_minor"
- lt_irix_increment=no
+ func_basename "$deplib"
+@@ -8658,6 +8662,9 @@ func_mode_uninstall ()
+ # add $file without .exe
+ rmfiles="$rmfiles $file"
;;
+ *)
+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+ ;;
esac
- ;;
- no)
-Index: gedit-2.30.3/m4/libtool.m4
-===================================================================
---- gedit-2.30.3.orig/m4/libtool.m4 2010-07-17 02:21:43.881465012 +0200
-+++ gedit-2.30.3/m4/libtool.m4 2010-07-17 02:21:49.021464678 +0200
-@@ -2445,7 +2445,7 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -2470,13 +2470,10 @@
- # before this can be enabled.
- hardcode_into_libs=yes
-
-- # Add ABI-specific directories to the system library path.
-- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2488,6 +2485,18 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+netbsdelf*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -3075,11 +3084,11 @@
- ;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- else
-@@ -3696,7 +3705,7 @@
- ;;
- esac
- ;;
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- KCC*)
- # KAI C++ Compiler
-@@ -3760,7 +3769,7 @@
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- ;;
- *qnx* | *nto*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -3980,7 +3989,7 @@
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
-@@ -4185,6 +4194,9 @@
- cygwin* | mingw* | cegcc*)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-+ linux* | k*bsd*-gnu)
-+ _LT_TAGVAR(link_all_deplibs, $1)=no
-+ ;;
- *)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -4249,6 +4261,9 @@
- openbsd*)
- with_gnu_ld=no
- ;;
-+ linux* | k*bsd*-gnu)
-+ _LT_TAGVAR(link_all_deplibs, $1)=no
-+ ;;
- esac
-
- _LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4270,6 +4285,7 @@
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
-+ *GNU\ gold*) supports_anon_versioning=yes ;;
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -4361,7 +4377,7 @@
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- gnu* | linux* | tpf* | k*bsd*-gnu)
-+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
- case $cc_basename in
-@@ -4431,7 +4447,7 @@
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -4606,6 +4622,7 @@
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
- fi
-+ _LT_TAGVAR(link_all_deplibs, $1)=no
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
-@@ -4844,7 +4861,7 @@
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -5844,7 +5861,7 @@
- _LT_TAGVAR(inherit_rpath, $1)=yes
- ;;
-
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
+ # Do a test to see if this is a libtool program.
+ if func_ltwrapper_p "$file"; then
More information about the pkg-gnome-commits
mailing list