diff -Nru vte3-0.31.0/aclocal.m4 vte3-0.32.0/aclocal.m4 --- vte3-0.31.0/aclocal.m4 2011-11-21 13:48:15.000000000 +0000 +++ vte3-0.32.0/aclocal.m4 2012-03-19 17:25:18.000000000 +0000 @@ -10312,6 +10312,7 @@ dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) AC_DEFUN([GTK_DOC_CHECK], [ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first @@ -10339,6 +10340,11 @@ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], [PKG_CHECK_EXISTS([gtk-doc >= $1],, AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) + fi fi AC_MSG_CHECKING([whether to build gtk-doc documentation]) diff -Nru vte3-0.31.0/ChangeLog vte3-0.32.0/ChangeLog --- vte3-0.31.0/ChangeLog 2011-11-21 13:50:17.000000000 +0000 +++ vte3-0.32.0/ChangeLog 2012-03-19 17:26:59.000000000 +0000 @@ -1,3 +1,195 @@ +commit 9f091e1865220ac01c3c575291bec02a051882ea +Author: Christian Persch +Date: Mon Mar 19 18:22:16 2012 +0100 + + Version 0.32.0 + + NEWS | 10 ++++++++++ + configure.in | 3 +-- + 2 files changed, 11 insertions(+), 2 deletions(-) + +commit 578c54755eac8906dedffe2fd09b7b40465a04f9 +Author: Christian Persch +Date: Sat Mar 10 16:51:11 2012 +0100 + + glade: Use correct gettext domain + + glade/vte.xml.in.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit b1040ae9a4f4326dd30adcb62647e0930bdd196c +Author: Christian Persch +Date: Sat Mar 10 13:44:02 2012 +0100 + + glade: Fix library name + + https://bugzilla.gnome.org/show_bug.cgi?id=671760 + + configure.in | 1 + + glade/Makefile.am | 5 ++--- + glade/{vte.xml.in => vte.xml.in.in} | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit ef34977b6765be1036ea8cd016861199033e2231 +Author: Christian Persch +Date: Fri Mar 9 17:06:14 2012 +0100 + + introspection: Fix annotation thinko + + https://bugzilla.gnome.org/show_bug.cgi?id=661716 + + src/vte.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 79793eeb430c60a774ff118192b249c6c06e4acc +Author: Christian Persch +Date: Thu Mar 8 22:15:54 2012 +0100 + + build: Install GIR and typelib into our prefix + + https://bugzilla.gnome.org/show_bug.cgi?id=648183 + + src/Makefile.am | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 563963f2d9c47c0fc1763ae568dbeb97242ac581 +Author: Evan Nemerson +Date: Thu Mar 8 22:11:49 2012 +0100 + + build: Include pkg-config and include info in the GIR + + http://bugzilla-attachments.gnome.org/attachment.cgi?id=192742 + + src/Makefile.am | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit f4db3875fd08d246bf337d048845bd9b54c325f8 +Author: Gert Michael Kulyk +Date: Sun Mar 4 13:03:53 2012 +0100 + + Explicitly set GDK_SCROLL_MASK as recent gtk+ versions require it for scrolling to work + + Bug #671305. + + src/vte.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 116fe70d32c810ccd0bb226fc0c06c74e28db075 +Author: Martin Pieuchot +Date: Thu Mar 8 21:53:52 2012 +0100 + + pty: Support allocating PTYs through openpty on BSD + + Allows systems supporting the BSD openpty(3) utily function but not + the Unix98 PTY function family (grantpt(3), unlockpt(3), ...) to + allocate pseudo-tty without relying on the gnome-pty-helper. + + https://bugzilla.gnome.org/show_bug.cgi?id=670758 + + configure.in | 6 +++++- + src/pty.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 61 insertions(+), 2 deletions(-) + +commit be763b49aabc14fb48a5533a32645b6d88f31fbb +Author: Markus Duft +Date: Thu Mar 8 21:44:14 2012 +0100 + + build: Add fallback for round on interix + + configure.in | 2 +- + src/vte.c | 10 ++++++++++ + 2 files changed, 11 insertions(+), 1 deletions(-) + +commit 8cff105a2b280ed738b296955724590b9cd348ce +Author: Christian Persch +Date: Thu Mar 8 21:38:13 2012 +0100 + + introspection: Add missing annotation + + https://bugzilla.gnome.org/show_bug.cgi?id=661716 + + src/vte.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit bbfcc64b4f52c14b71c008a52b253d9fdc205fd5 +Author: Alban Browaeys +Date: Thu Mar 8 21:33:33 2012 +0100 + + build: Fix missing bracked + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit f210e8be89b985102fe2af1dca846e699c2e6ca7 +Author: Christian Persch +Date: Thu Mar 8 21:29:20 2012 +0100 + + build: Disable warnings about non-portable constructs + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 1272d8b979b4b1b579180b6c57fc7df4c3e405a6 +Author: Vincent Untz +Date: Fri Feb 24 11:28:38 2012 +0100 + + gnome-pty-helper: Respect SUID_CFLAGS and SUID_LDFLAGS + + This is a good way for distributors to use -fPIE/-pie when building vte. + + https://bugzilla.gnome.org/show_bug.cgi?id=670732 + + gnome-pty-helper/Makefile.am | 3 +++ + gnome-pty-helper/configure.in | 5 +++++ + 2 files changed, 8 insertions(+), 0 deletions(-) + +commit bdc6c05ec09872db755679aba1b39489094c3d05 +Author: Christian Persch +Date: Thu Feb 16 17:58:07 2012 +0100 + + build: Disable glib deprecation warnings + + Due to the GValueArray deprecation, deprecation warnings have become just too + overwhelming. + + configure.in | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit 841b29b09e826799984f63f4265ecd4558316743 +Author: Christian Persch +Date: Wed Feb 15 02:42:44 2012 +0100 + + Typo fix + + src/vte.gresource.xml.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit c0fbf94743d10c4cd26b8cbfc41067d38fe39f56 +Author: Christian Persch +Date: Wed Feb 15 02:15:56 2012 +0100 + + Fix argument order in odd API + + src/vtetc.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit c7cab4b852e4958e71207e90c16ea33d3d591967 +Author: Christian Persch +Date: Wed Feb 15 01:59:28 2012 +0100 + + Use a GResource for our default termcap + + configure.in | 24 ++++++++------- + src/Makefile.am | 15 ++++++--- + src/interpret.c | 10 ++++-- + src/vte-private.h | 1 - + src/vte.c | 44 ++++++---------------------- + src/vte.gresource.xml.in | 22 ++++++++++++++ + src/vtetc.c | 69 +++++++++++++++++++++++++++++++++++---------- + src/vtetc.h | 2 +- + termcaps/Makefile.am | 12 +------ + 9 files changed, 117 insertions(+), 82 deletions(-) + commit 45fd45ff5c4ea0d58c8cf32cfd03d7b556bb9dc8 Author: Christian Persch Date: Mon Nov 21 14:47:38 2011 +0100 diff -Nru vte3-0.31.0/config.h.in vte3-0.32.0/config.h.in --- vte3-0.31.0/config.h.in 2011-11-21 13:48:17.000000000 +0000 +++ vte3-0.32.0/config.h.in 2012-03-19 17:25:31.000000000 +0000 @@ -73,6 +73,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NCURSES_TERM_H +/* Define if you have the openpty function. */ +#undef HAVE_OPENPTY + /* Define to 1 if you have the `ptsname' function. */ #undef HAVE_PTSNAME @@ -82,6 +85,9 @@ /* Define if you have the recvmsg function. */ #undef HAVE_RECVMSG +/* Define to 1 if you have the `round' function. */ +#undef HAVE_ROUND + /* Define to 1 if you have the `setpgid' function. */ #undef HAVE_SETPGID @@ -151,6 +157,9 @@ /* Define to 1 if you have the `unlockpt' function. */ #undef HAVE_UNLOCKPT +/* Define to 1 if you have the header file. */ +#undef HAVE_UTIL_H + /* Define to 1 if you have the header file. */ #undef HAVE_WCHAR_H diff -Nru vte3-0.31.0/configure vte3-0.32.0/configure --- vte3-0.31.0/configure 2011-11-21 13:48:17.000000000 +0000 +++ vte3-0.32.0/configure 2012-03-19 17:25:20.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for vte 0.31.0. +# Generated by GNU Autoconf 2.68 for vte 0.32.0. # # Report bugs to . # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='vte' PACKAGE_TARNAME='vte' -PACKAGE_VERSION='0.31.0' -PACKAGE_STRING='vte 0.31.0' +PACKAGE_VERSION='0.32.0' +PACKAGE_STRING='vte 0.32.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=vte' PACKAGE_URL='' @@ -618,6 +618,9 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +AM_LDFLAGS +AM_CFLAGS +AM_CPPFLAGS VTE_MICRO_VERSION VTE_MINOR_VERSION VTE_MAJOR_VERSION @@ -633,6 +636,8 @@ GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE +GTKDOC_DEPS_LIBS +GTKDOC_DEPS_CFLAGS HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE @@ -658,9 +663,7 @@ VTE_PKGS VTE_LIBS VTE_CFLAGS -VTE_DEFAULT_EMULATION_FALSE -VTE_DEFAULT_EMULATION_TRUE -VTE_DEFAULT_EMULATION +GLIB_COMPILE_RESOURCES GLIB_MKENUMS GLIB_GENMARSHAL GTK_LIBS @@ -856,7 +859,6 @@ enable_debug enable_nls enable_Bsymbolic -with_default_emulation enable_gnome_pty_helper enable_glade_catalogue enable_introspection @@ -881,8 +883,11 @@ GLIB_LIBS GTK_CFLAGS GTK_LIBS +GLIB_COMPILE_RESOURCES VTE_CFLAGS -VTE_LIBS' +VTE_LIBS +GTKDOC_DEPS_CFLAGS +GTKDOC_DEPS_LIBS' ac_subdirs_all='gnome-pty-helper' # Initialize some variables set by options. @@ -1425,7 +1430,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures vte 0.31.0 to adapt to many kinds of systems. +\`configure' configures vte 0.32.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1495,7 +1500,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of vte 0.31.0:";; + short | recursive ) echo "Configuration of vte 0.32.0:";; esac cat <<\_ACEOF @@ -1534,8 +1539,6 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-default-emulation=xterm - default terminal type to be emulated --with-html-dir=PATH path to installed docs Some influential environment variables: @@ -1556,8 +1559,14 @@ GLIB_LIBS linker flags for GLIB, overriding pkg-config GTK_CFLAGS C compiler flags for GTK, overriding pkg-config GTK_LIBS linker flags for GTK, overriding pkg-config + GLIB_COMPILE_RESOURCES + the glib-compile-resources programme VTE_CFLAGS C compiler flags for VTE, overriding pkg-config VTE_LIBS linker flags for VTE, overriding pkg-config + GTKDOC_DEPS_CFLAGS + C compiler flags for GTKDOC_DEPS, overriding pkg-config + GTKDOC_DEPS_LIBS + linker flags for GTKDOC_DEPS, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1625,7 +1634,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -vte configure 0.31.0 +vte configure 0.32.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2094,7 +2103,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by vte $as_me 0.31.0, which was +It was created by vte $as_me 0.32.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2914,7 +2923,7 @@ # Define the identity of the package. PACKAGE='vte' - VERSION='0.31.0' + VERSION='0.32.0' cat >>confdefs.h <<_ACEOF @@ -3003,7 +3012,7 @@ -LT_VERSION_INFO="3109:0:3100" +LT_VERSION_INFO="3209:0:3200" ################################################################################ @@ -13271,7 +13280,8 @@ ;; esac -GLIB_REQUIRED=2.26.0 +GLIB_REQUIRED=2.31.13 +GIO_REQUIRED=2.31.13 PANGO_REQUIRED=1.22.0 $as_echo "#define GDK_MULTIHEAD_SAFE 1" >>confdefs.h @@ -13404,12 +13414,12 @@ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 gio-2.0 >= \$GIO_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gobject-2.0" 2>/dev/null` + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED" 2>/dev/null` else pkg_failed=yes fi @@ -13420,12 +13430,12 @@ pkg_cv_GLIB_LIBS="$GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 gio-2.0 >= \$GIO_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0" 2>/dev/null` + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED" 2>/dev/null` else pkg_failed=yes fi @@ -13445,14 +13455,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0) were not met: + as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED) were not met: $GLIB_PKG_ERRORS @@ -13495,12 +13505,12 @@ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 gio-2.0 >= \$GIO_REQUIRED gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>/dev/null` + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>/dev/null` else pkg_failed=yes fi @@ -13511,12 +13521,12 @@ pkg_cv_GTK_LIBS="$GTK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gobject-2.0 gio-2.0 >= \$GIO_REQUIRED gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>/dev/null` + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>/dev/null` else pkg_failed=yes fi @@ -13536,14 +13546,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) were not met: + as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) were not met: $GTK_PKG_ERRORS @@ -13659,33 +13669,60 @@ -# Let the user specify the default terminal emulation. -# Check whether --with-default-emulation was given. -if test "${with_default_emulation+set}" = set; then : - withval=$with_default_emulation; emulation=$withval +# Extract the first word of "glib-compile-resources", so it can be a program name with args. +set dummy glib-compile-resources; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GLIB_COMPILE_RESOURCES+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GLIB_COMPILE_RESOURCES in + [\\/]* | ?:[\\/]*) + ac_cv_path_GLIB_COMPILE_RESOURCES="$GLIB_COMPILE_RESOURCES" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GLIB_COMPILE_RESOURCES="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GLIB_COMPILE_RESOURCES=$ac_cv_path_GLIB_COMPILE_RESOURCES +if test -n "$GLIB_COMPILE_RESOURCES"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_RESOURCES" >&5 +$as_echo "$GLIB_COMPILE_RESOURCES" >&6; } else - emulation=xterm + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -cat >>confdefs.h <<_ACEOF -#define VTE_DEFAULT_EMULATION "$emulation" -_ACEOF +if test -z "$GLIB_COMPILE_RESOURCES"; then + as_fn_error $? "glib-compile-resources not found" "$LINENO" 5 +fi -VTE_DEFAULT_EMULATION=$emulation +VTE_DEFAULT_EMULATION=xterm - if test "$emulation" != xterm; then - VTE_DEFAULT_EMULATION_TRUE= - VTE_DEFAULT_EMULATION_FALSE='#' -else - VTE_DEFAULT_EMULATION_TRUE='#' - VTE_DEFAULT_EMULATION_FALSE= -fi +cat >>confdefs.h <<_ACEOF +#define VTE_DEFAULT_EMULATION "$VTE_DEFAULT_EMULATION" +_ACEOF # Check for headers. -for ac_header in sys/select.h sys/syslimits.h sys/termios.h sys/un.h sys/wait.h stropts.h termios.h wchar.h +for ac_header in sys/select.h sys/syslimits.h sys/termios.h sys/un.h sys/wait.h stropts.h termios.h util.h wchar.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -13913,6 +13950,52 @@ fi +ac_fn_c_check_func "$LINENO" "openpty" "ac_cv_func_openpty" +if test "x$ac_cv_func_openpty" = xyes; then : + have_openpty=1 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5 +$as_echo_n "checking for openpty in -lutil... " >&6; } +if ${ac_cv_lib_util_openpty+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lutil $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char openpty (); +int +main () +{ +return openpty (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_util_openpty=yes +else + ac_cv_lib_util_openpty=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5 +$as_echo "$ac_cv_lib_util_openpty" >&6; } +if test "x$ac_cv_lib_util_openpty" = xyes; then : + have_openpty=1; LIBS="$LIBS -lutil" +fi + +fi + if test x$have_socket = x1 ; then $as_echo "#define HAVE_SOCKET 1" >>confdefs.h @@ -13928,6 +14011,11 @@ $as_echo "#define HAVE_RECVMSG 1" >>confdefs.h fi +if test x$have_openpty = x1 ; then + +$as_echo "#define HAVE_OPENPTY 1" >>confdefs.h + +fi ac_fn_c_check_func "$LINENO" "floor" "ac_cv_func_floor" if test "x$ac_cv_func_floor" = xyes; then : @@ -13974,7 +14062,7 @@ fi -for ac_func in ceil floor +for ac_func in ceil floor round do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -14583,6 +14671,7 @@ + # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -14740,6 +14829,99 @@ else as_fn_error $? "You need to have gtk-doc >= 1.13 installed to build $PACKAGE_NAME" "$LINENO" 5 fi + if test "x$PACKAGE_NAME" != "xglib"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 +$as_echo_n "checking for GTKDOC_DEPS... " >&6; } + +if test -n "$GTKDOC_DEPS_CFLAGS"; then + pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GTKDOC_DEPS_LIBS"; then + pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + else + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: + +$GTKDOC_DEPS_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_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; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } + +else + GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS + GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 @@ -14818,14 +15000,19 @@ VTE_MAJOR_VERSION=0 -VTE_MINOR_VERSION=31 +VTE_MINOR_VERSION=32 VTE_MICRO_VERSION=0 +AM_CPPFLAGS="$AM_CPPFLAGS -DGLIB_DISABLE_DEPRECATION_WARNINGS" + + + + ################################################################################ -ac_config_files="$ac_config_files Makefile src/Makefile src/vteversion.h termcaps/Makefile perf/Makefile po/Makefile.in doc/Makefile doc/openi18n/Makefile doc/reference/Makefile doc/reference/version.xml glade/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile src/vteversion.h src/vte.gresource.xml termcaps/Makefile perf/Makefile po/Makefile.in doc/Makefile doc/openi18n/Makefile doc/reference/Makefile doc/reference/version.xml glade/Makefile glade/vte.xml.in" ac_config_files="$ac_config_files vte${VTE_PC_VERSION}.pc:vte.pc.in" @@ -14974,10 +15161,6 @@ as_fn_error $? "conditional \"OS_WIN32\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${VTE_DEFAULT_EMULATION_TRUE}" && test -z "${VTE_DEFAULT_EMULATION_FALSE}"; then - as_fn_error $? "conditional \"VTE_DEFAULT_EMULATION\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BUILD_GNOME_PTY_HELPER_TRUE}" && test -z "${BUILD_GNOME_PTY_HELPER_FALSE}"; then as_fn_error $? "conditional \"BUILD_GNOME_PTY_HELPER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -15419,7 +15602,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by vte $as_me 0.31.0, which was +This file was extended by vte $as_me 0.32.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15485,7 +15668,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -vte config.status 0.31.0 +vte config.status 0.32.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -15899,6 +16082,7 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/vteversion.h") CONFIG_FILES="$CONFIG_FILES src/vteversion.h" ;; + "src/vte.gresource.xml") CONFIG_FILES="$CONFIG_FILES src/vte.gresource.xml" ;; "termcaps/Makefile") CONFIG_FILES="$CONFIG_FILES termcaps/Makefile" ;; "perf/Makefile") CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; @@ -15907,6 +16091,7 @@ "doc/reference/Makefile") CONFIG_FILES="$CONFIG_FILES doc/reference/Makefile" ;; "doc/reference/version.xml") CONFIG_FILES="$CONFIG_FILES doc/reference/version.xml" ;; "glade/Makefile") CONFIG_FILES="$CONFIG_FILES glade/Makefile" ;; + "glade/vte.xml.in") CONFIG_FILES="$CONFIG_FILES glade/vte.xml.in" ;; "vte${VTE_PC_VERSION}.pc") CONFIG_FILES="$CONFIG_FILES vte${VTE_PC_VERSION}.pc:vte.pc.in" ;; "vte${VTE_PC_VERSION}-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES vte${VTE_PC_VERSION}-uninstalled.pc:vte-uninstalled.pc.in" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; @@ -17452,5 +17637,4 @@ Configuration for libvte $VERSION for gtk+-$GTK_API_VERSION Installing Glade catalogue: $enable_glade_catalogue Debugging: $enable_debug - Disallow deprecated features: $enable_deprecation EOF diff -Nru vte3-0.31.0/configure.in vte3-0.32.0/configure.in --- vte3-0.31.0/configure.in 2011-11-21 13:42:17.000000000 +0000 +++ vte3-0.32.0/configure.in 2012-03-19 17:25:08.000000000 +0000 @@ -1,5 +1,5 @@ m4_define([version_major],0) -m4_define([version_minor],31) +m4_define([version_minor],32) m4_define([version_micro],0) m4_define([version_triplet],version_major.version_minor.version_micro) @@ -14,7 +14,7 @@ AC_CONFIG_SRCDIR([src/vte.c]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2]) +AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2 -Wno-portability]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -195,26 +195,27 @@ ;; esac -GLIB_REQUIRED=2.26.0 +GLIB_REQUIRED=2.31.13 +GIO_REQUIRED=2.31.13 PANGO_REQUIRED=1.22.0 AC_DEFINE(GDK_MULTIHEAD_SAFE,1,[Force use of GDK's multihead-safe APIs.]) -PKG_CHECK_MODULES(GLIB,[glib-2.0 >= $GLIB_REQUIRED gobject-2.0]) -PKG_CHECK_MODULES(GTK,[glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED]) +PKG_CHECK_MODULES(GLIB,[glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED]) +PKG_CHECK_MODULES(GTK,[glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED]) AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal]) AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) -# Let the user specify the default terminal emulation. -AC_ARG_WITH(default-emulation, -AS_HELP_STRING(--with-default-emulation=xterm,default terminal type to be emulated), -emulation=$withval,emulation=xterm) -AC_DEFINE_UNQUOTED(VTE_DEFAULT_EMULATION,"$emulation",[The default terminal type to be emulated.]) -VTE_DEFAULT_EMULATION=$emulation -AC_SUBST(VTE_DEFAULT_EMULATION) -AM_CONDITIONAL(VTE_DEFAULT_EMULATION, [test "$emulation" != xterm]) +AC_ARG_VAR([GLIB_COMPILE_RESOURCES],[the glib-compile-resources programme]) +AC_PATH_PROG([GLIB_COMPILE_RESOURCES],[glib-compile-resources],[]) +if test -z "$GLIB_COMPILE_RESOURCES"; then + AC_MSG_ERROR([glib-compile-resources not found]) +fi + +VTE_DEFAULT_EMULATION=xterm +AC_DEFINE_UNQUOTED(VTE_DEFAULT_EMULATION,"$VTE_DEFAULT_EMULATION",[The default terminal type to be emulated.]) # Check for headers. -AC_CHECK_HEADERS(sys/select.h sys/syslimits.h sys/termios.h sys/un.h sys/wait.h stropts.h termios.h wchar.h) +AC_CHECK_HEADERS(sys/select.h sys/syslimits.h sys/termios.h sys/un.h sys/wait.h stropts.h termios.h util.h wchar.h) AC_HEADER_TIOCGWINSZ # Check for PTY handling functions. @@ -225,6 +226,7 @@ AC_CHECK_FUNC(socket,[have_socket=1],AC_CHECK_LIB(socket,socket,[have_socket=1; LIBS="$LIBS -lsocket"])) AC_CHECK_FUNC(socketpair,[have_socketpair=1],AC_CHECK_LIB(socket,socketpair,[have_socketpair=1; LIBS="$LIBS -lsocket"])) AC_CHECK_FUNC(recvmsg,[have_recvmsg=1],AC_CHECK_LIB(socket,recvmsg,[have_recvmsg=1; LIBS="$LIBS -lsocket -lnsl"])) +AC_CHECK_FUNC(openpty,[have_openpty=1],AC_CHECK_LIB(util,openpty,[have_openpty=1; LIBS="$LIBS -lutil"])) if test x$have_socket = x1 ; then AC_DEFINE(HAVE_SOCKET,1,[Define if you have the socket function.]) fi @@ -234,8 +236,11 @@ if test x$have_recvmsg = x1 ; then AC_DEFINE(HAVE_RECVMSG,1,[Define if you have the recvmsg function.]) fi +if test x$have_openpty = x1 ; then + AC_DEFINE(HAVE_OPENPTY,1,[Define if you have the openpty function.]) +fi AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"])) -AC_CHECK_FUNCS([ceil floor]) +AC_CHECK_FUNCS([ceil floor round]) # Look for tgetent @@ -373,12 +378,17 @@ AC_SUBST([VTE_MINOR_VERSION],[version_minor]) AC_SUBST([VTE_MICRO_VERSION],[version_micro]) +AC_SUBST([AM_CPPFLAGS],["$AM_CPPFLAGS -DGLIB_DISABLE_DEPRECATION_WARNINGS"]) +AC_SUBST([AM_CFLAGS]) +AC_SUBST([AM_LDFLAGS]) + ################################################################################ AC_CONFIG_FILES([ Makefile src/Makefile src/vteversion.h +src/vte.gresource.xml termcaps/Makefile perf/Makefile po/Makefile.in @@ -387,6 +397,7 @@ doc/reference/Makefile doc/reference/version.xml glade/Makefile +glade/vte.xml.in ]) AC_CONFIG_FILES([vte${VTE_PC_VERSION}.pc:vte.pc.in],[VTE_PC_VERSION=${VTE_PC_VERSION}]) @@ -406,5 +417,4 @@ Configuration for libvte $VERSION for gtk+-$GTK_API_VERSION Installing Glade catalogue: $enable_glade_catalogue Debugging: $enable_debug - Disallow deprecated features: $enable_deprecation EOF diff -Nru vte3-0.31.0/debian/changelog vte3-0.32.0/debian/changelog --- vte3-0.31.0/debian/changelog 2012-03-08 09:32:52.000000000 +0000 +++ vte3-0.32.0/debian/changelog 2012-03-21 12:49:57.000000000 +0000 @@ -1,38 +1,58 @@ -vte3 (1:0.31.0-0ubuntu2) precise; urgency=low +vte3 (1:0.32.0-1ubuntu1) precise; urgency=low - * Add debian/patches/03_set_scroll_mask.patch: Explicitly set - GDK_SCROLL_MASK as recent gtk+ versions require it for scrolling to work. - (LP: #948612) - - -- Martin Pitt Thu, 08 Mar 2012 10:32:46 +0100 - -vte3 (1:0.31.0-0ubuntu1) precise; urgency=low - - * New upstream release. - - -- Jeremy Bicha Thu, 23 Feb 2012 15:06:27 +0100 - -vte3 (1:0.30.1-2ubuntu2) precise; urgency=low - - * debian/libvte-2.90-9.symbols: - - Add vte_terminal_set_alternate_screen_scroll to symbols file to - prevent FTBFS. + * Merge with Debian experimental. Remaining Ubuntu changes: + - 91_keep_fds.patch: Should be obsolete, but not dropping it at this time + of precise's development cycle. + - 93_add_alt_screen_scroll_toggle.patch: Handle scrolling differently when + using alternate screen or scrolling is restricted. + + -- Martin Pitt Wed, 21 Mar 2012 13:49:41 +0100 + +vte3 (1:0.32.0-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: Bump glib build dependency as per configure.ac. + * Drop 03_glade-catalog-library-name.patch, fixed upstream. + * 25_optional-ncurses.patch: Unfuzz. + * Add 03_scroll_region_updates.patch: Fix glitches with interspersing writes + to the bottom line with scrolls of the upper region. Patch taken from + Ubuntu package. (GNOME #542087, LP: #246701) + * Add 04_workaround_resources_compiler_path.patch: Drop --sourcedir from + glib-compile-resources call. It is not necessary here, and breaks + out-of-tree builds with absolute configure paths, such as cdbs does. + Works around GNOME #672541. + * debian/libvte-2.90-{common,9-udeb}.install: Drop termcap file, it's built + in using GResource now. + * debian/rules: Explicitly configure with --enable-gtk-doc, it's disabled + now by default. + * debian/libvte-2.90-9.symbols: Add new symbol from this release. + + -- Martin Pitt Wed, 21 Mar 2012 13:27:36 +0100 + +vte3 (1:0.30.1-4) unstable; urgency=low + + * debian/patches/03_glade-catalog-library-name.patch: Use the correct + vte library name in the glade catalog file. + * Move the glade catalog file from libvte-2.90-common into libvte-2.90-dev + alongside the .so it references. + * Add the necessary Breaks/Replaces. - -- Michael Terry Mon, 12 Dec 2011 17:57:11 -0500 + -- Michael Biebl Tue, 13 Mar 2012 15:10:49 +0100 -vte3 (1:0.30.1-2ubuntu1) precise; urgency=low +vte3 (1:0.30.1-3) unstable; urgency=low - * Port Ubuntu's vte patches to vte3 (LP: #903401): - - debian/patches/91_keep_fds.patch: - - vte does not support G_SPAWN_LEAVE_DESCRIPTORS_OPEN - when calling vte_terminal_fork_command_full(). - - debian/patches/93_add_alt_screen_scroll_toggle.patch: - - Handle scrolling differently when using alternate screen or - scrolling is restricted. - - debian/patches/lp246701_scroll_region_updates.patch: - - Fix update glitch related to scroll regions. + * debian/control.in: + - Remove obsolete Replaces. + - Change section of gir1.2-vte-2.90 to introspection. + - Remove X-Python-Version, since we no longer build a python module. + * debian/rules: + - Correctly pass libexecdir to configure so libvte has the correct path to + gnome-pty-helper. + * Update install and lintian override file for the updated gnome-pty-helper + location. We use the full library package name as subdirectory now, so we + don't get file conflicts on soname bumps. - -- Michael Terry Mon, 12 Dec 2011 17:38:32 -0500 + -- Michael Biebl Mon, 12 Dec 2011 16:17:20 +0100 vte3 (1:0.30.1-2) unstable; urgency=low @@ -54,41 +74,6 @@ -- Josselin Mouette Sat, 12 Nov 2011 16:24:43 +0100 -vte (1:0.28.2-3ubuntu1) precise; urgency=low - - * Merged from Debian unstable, remaining changes: - - debian/patches/91_keep_fds.patch: - - vte does not support G_SPAWN_LEAVE_DESCRIPTORS_OPEN - when calling vte_terminal_fork_command_full(). - - debian/patches/93_add_alt_screen_scroll_toggle.patch: - - Handle scrolling differently when using alternate screen or - scrolling is restricted. - - debian/patches/lp246701_scroll_region_updates.patch: - - Fix update glitch related to scroll regions. - * debian/patches/gtk32-meta-map.patch: - - Dropped, Debian uses a better patch - * debian/patches/fix_gtk3_accessibility.patch: - - Dropped, package no longer builds gtk3 version - - -- Michael Terry Sun, 11 Dec 2011 12:16:43 -0500 - -vte (1:0.28.2-3) unstable; urgency=low - - * 02_meta.patch: workaround for Meta key being broken since the GTK+ - 2.24.8 upgrade. Closes: #648760. - - -- Josselin Mouette Sat, 19 Nov 2011 14:06:11 +0100 - -vte (1:0.28.2-2) experimental; urgency=low - - * Drop all GTK+3 packages and dependencies. This version will remain - for GTK+2 support until no packages use it anymore. - * Keep gobject-introspection build-dependency for the macro used by - dh_autoreconf. - * Disable glade catalogue and libgladeui requirement. - - -- Josselin Mouette Sat, 12 Nov 2011 15:46:30 +0100 - vte (1:0.28.2-1) unstable; urgency=low * New upstream release. @@ -103,30 +88,6 @@ -- Michael Biebl Wed, 19 Oct 2011 03:41:29 +0200 -vte (1:0.28.2-0ubuntu3) precise; urgency=low - - * debian/patches/gtk32-meta-map.patch: Patch from upstream bugzilla to - deal with the new meta mapping in GTK 3.2.2+ (LP: #890555) - - -- Luke Yelavich Wed, 16 Nov 2011 21:38:44 +1100 - -vte (1:0.28.2-0ubuntu2) oneiric; urgency=low - - * debian/patches/fix_gtk3_accessibility.patch: Slightly backported and - tweaked patch from upstream bug #654630 to fix GTK3 accessibility post - GTK/gail refactor, the original patch plus some suggested tweaks in the - bug was used to preserve GTK2 support, can be dropped once we move to - vte 0.29 - - -- Luke Yelavich Fri, 09 Sep 2011 10:31:22 +1000 - -vte (1:0.28.2-0ubuntu1) oneiric; urgency=low - - * New upstream release. Do not upgrade to 0.29 yet, as this drops GTK2 - support, and we still have a ton of rdepends of libvte9. - - -- Martin Pitt Wed, 07 Sep 2011 10:06:44 +0200 - vte (1:0.28.1-2) unstable; urgency=low * libvte-doc.links: dropped. Closes: #631881. @@ -135,25 +96,6 @@ -- Josselin Mouette Tue, 28 Jun 2011 18:52:26 +0200 -vte (1:0.28.1-1ubuntu2) oneiric; urgency=low - - * Switch to dh_python2. (LP: #788514) - - -- Barry Warsaw Thu, 11 Aug 2011 14:18:14 -0400 - -vte (1:0.28.1-1ubuntu1) oneiric; urgency=low - - * Merge from debian unstable. Remaining changes: - - Add 93_add_alt_screen_scroll_toggle.patch: Handle scrolling differently - when using alternate screen or scrolling is restricted. - - Add lp246701_scroll_region_updates.patch: Bug fix. (LP #246701) - - 91_keep_fds.patch: - vte-2.90 does not yet support G_SPAWN_LEAVE_DESCRIPTORS_OPEN - when calling vte_terminal_fork_command_full() until that is - fixed we need to keep this patch - - -- Michael Vogt Thu, 16 Jun 2011 17:59:49 +0200 - vte (1:0.28.1-1) unstable; urgency=low * Tighten dependencies on libvte-common. @@ -176,36 +118,6 @@ -- Josselin Mouette Sun, 05 Jun 2011 02:06:40 +0200 -vte (1:0.28.0-1ubuntu3) oneiric; urgency=low - - * readd 91_keep_fds.patch for now. gdebi-gtk needs it until - its ported to gtk3/vte3 where the required functionatlity - is exposed via GI - - -- Michael Vogt Wed, 25 May 2011 17:42:27 +0200 - -vte (1:0.28.0-1ubuntu2) oneiric; urgency=low - - * Use DEB_DH_INSTALL_ARGS_$(udeb) rather than - DEB_DH_INSTALL_SOURCEDIR_$(udeb), so that we actually use the udeb build - pass again. - - -- Colin Watson Sat, 21 May 2011 23:14:42 +0100 - -vte (1:0.28.0-1ubuntu1) oneiric; urgency=low - - * Drop gir1.2-vte-0.0. We just have two reverse dependencies which will be - moved to GTK3 and gir1.2-vte-2.90. - * Drop 91_keep_fds.patch. The vte_terminal_forkpty API is deprecated, was - closed upstream as "wontfix". - * Drop lp621927_set_default_term.patch, fixed upstream in a different way. - * Merge with Debian experimental. Remaining Ubuntu changes: - - Add 93_add_alt_screen_scroll_toggle.patch: Handle scrolling differently - when using alternate screen or scrolling is restricted. - - Add lp246701_scroll_region_updates.patch: Bug fix. (LP #246701) - - -- Martin Pitt Tue, 17 May 2011 13:08:32 +0200 - vte (1:0.28.0-1) experimental; urgency=low * Team upload. diff -Nru vte3-0.31.0/debian/control vte3-0.32.0/debian/control --- vte3-0.31.0/debian/control 2012-03-08 09:32:54.000000000 +0000 +++ vte3-0.32.0/debian/control 2012-03-21 12:49:59.000000000 +0000 @@ -10,12 +10,11 @@ XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Debian GNOME Maintainers , Josselin Mouette , Michael Biebl Standards-Version: 3.9.2 -X-Python-Version: >= 2.3 Build-Depends: cdbs (>= 0.4.90), debhelper (>= 8), gnome-pkg-tools (>= 0.10), dh-autoreconf, - libglib2.0-dev (>= 2.26.0), + libglib2.0-dev (>= 2.31.13), libcairo2-dev, libx11-dev, libgtk-3-dev (>= 3.1.9), @@ -38,11 +37,11 @@ libvte-2.90-common (= ${source:Version}) Description: Terminal emulator widget for GTK+ 3.0 - runtime files The VTE library provides a terminal emulator widget VteTerminal for - applications using the GTK+ toolkit. It also provides the VtePTY object - containing functions for starting a new process on a new + applications using the GTK+ toolkit. It also provides the VtePTY object + containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . - This package contains the runtime library, needed by programs using the + This package contains the runtime library, needed by programs using the VTE widget with GTK+ 3.0. Package: libvte-2.90-9-udeb @@ -54,22 +53,23 @@ ${shlibs:Depends} Description: Terminal emulator widget for GTK+ 3.0 - minimal runtime The VTE library provides a terminal emulator widget VteTerminal for - applications using the GTK+ toolkit. It also provides the VtePTY object - containing functions for starting a new process on a new + applications using the GTK+ toolkit. It also provides the VtePTY object + containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . - This package contains the minimal runtime library for GTK+ 3.0 needed + This package contains the minimal runtime library for GTK+ 3.0 needed by the Debian installer. Package: gir1.2-vte-2.90 Architecture: any +Section: introspection Depends: ${gir:Depends}, ${misc:Depends} Description: GObject introspection data for the VTE library This package contains introspection data for VTE, a terminal emulator widget for GTK+. . - It can be used by interpreters understanding the GIRepository format to + It can be used by interpreters understanding the GIRepository format to write programs using the VTE widget for GTK+ 3.0. Package: libvte-2.90-dev @@ -85,30 +85,31 @@ libglib2.0-dev (>= 2.22.0), libvte-2.90-common Recommends: libvte-2.90-doc +Replaces: libvte-2.90-common (<< 1:0.30.1-4) +Breaks: libvte-2.90-common (<< 1:0.30.1-4) Description: Terminal emulator widget for GTK+ 3.0 - development files The VTE library provides a terminal emulator widget VteTerminal for - applications using the GTK+ toolkit. It also provides the VtePTY object - containing functions for starting a new process on a new + applications using the GTK+ toolkit. It also provides the VtePTY object + containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . - This package contains development files for the VTE library and its - Python bindings. It is needed to develop and build programs using the + This package contains development files for the VTE library and its + Python bindings. It is needed to develop and build programs using the VTE widget with GTK+ 3.0. Package: libvte-2.90-common Architecture: all Depends: ${misc:Depends} -Replaces: libvte2 (<= 0.5.1-2), - libvte-common (<< 1:0.28.2-2) +Replaces: libvte-common (<< 1:0.28.2-2) Breaks: libvte9 (<< 1:0.28), libvte-common (<< 1:0.28.2-2) Description: Terminal emulator widget for GTK+ 3.0 - common files The VTE library provides a terminal emulator widget VteTerminal for - applications using the GTK+ toolkit. It also provides the VtePTY object - containing functions for starting a new process on a new + applications using the GTK+ toolkit. It also provides the VtePTY object + containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . - This package contains internationalization files for the VTE library + This package contains internationalization files for the VTE library and common files for the GTK+ 3.x version. Package: libvte-2.90-doc @@ -119,9 +120,9 @@ Breaks: libvte-doc (<< 1:0.28.2-2) Description: Terminal emulator widget for GTK+ 3.0 - documentation The VTE library provides a terminal emulator widget VteTerminal for - applications using the GTK+ toolkit. It also provides the VtePTY object - containing functions for starting a new process on a new + applications using the GTK+ toolkit. It also provides the VtePTY object + containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . - This package contains documentation files for the VTE library for GTK+ + This package contains documentation files for the VTE library for GTK+ 3.x. diff -Nru vte3-0.31.0/debian/control.in vte3-0.32.0/debian/control.in --- vte3-0.31.0/debian/control.in 2012-03-08 09:32:52.000000000 +0000 +++ vte3-0.32.0/debian/control.in 2012-03-21 12:49:57.000000000 +0000 @@ -5,12 +5,11 @@ XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Standards-Version: 3.9.2 -X-Python-Version: >= 2.3 Build-Depends: cdbs (>= 0.4.90), debhelper (>= 8), gnome-pkg-tools (>= 0.10), dh-autoreconf, - libglib2.0-dev (>= 2.26.0), + libglib2.0-dev (>= 2.31.13), libcairo2-dev, libx11-dev, libgtk-3-dev (>= 3.1.9), @@ -33,11 +32,11 @@ libvte-2.90-common (= ${source:Version}) Description: Terminal emulator widget for GTK+ 3.0 - runtime files The VTE library provides a terminal emulator widget VteTerminal for - applications using the GTK+ toolkit. It also provides the VtePTY object - containing functions for starting a new process on a new + applications using the GTK+ toolkit. It also provides the VtePTY object + containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . - This package contains the runtime library, needed by programs using the + This package contains the runtime library, needed by programs using the VTE widget with GTK+ 3.0. Package: libvte-2.90-9-udeb @@ -49,22 +48,23 @@ ${shlibs:Depends} Description: Terminal emulator widget for GTK+ 3.0 - minimal runtime The VTE library provides a terminal emulator widget VteTerminal for - applications using the GTK+ toolkit. It also provides the VtePTY object - containing functions for starting a new process on a new + applications using the GTK+ toolkit. It also provides the VtePTY object + containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . - This package contains the minimal runtime library for GTK+ 3.0 needed + This package contains the minimal runtime library for GTK+ 3.0 needed by the Debian installer. Package: gir1.2-vte-2.90 Architecture: any +Section: introspection Depends: ${gir:Depends}, ${misc:Depends} Description: GObject introspection data for the VTE library This package contains introspection data for VTE, a terminal emulator widget for GTK+. . - It can be used by interpreters understanding the GIRepository format to + It can be used by interpreters understanding the GIRepository format to write programs using the VTE widget for GTK+ 3.0. Package: libvte-2.90-dev @@ -80,30 +80,31 @@ libglib2.0-dev (>= 2.22.0), libvte-2.90-common Recommends: libvte-2.90-doc +Replaces: libvte-2.90-common (<< 1:0.30.1-4) +Breaks: libvte-2.90-common (<< 1:0.30.1-4) Description: Terminal emulator widget for GTK+ 3.0 - development files The VTE library provides a terminal emulator widget VteTerminal for - applications using the GTK+ toolkit. It also provides the VtePTY object - containing functions for starting a new process on a new + applications using the GTK+ toolkit. It also provides the VtePTY object + containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . - This package contains development files for the VTE library and its - Python bindings. It is needed to develop and build programs using the + This package contains development files for the VTE library and its + Python bindings. It is needed to develop and build programs using the VTE widget with GTK+ 3.0. Package: libvte-2.90-common Architecture: all Depends: ${misc:Depends} -Replaces: libvte2 (<= 0.5.1-2), - libvte-common (<< 1:0.28.2-2) +Replaces: libvte-common (<< 1:0.28.2-2) Breaks: libvte9 (<< 1:0.28), libvte-common (<< 1:0.28.2-2) Description: Terminal emulator widget for GTK+ 3.0 - common files The VTE library provides a terminal emulator widget VteTerminal for - applications using the GTK+ toolkit. It also provides the VtePTY object - containing functions for starting a new process on a new + applications using the GTK+ toolkit. It also provides the VtePTY object + containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . - This package contains internationalization files for the VTE library + This package contains internationalization files for the VTE library and common files for the GTK+ 3.x version. Package: libvte-2.90-doc @@ -114,9 +115,9 @@ Breaks: libvte-doc (<< 1:0.28.2-2) Description: Terminal emulator widget for GTK+ 3.0 - documentation The VTE library provides a terminal emulator widget VteTerminal for - applications using the GTK+ toolkit. It also provides the VtePTY object - containing functions for starting a new process on a new + applications using the GTK+ toolkit. It also provides the VtePTY object + containing functions for starting a new process on a new pseudo-terminal and for manipulating pseudo-terminals. . - This package contains documentation files for the VTE library for GTK+ + This package contains documentation files for the VTE library for GTK+ 3.x. diff -Nru vte3-0.31.0/debian/libvte-2.90-9.install vte3-0.32.0/debian/libvte-2.90-9.install --- vte3-0.31.0/debian/libvte-2.90-9.install 2012-03-08 09:32:52.000000000 +0000 +++ vte3-0.32.0/debian/libvte-2.90-9.install 2012-03-21 12:49:57.000000000 +0000 @@ -1,2 +1,2 @@ usr/lib/libvte2_90.so.* -usr/lib/libvte2-90 +usr/lib/libvte-2.90-9 diff -Nru vte3-0.31.0/debian/libvte-2.90-9.lintian-overrides vte3-0.32.0/debian/libvte-2.90-9.lintian-overrides --- vte3-0.31.0/debian/libvte-2.90-9.lintian-overrides 2012-03-08 09:32:52.000000000 +0000 +++ vte3-0.32.0/debian/libvte-2.90-9.lintian-overrides 2012-03-21 12:49:57.000000000 +0000 @@ -1,5 +1,5 @@ # Setgid on purpose to write the utmp file -libvte-2.90-9: setgid-binary usr/lib/libvte2-90/gnome-pty-helper 2755 root/utmp +libvte-2.90-9: setgid-binary usr/lib/libvte-2.90-9/gnome-pty-helper 2755 root/utmp # Not a big deal, and not worth fixing. libvte-2.90-9: package-name-doesnt-match-sonames libvte2-90-9 diff -Nru vte3-0.31.0/debian/libvte-2.90-9.symbols vte3-0.32.0/debian/libvte-2.90-9.symbols --- vte3-0.31.0/debian/libvte-2.90-9.symbols 2012-03-08 09:32:52.000000000 +0000 +++ vte3-0.32.0/debian/libvte-2.90-9.symbols 2012-03-21 12:49:57.000000000 +0000 @@ -134,6 +134,7 @@ vte_terminal_watch_child@Base 1:0.27.2 vte_terminal_write_contents@Base 1:0.27.2 vte_terminal_write_flags_get_type@Base 1:0.27.2 + vte_get_resource@Base 1:0.32.0 vte_get_user_shell@Base 1:0.27.90 vte_terminal_set_color_background_rgba@Base 1:0.27.90 vte_terminal_set_color_bold_rgba@Base 1:0.27.90 diff -Nru vte3-0.31.0/debian/libvte-2.90-9-udeb.install vte3-0.32.0/debian/libvte-2.90-9-udeb.install --- vte3-0.31.0/debian/libvte-2.90-9-udeb.install 2012-03-08 09:32:52.000000000 +0000 +++ vte3-0.32.0/debian/libvte-2.90-9-udeb.install 2012-03-21 12:49:57.000000000 +0000 @@ -1,2 +1 @@ usr/lib/libvte*.so.* -usr/share/vte/termcap-* diff -Nru vte3-0.31.0/debian/libvte-2.90-common.install vte3-0.32.0/debian/libvte-2.90-common.install --- vte3-0.31.0/debian/libvte-2.90-common.install 2012-03-08 09:32:52.000000000 +0000 +++ vte3-0.32.0/debian/libvte-2.90-common.install 2012-03-21 12:49:57.000000000 +0000 @@ -1,3 +1 @@ usr/share/locale -usr/share/glade -usr/share/vte/termcap-2.90 diff -Nru vte3-0.31.0/debian/libvte-2.90-dev.install vte3-0.32.0/debian/libvte-2.90-dev.install --- vte3-0.31.0/debian/libvte-2.90-dev.install 2012-03-08 09:32:52.000000000 +0000 +++ vte3-0.32.0/debian/libvte-2.90-dev.install 2012-03-21 12:49:57.000000000 +0000 @@ -3,3 +3,4 @@ usr/lib/libvte2_90.a usr/lib/libvte2_90.so usr/share/gir-1.0 +usr/share/glade diff -Nru vte3-0.31.0/debian/patches/03_scroll_region_updates.patch vte3-0.32.0/debian/patches/03_scroll_region_updates.patch --- vte3-0.31.0/debian/patches/03_scroll_region_updates.patch 1970-01-01 00:00:00.000000000 +0000 +++ vte3-0.32.0/debian/patches/03_scroll_region_updates.patch 2012-03-21 12:49:57.000000000 +0000 @@ -0,0 +1,71 @@ +Description: Fix glitches with interspersing writes to the bottom line with scrolls of the upper region. +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=542087 +Bug-Ubuntu: https://launchpad.net/bugs/246701 + +Index: vte3-exp/src/vte.c +=================================================================== +--- vte3-exp.orig/src/vte.c 2012-03-21 10:44:08.880471453 +0100 ++++ vte3-exp/src/vte.c 2012-03-21 10:44:10.668471539 +0100 +@@ -4066,6 +4066,7 @@ + long wcount, start, delta; + gboolean leftovers, modified, bottom, again; + gboolean invalidated_text; ++ gboolean in_scroll_region; + GArray *unichars; + struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL; + +@@ -4085,6 +4086,10 @@ + cursor = screen->cursor_current; + cursor_visible = terminal->pvt->cursor_visible; + ++ in_scroll_region = screen->scrolling_restricted ++ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) ++ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); ++ + /* We should only be called when there's data to process. */ + g_assert(terminal->pvt->incoming || + (terminal->pvt->pending->len > 0)); +@@ -4183,6 +4188,8 @@ + * points to the first character which isn't part of this + * sequence. */ + if ((match != NULL) && (match[0] != '\0')) { ++ gboolean new_in_scroll_region; ++ + /* Call the right sequence handler for the requested + * behavior. */ + _vte_terminal_handle_sequence(terminal, +@@ -4193,12 +4200,20 @@ + start = (next - wbuf); + modified = TRUE; + +- /* if we have moved during the sequence handler, restart the bbox */ ++ new_in_scroll_region = screen->scrolling_restricted ++ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) ++ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); ++ ++ delta = screen->scroll_delta; /* delta may have changed from sequence. */ ++ ++ /* if we have moved greatly during the sequence handler, or moved into a scroll_region ++ * from outside it, restart the bbox */ + if (invalidated_text && +- (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || +- screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || +- screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || +- screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) { ++ ((new_in_scroll_region && !in_scroll_region) || ++ (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || ++ screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || ++ screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || ++ screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) { + /* Clip off any part of the box which isn't already on-screen. */ + bbox_topleft.x = MAX(bbox_topleft.x, 0); + bbox_topleft.y = MAX(bbox_topleft.y, delta); +@@ -4218,6 +4233,8 @@ + bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT; + bbox_topleft.x = bbox_topleft.y = G_MAXINT; + } ++ ++ in_scroll_region = new_in_scroll_region; + } else + /* Second, we have a NULL match, and next points to the very + * next character in the buffer. Insert the character which diff -Nru vte3-0.31.0/debian/patches/03_set_scroll_mask.patch vte3-0.32.0/debian/patches/03_set_scroll_mask.patch --- vte3-0.31.0/debian/patches/03_set_scroll_mask.patch 2012-03-08 09:32:52.000000000 +0000 +++ vte3-0.32.0/debian/patches/03_set_scroll_mask.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From fe90b0ece0146bb96c73134843356020a555c09e Mon Sep 17 00:00:00 2001 -From: Gert Michael Kulyk -Date: Sun, 4 Mar 2012 13:03:53 +0100 -Subject: [PATCH] Explicitly set GDK_SCROLL_MASK as recent gtk+ versions - require it for scrolling to work - ---- - src/vte.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/src/vte.c b/src/vte.c -index 9f74405..7fd6ed7 100644 ---- a/src/vte.c -+++ b/src/vte.c -@@ -9065,6 +9065,7 @@ vte_terminal_realize(GtkWidget *widget) - GDK_EXPOSURE_MASK | - GDK_VISIBILITY_NOTIFY_MASK | - GDK_FOCUS_CHANGE_MASK | -+ GDK_SCROLL_MASK | - GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK | --- -1.7.9.1 - diff -Nru vte3-0.31.0/debian/patches/04_workaround_resources_compiler_path.patch vte3-0.32.0/debian/patches/04_workaround_resources_compiler_path.patch --- vte3-0.31.0/debian/patches/04_workaround_resources_compiler_path.patch 1970-01-01 00:00:00.000000000 +0000 +++ vte3-0.32.0/debian/patches/04_workaround_resources_compiler_path.patch 2012-03-21 12:49:57.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Drop --sourcedir from glib-compile-resources call. It is not necessary here, and breaks out-of-tree builds with absolute configure paths, such as cdbs does. +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=672541 + +Index: vte3-exp/src/Makefile.am +=================================================================== +--- vte3-exp.orig/src/Makefile.am 2012-03-10 16:55:12.000000000 +0100 ++++ vte3-exp/src/Makefile.am 2012-03-21 13:01:21.900076144 +0100 +@@ -152,7 +152,7 @@ + mv -f $@.tmp $@ + + vteresources.c: vte.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies vte.gresource.xml) +- $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir . --generate --c-name vte $< ++ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target $@ --generate --c-name vte $< + + # vte the application + diff -Nru vte3-0.31.0/debian/patches/25_optional-ncurses.patch vte3-0.32.0/debian/patches/25_optional-ncurses.patch --- vte3-0.31.0/debian/patches/25_optional-ncurses.patch 2012-03-08 09:32:52.000000000 +0000 +++ vte3-0.32.0/debian/patches/25_optional-ncurses.patch 2012-03-21 12:49:57.000000000 +0000 @@ -1,10 +1,10 @@ -Index: vte-0.28.2/configure.in +Index: vte3-exp/configure.in =================================================================== ---- vte-0.28.2.orig/configure.in 2011-08-28 23:32:53.000000000 +0200 -+++ vte-0.28.2/configure.in 2011-10-19 03:44:01.248817625 +0200 -@@ -368,45 +368,52 @@ +--- vte3-exp.orig/configure.in 2012-03-19 18:25:08.000000000 +0100 ++++ vte3-exp/configure.in 2012-03-21 10:37:43.492452800 +0100 +@@ -242,45 +242,52 @@ AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"])) - AC_CHECK_FUNCS([ceil floor]) + AC_CHECK_FUNCS([ceil floor round]) -# Look for tgetent +AC_ARG_WITH(ncurses, @@ -93,10 +93,10 @@ # Search for the required modules. -Index: vte-0.28.2/src/keymap.c +Index: vte3-exp/src/keymap.c =================================================================== ---- vte-0.28.2.orig/src/keymap.c 2011-08-16 23:52:48.000000000 +0200 -+++ vte-0.28.2/src/keymap.c 2011-10-19 03:44:01.252817574 +0200 +--- vte3-exp.orig/src/keymap.c 2012-03-21 10:36:34.256449449 +0100 ++++ vte3-exp/src/keymap.c 2012-03-21 10:37:43.492452800 +0100 @@ -50,7 +50,7 @@ #include #define VTE_TERMCAP_NAME "termcap" @@ -106,7 +106,7 @@ #endif #ifdef VTE_DEBUG -@@ -1014,8 +1014,10 @@ +@@ -1025,8 +1025,10 @@ enum _vte_fkey_mode fkey_mode; char *cap, *tmp; const char *termcap_special = NULL; @@ -117,7 +117,7 @@ g_return_if_fail(normal != NULL); g_return_if_fail(normal_length != NULL); -@@ -1169,6 +1171,7 @@ +@@ -1180,6 +1182,7 @@ } } } @@ -125,7 +125,7 @@ if (termcap_special != NULL) { tmp = g_strdup(terminal); cap = NULL; -@@ -1209,6 +1212,7 @@ +@@ -1220,6 +1223,7 @@ return; } } @@ -133,10 +133,10 @@ _vte_debug_print(VTE_DEBUG_KEYBOARD, " (ignoring, no match for modifier state).\n"); -Index: vte-0.28.2/src/ssfe.c +Index: vte3-exp/src/ssfe.c =================================================================== ---- vte-0.28.2.orig/src/ssfe.c 2011-06-19 22:59:30.000000000 +0200 -+++ vte-0.28.2/src/ssfe.c 2011-10-19 03:44:01.256817523 +0200 +--- vte3-exp.orig/src/ssfe.c 2011-06-19 22:59:30.000000000 +0200 ++++ vte3-exp/src/ssfe.c 2012-03-21 10:37:43.496452800 +0100 @@ -38,7 +38,7 @@ #include #define VTE_TERMCAP_NAME "termcap" diff -Nru vte3-0.31.0/debian/patches/lp246701_scroll_region_updates.patch vte3-0.32.0/debian/patches/lp246701_scroll_region_updates.patch --- vte3-0.31.0/debian/patches/lp246701_scroll_region_updates.patch 2012-03-08 09:32:52.000000000 +0000 +++ vte3-0.32.0/debian/patches/lp246701_scroll_region_updates.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -Index: vte-0.28.0/src/vte.c -=================================================================== ---- vte-0.28.0.orig/src/vte.c 2011-05-17 12:18:16.676757671 +0200 -+++ vte-0.28.0/src/vte.c 2011-05-17 12:18:22.586757675 +0200 -@@ -4057,6 +4057,7 @@ - long wcount, start, delta; - gboolean leftovers, modified, bottom, again; - gboolean invalidated_text; -+ gboolean in_scroll_region; - GArray *unichars; - struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL; - -@@ -4076,6 +4077,10 @@ - cursor = screen->cursor_current; - cursor_visible = terminal->pvt->cursor_visible; - -+ in_scroll_region = screen->scrolling_restricted -+ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) -+ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); -+ - /* We should only be called when there's data to process. */ - g_assert(terminal->pvt->incoming || - (terminal->pvt->pending->len > 0)); -@@ -4174,6 +4179,8 @@ - * points to the first character which isn't part of this - * sequence. */ - if ((match != NULL) && (match[0] != '\0')) { -+ gboolean new_in_scroll_region; -+ - /* Call the right sequence handler for the requested - * behavior. */ - _vte_terminal_handle_sequence(terminal, -@@ -4184,12 +4191,20 @@ - start = (next - wbuf); - modified = TRUE; - -- /* if we have moved during the sequence handler, restart the bbox */ -+ new_in_scroll_region = screen->scrolling_restricted -+ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) -+ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); -+ -+ delta = screen->scroll_delta; /* delta may have changed from sequence. */ -+ -+ /* if we have moved greatly during the sequence handler, or moved into a scroll_region -+ * from outside it, restart the bbox */ - if (invalidated_text && -- (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || -- screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || -- screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || -- screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) { -+ ((new_in_scroll_region && !in_scroll_region) || -+ (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || -+ screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || -+ screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || -+ screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) { - /* Clip off any part of the box which isn't already on-screen. */ - bbox_topleft.x = MAX(bbox_topleft.x, 0); - bbox_topleft.y = MAX(bbox_topleft.y, delta); -@@ -4209,6 +4224,8 @@ - bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT; - bbox_topleft.x = bbox_topleft.y = G_MAXINT; - } -+ -+ in_scroll_region = new_in_scroll_region; - } else - /* Second, we have a NULL match, and next points to the very - * next character in the buffer. Insert the character which diff -Nru vte3-0.31.0/debian/patches/series vte3-0.32.0/debian/patches/series --- vte3-0.31.0/debian/patches/series 2012-03-08 09:32:52.000000000 +0000 +++ vte3-0.32.0/debian/patches/series 2012-03-21 12:49:57.000000000 +0000 @@ -1,8 +1,8 @@ 01_scroll_notebook.patch 02_meta.patch -03_set_scroll_mask.patch +03_scroll_region_updates.patch +04_workaround_resources_compiler_path.patch 25_optional-ncurses.patch 60_termcap-home-end.patch 91_keep_fds.patch 93_add_alt_screen_scroll_toggle.patch -lp246701_scroll_region_updates.patch diff -Nru vte3-0.31.0/debian/rules vte3-0.32.0/debian/rules --- vte3-0.31.0/debian/rules 2012-03-08 09:32:52.000000000 +0000 +++ vte3-0.32.0/debian/rules 2012-03-21 12:49:57.000000000 +0000 @@ -14,12 +14,13 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk +DEB_CONFIGURE_LIBEXECDIR := \$${prefix}/lib/$(libvte3N) DEB_FIXPERMS_EXCLUDE += gnome-pty-helper DEB_DH_MAKESHLIBS_ARGS_$(libvte3N) += -V '$(libvte3N) (>= 1:0.27.90)' --add-udeb=$(udeb) -- -c4 DEB_CONFIGURE_FLAGS_main += \ - --libexecdir=/usr/lib/libvte2-90 \ --enable-glade-catalogue \ + --enable-gtk-doc \ --enable-introspection DEB_CONFIGURE_FLAGS_udeb += \ diff -Nru vte3-0.31.0/doc/Makefile.in vte3-0.32.0/doc/Makefile.in --- vte3-0.31.0/doc/Makefile.in 2011-11-21 13:48:18.000000000 +0000 +++ vte3-0.32.0/doc/Makefile.in 2012-03-19 17:25:20.000000000 +0000 @@ -96,7 +96,10 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ +AM_CPPFLAGS = @AM_CPPFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_LDFLAGS = @AM_LDFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -127,6 +130,7 @@ GLADE_ICON_DIR = @GLADE_ICON_DIR@ GLADE_MODULE_DIR = @GLADE_MODULE_DIR@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -135,6 +139,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_API_VERSION = @GTK_API_VERSION@ @@ -213,7 +219,6 @@ VTE_API_VERSION = @VTE_API_VERSION@ VTE_API_VERSION_U = @VTE_API_VERSION_U@ VTE_CFLAGS = @VTE_CFLAGS@ -VTE_DEFAULT_EMULATION = @VTE_DEFAULT_EMULATION@ VTE_LDFLAGS = @VTE_LDFLAGS@ VTE_LIBRARY_SUFFIX_U = @VTE_LIBRARY_SUFFIX_U@ VTE_LIBS = @VTE_LIBS@ diff -Nru vte3-0.31.0/doc/openi18n/Makefile.in vte3-0.32.0/doc/openi18n/Makefile.in --- vte3-0.31.0/doc/openi18n/Makefile.in 2011-11-21 13:48:19.000000000 +0000 +++ vte3-0.32.0/doc/openi18n/Makefile.in 2012-03-19 17:25:20.000000000 +0000 @@ -87,7 +87,10 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ +AM_CPPFLAGS = @AM_CPPFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_LDFLAGS = @AM_LDFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -118,6 +121,7 @@ GLADE_ICON_DIR = @GLADE_ICON_DIR@ GLADE_MODULE_DIR = @GLADE_MODULE_DIR@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -126,6 +130,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_API_VERSION = @GTK_API_VERSION@ @@ -204,7 +210,6 @@ VTE_API_VERSION = @VTE_API_VERSION@ VTE_API_VERSION_U = @VTE_API_VERSION_U@ VTE_CFLAGS = @VTE_CFLAGS@ -VTE_DEFAULT_EMULATION = @VTE_DEFAULT_EMULATION@ VTE_LDFLAGS = @VTE_LDFLAGS@ VTE_LIBRARY_SUFFIX_U = @VTE_LIBRARY_SUFFIX_U@ VTE_LIBS = @VTE_LIBS@ diff -Nru vte3-0.31.0/doc/reference/html/annotation-glossary.html vte3-0.32.0/doc/reference/html/annotation-glossary.html --- vte3-0.31.0/doc/reference/html/annotation-glossary.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/annotation-glossary.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -25,14 +25,14 @@  |  A  |  + C +  |  T  |  A  |  E  |  - T -  |  S  |  T @@ -49,6 +49,10 @@
allow-none

NULL is ok, both for passing and for returning.

+

C

+
+closure
+

This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.

T

transfer none
@@ -61,21 +65,20 @@
element-type

Generics and defining elements of containers and arrays.

-

T

-
-transfer full
-

Free data after the code is done.

S

scope call

The callback is valid only during the call to the method.

T

+transfer full
+

Free data after the code is done.

+
type
-

Override the parsed C type with given type

+

Override the parsed C type with given type.

- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/api-index-0-20.html vte3-0.32.0/doc/reference/html/api-index-0-20.html --- vte3-0.31.0/doc/reference/html/api-index-0-20.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/api-index-0-20.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -137,6 +137,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/api-index-0-24.html vte3-0.32.0/doc/reference/html/api-index-0-24.html --- vte3-0.31.0/doc/reference/html/api-index-0-24.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/api-index-0-24.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -37,6 +37,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/api-index-0-26.html vte3-0.32.0/doc/reference/html/api-index-0-26.html --- vte3-0.31.0/doc/reference/html/api-index-0-26.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/api-index-0-26.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -47,11 +47,11 @@
-VtePtyError, enum in Vte PTY +VtePtyError, enum in Vte PTY
-VtePtyFlags, enum in Vte PTY +VtePtyFlags, enum in Vte PTY
@@ -134,6 +134,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/api-index-0-28.html vte3-0.32.0/doc/reference/html/api-index-0-28.html --- vte3-0.31.0/doc/reference/html/api-index-0-28.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/api-index-0-28.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -62,6 +62,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/api-index-deprecated.html vte3-0.32.0/doc/reference/html/api-index-deprecated.html --- vte3-0.31.0/doc/reference/html/api-index-deprecated.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/api-index-deprecated.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -48,7 +48,7 @@
-VteTerminalAntiAlias, enum in VteTerminal +VteTerminalAntiAlias, enum in VteTerminal
@@ -106,6 +106,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/api-index-full.html vte3-0.32.0/doc/reference/html/api-index-full.html --- vte3-0.31.0/doc/reference/html/api-index-full.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/api-index-full.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -80,11 +80,11 @@
-VtePtyError, enum in Vte PTY +VtePtyError, enum in Vte PTY
-VtePtyFlags, enum in Vte PTY +VtePtyFlags, enum in Vte PTY
@@ -147,7 +147,7 @@

T

-VteTerminal, struct in VteTerminal +VteTerminal, struct in VteTerminal
@@ -379,27 +379,27 @@
-VteTerminalAccessible, struct in VteTerminalAccessible +VteTerminalAccessible, struct in VteTerminalAccessible
-VteTerminalAntiAlias, enum in VteTerminal +VteTerminalAntiAlias, enum in VteTerminal
-VteTerminalCursorBlinkMode, enum in VteTerminal +VteTerminalCursorBlinkMode, enum in VteTerminal
-VteTerminalCursorShape, enum in VteTerminal +VteTerminalCursorShape, enum in VteTerminal
-VteTerminalEraseBinding, enum in VteTerminal +VteTerminalEraseBinding, enum in VteTerminal
-VteTerminalWriteFlags, enum in VteTerminal +VteTerminalWriteFlags, enum in VteTerminal
@@ -837,6 +837,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/ch01.html vte3-0.32.0/doc/reference/html/ch01.html --- vte3-0.31.0/doc/reference/html/ch01.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/ch01.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/ch02.html vte3-0.32.0/doc/reference/html/ch02.html --- vte3-0.31.0/doc/reference/html/ch02.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/ch02.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -28,6 +28,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/ch03.html vte3-0.32.0/doc/reference/html/ch03.html --- vte3-0.31.0/doc/reference/html/ch03.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/ch03.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/deprecated-objects.html vte3-0.32.0/doc/reference/html/deprecated-objects.html --- vte3-0.31.0/doc/reference/html/deprecated-objects.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/deprecated-objects.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -29,6 +29,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/index.html vte3-0.32.0/doc/reference/html/index.html --- vte3-0.31.0/doc/reference/html/index.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/index.html 2012-03-19 17:27:00.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -15,14 +15,14 @@

- Documentation for VTE version 0.31.0 + Documentation for VTE version 0.32.0 . The latest version of this documentation can be found on-line at the GNOME Library.

Copyright © 2009, 2010 Christian Persch

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Lesser General Public Licence, Version 2.1 or (at your option) any later version published by the Free Software Foundation. @@ -84,6 +84,6 @@

- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/index.sgml vte3-0.32.0/doc/reference/html/index.sgml --- vte3-0.31.0/doc/reference/html/index.sgml 2011-11-21 13:50:18.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/index.sgml 2012-03-19 17:27:00.000000000 +0000 @@ -1,6 +1,11 @@ + + + + + @@ -9,25 +14,25 @@ - + - + - + - + - + @@ -200,20 +205,22 @@ + + - + - + @@ -259,9 +266,10 @@ + - + diff -Nru vte3-0.31.0/doc/reference/html/internal-objects.html vte3-0.32.0/doc/reference/html/internal-objects.html --- vte3-0.31.0/doc/reference/html/internal-objects.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/internal-objects.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -28,6 +28,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/licence.html vte3-0.32.0/doc/reference/html/licence.html --- vte3-0.31.0/doc/reference/html/licence.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/licence.html 2012-03-19 17:27:00.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -52,6 +52,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/object-hierarchy.html vte3-0.32.0/doc/reference/html/object-hierarchy.html --- vte3-0.31.0/doc/reference/html/object-hierarchy.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/object-hierarchy.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -32,10 +32,19 @@ AtkObject GtkAccessible VteTerminalAccessible + GEnum + VtePtyError + VteTerminalAntiAlias + VteTerminalCursorBlinkMode + VteTerminalCursorShape + VteTerminalEraseBinding + VteTerminalWriteFlags + GFlags + VtePtyFlags
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/pt01.html vte3-0.32.0/doc/reference/html/pt01.html --- vte3-0.31.0/doc/reference/html/pt01.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/pt01.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -21,7 +21,7 @@

-Part I. API Reference

+Part I. API Reference

Table of Contents

@@ -52,6 +52,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/style.css vte3-0.32.0/doc/reference/html/style.css --- vte3-0.31.0/doc/reference/html/style.css 2011-11-21 13:50:18.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/style.css 2012-03-19 17:27:00.000000000 +0000 @@ -32,8 +32,9 @@ /* this is needed so that the local anchors are displayed below the naviagtion */ div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name] { + display: inline-block; position: relative; - padding-top:4.5em; + top:-5em; } /* this seems to be a bug in the xsl style sheets when generating indexes */ div.index div.index diff -Nru vte3-0.31.0/doc/reference/html/vte.devhelp vte3-0.32.0/doc/reference/html/vte.devhelp --- vte3-0.31.0/doc/reference/html/vte.devhelp 2011-11-21 13:50:18.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/vte.devhelp 1970-01-01 00:00:00.000000000 +0000 @@ -1,231 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru vte3-0.31.0/doc/reference/html/vte.devhelp2 vte3-0.32.0/doc/reference/html/vte.devhelp2 --- vte3-0.31.0/doc/reference/html/vte.devhelp2 2011-11-21 13:50:18.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/vte.devhelp2 2012-03-19 17:27:00.000000000 +0000 @@ -30,12 +30,12 @@ - - - - - - + + + + + + @@ -202,8 +202,8 @@ - - + + @@ -221,7 +221,7 @@ - + diff -Nru vte3-0.31.0/doc/reference/html/VteReaper.html vte3-0.32.0/doc/reference/html/VteReaper.html --- vte3-0.31.0/doc/reference/html/VteReaper.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/VteReaper.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -104,15 +104,12 @@

pid :

-the ID of a child process which will be monitored - +the ID of a child process which will be monitored

Returns :

- the new source ID - -Since 0.11.11 - +the new source ID +Since 0.11.11 @@ -133,8 +130,7 @@

Returns :

- the global VteReaper object, which should not be unreffed. - +the global VteReaper object, which should not be unreffed. @@ -156,13 +152,11 @@

vtereaper :

-the object which received the signal - +the object which received the signal

arg1 :

-the process ID of the exited child - +the process ID of the exited child

arg2 :

@@ -181,6 +175,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1 \ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/VteTerminalAccessible.html vte3-0.32.0/doc/reference/html/VteTerminalAccessible.html --- vte3-0.31.0/doc/reference/html/VteTerminalAccessible.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/VteTerminalAccessible.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,7 +41,7 @@

Synopsis

-
                    VteTerminalAccessible;
+
struct              VteTerminalAccessible;
 AtkObject *         vte_terminal_accessible_new         (VteTerminal *terminal);
@@ -70,8 +70,8 @@

Details

-

VteTerminalAccessible

-
typedef struct _VteTerminalAccessible VteTerminalAccessible;
+

struct VteTerminalAccessible

+
struct VteTerminalAccessible;

The accessible peer for VteTerminal.

@@ -93,7 +93,7 @@

Returns :

- the new AtkObject +the new AtkObject @@ -103,6 +103,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/VteTerminal.html vte3-0.32.0/doc/reference/html/VteTerminal.html --- vte3-0.31.0/doc/reference/html/VteTerminal.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/VteTerminal.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -47,12 +47,12 @@

Synopsis

-
                    VteTerminal;
-enum                VteTerminalAntiAlias;
-enum                VteTerminalCursorBlinkMode;
-enum                VteTerminalCursorShape;
-enum                VteTerminalEraseBinding;
-enum                VteTerminalWriteFlags;
+
struct              VteTerminal;
+enum                VteTerminalAntiAlias;
+enum                VteTerminalCursorBlinkMode;
+enum                VteTerminalCursorShape;
+enum                VteTerminalEraseBinding;
+enum                VteTerminalWriteFlags;
 gboolean            (*VteSelectionFunc)                 (VteTerminal *terminal,
                                                          glong column,
                                                          glong row,
@@ -150,14 +150,14 @@
 void                vte_terminal_set_scroll_background  (VteTerminal *terminal,
                                                          gboolean scroll);
 void                vte_terminal_set_cursor_shape       (VteTerminal *terminal,
-                                                         VteTerminalCursorShape shape);
-VteTerminalCursorShape  vte_terminal_get_cursor_shape   (VteTerminal *terminal);
+                                                         VteTerminalCursorShape shape);
+VteTerminalCursorShape vte_terminal_get_cursor_shape    (VteTerminal *terminal);
 void                vte_terminal_set_cursor_blinks      (VteTerminal *terminal,
                                                          gboolean blink);
-VteTerminalCursorBlinkMode  vte_terminal_get_cursor_blink_mode
+VteTerminalCursorBlinkMode vte_terminal_get_cursor_blink_mode
                                                         (VteTerminal *terminal);
 void                vte_terminal_set_cursor_blink_mode  (VteTerminal *terminal,
-                                                         VteTerminalCursorBlinkMode mode);
+                                                         VteTerminalCursorBlinkMode mode);
 void                vte_terminal_set_scrollback_lines   (VteTerminal *terminal,
                                                          glong lines);
 void                vte_terminal_set_font               (VteTerminal *terminal,
@@ -167,10 +167,10 @@
 void                vte_terminal_set_font_from_string_full
                                                         (VteTerminal *terminal,
                                                          const char *name,
-                                                         VteTerminalAntiAlias antialias);
+                                                         VteTerminalAntiAlias antialias);
 void                vte_terminal_set_font_full          (VteTerminal *terminal,
                                                          const PangoFontDescription *font_desc,
-                                                         VteTerminalAntiAlias antialias);
+                                                         VteTerminalAntiAlias antialias);
 const PangoFontDescription * vte_terminal_get_font      (VteTerminal *terminal);
 gboolean            vte_terminal_get_using_xft          (VteTerminal *terminal);
 gboolean            vte_terminal_get_has_selection      (VteTerminal *terminal);
@@ -179,9 +179,9 @@
 gboolean            vte_terminal_is_word_char           (VteTerminal *terminal,
                                                          gunichar c);
 void                vte_terminal_set_backspace_binding  (VteTerminal *terminal,
-                                                         VteTerminalEraseBinding binding);
+                                                         VteTerminalEraseBinding binding);
 void                vte_terminal_set_delete_binding     (VteTerminal *terminal,
-                                                         VteTerminalEraseBinding binding);
+                                                         VteTerminalEraseBinding binding);
 void                vte_terminal_set_mouse_autohide     (VteTerminal *terminal,
                                                          gboolean setting);
 gboolean            vte_terminal_get_mouse_autohide     (VteTerminal *terminal);
@@ -242,7 +242,7 @@
                                                          int *ypad);
 gboolean            vte_terminal_write_contents         (VteTerminal *terminal,
                                                          GOutputStream *stream,
-                                                         VteTerminalWriteFlags flags,
+                                                         VteTerminalWriteFlags flags,
                                                          GCancellable *cancellable,
                                                          GError **error);
 gboolean            vte_terminal_search_find_next       (VteTerminal *terminal);
@@ -265,7 +265,7 @@
                                                          gboolean utmp,
                                                          gboolean wtmp);
 gboolean            vte_terminal_fork_command_full      (VteTerminal *terminal,
-                                                         VtePtyFlags pty_flags,
+                                                         VtePtyFlags pty_flags,
                                                          const char *working_directory,
                                                          char **argv,
                                                          char **envv,
@@ -283,7 +283,7 @@
 int                 vte_terminal_get_pty                (VteTerminal *terminal);
 VtePty *            vte_terminal_get_pty_object         (VteTerminal *terminal);
 VtePty *            vte_terminal_pty_new                (VteTerminal *terminal,
-                                                         VtePtyFlags flags,
+                                                         VtePtyFlags flags,
                                                          GError **error);
 void                vte_terminal_set_pty                (VteTerminal *terminal,
                                                          int pty_master);
@@ -312,6 +312,26 @@
          +----GtkWidget
                +----VteTerminal
 

+
+  GEnum
+   +----VteTerminalAntiAlias
+

+
+  GEnum
+   +----VteTerminalCursorBlinkMode
+

+
+  GEnum
+   +----VteTerminalCursorShape
+

+
+  GEnum
+   +----VteTerminalEraseBinding
+

+
+  GEnum
+   +----VteTerminalWriteFlags
+

Implemented Interfaces

@@ -330,10 +350,10 @@ "background-saturation" gdouble : Read / Write "background-tint-color" GdkColor* : Read / Write "background-transparent" gboolean : Read / Write - "backspace-binding" VteTerminalEraseBinding : Read / Write - "cursor-blink-mode" VteTerminalCursorBlinkMode : Read / Write - "cursor-shape" VteTerminalCursorShape : Read / Write - "delete-binding" VteTerminalEraseBinding : Read / Write + "backspace-binding" VteTerminalEraseBinding : Read / Write + "cursor-blink-mode" VteTerminalCursorBlinkMode : Read / Write + "cursor-shape" VteTerminalCursorShape : Read / Write + "delete-binding" VteTerminalEraseBinding : Read / Write "emulation" gchar* : Read / Write "encoding" gchar* : Read / Write "font-desc" PangoFontDescription* : Read / Write @@ -400,15 +420,15 @@

Details

-

VteTerminal

-
typedef struct _VteTerminal VteTerminal;
+

struct VteTerminal

+
struct VteTerminal;

All of these fields should be considered read-only and deprecated.

-

enum VteTerminalAntiAlias

+

enum VteTerminalAntiAlias

typedef enum {
 	VTE_ANTI_ALIAS_USE_DEFAULT,
 	VTE_ANTI_ALIAS_FORCE_ENABLE,
@@ -448,7 +468,7 @@
-

enum VteTerminalCursorBlinkMode

+

enum VteTerminalCursorBlinkMode

typedef enum {
         VTE_CURSOR_BLINK_SYSTEM,
         VTE_CURSOR_BLINK_ON,
@@ -482,7 +502,7 @@
-

enum VteTerminalCursorShape

+

enum VteTerminalCursorShape

typedef enum {
         VTE_CURSOR_SHAPE_BLOCK,
         VTE_CURSOR_SHAPE_IBEAM,
@@ -517,7 +537,7 @@
-

enum VteTerminalEraseBinding

+

enum VteTerminalEraseBinding

typedef enum {
 	VTE_ERASE_AUTO,
 	VTE_ERASE_ASCII_BACKSPACE,
@@ -564,7 +584,7 @@
-

enum VteTerminalWriteFlags

+

enum VteTerminalWriteFlags

typedef enum {
   VTE_TERMINAL_WRITE_DEFAULT = 0
 } VteTerminalWriteFlags;
@@ -598,28 +618,25 @@
 
 
 
terminal :

-terminal in which the cell is.
-
+terminal in which the cell is.
 
 
 
column :

-column in which the cell is.
-
+column in which the cell is.
 
 
 
row :

-row in which the cell is.
-
+row in which the cell is.
 
 
 
data :

- user data. [closure]
+user data. [closure]
 
 
 
 
Returns :

- TRUE if cell has to be selected; FALSE if otherwise.
-
+
+TRUE if cell has to be selected; FALSE if otherwise.
@@ -635,7 +652,7 @@

Returns :

- a new VteTerminal object. [transfer full][type Vte.Terminal] +a new VteTerminal object. [transfer full][type Vte.Terminal]
@@ -660,8 +677,7 @@

menushell :

-a GtkMenuShell - +a GtkMenuShell
@@ -687,13 +703,12 @@

data :

-a string in the terminal's current encoding +a string in the terminal's current encoding. [array length=length][element-type guint8]

length :

-the length of the string - +the length of the string @@ -718,13 +733,11 @@

text :

-data to send to the child - +data to send to the child

length :

-length of text in bytes, or -1 if text is NUL-terminated - +length of text in bytes, or -1 if text is NUL-terminated @@ -748,8 +761,7 @@

data :

-data to send to the child - +data to send to the child

length :

@@ -783,9 +795,7 @@

Returns :

- the child's exit status - - +the child's exit status @@ -918,13 +928,11 @@

columns :

-the desired number of columns - +the desired number of columns

rows :

-the desired number of rows - +the desired number of rows @@ -949,8 +957,7 @@

is_audible :

-TRUE if the terminal should beep - +TRUE if the terminal should beep @@ -973,8 +980,8 @@

Returns :

- TRUE if audible bell is enabled, FALSE if not - + +TRUE if audible bell is enabled, FALSE if not @@ -999,8 +1006,7 @@

is_visible :

-whether the terminal should flash on bell - +whether the terminal should flash on bell @@ -1024,8 +1030,8 @@

Returns :

- TRUE if visible bell is enabled, FALSE if not - + +TRUE if visible bell is enabled, FALSE if not @@ -1051,8 +1057,7 @@

allow_bold :

-TRUE if the terminal should attempt to draw bold text - +TRUE if the terminal should attempt to draw bold text @@ -1075,8 +1080,8 @@

Returns :

- TRUE if bolding is enabled, FALSE if not - + +TRUE if bolding is enabled, FALSE if not @@ -1100,8 +1105,7 @@

scroll :

-whether the terminal should scroll on output - +whether the terminal should scroll on output @@ -1127,8 +1131,7 @@

scroll :

-whether the terminal should scroll on keystrokes - +whether the terminal should scroll on keystrokes @@ -1151,8 +1154,7 @@

bold :

-the new bold color - +the new bold color @@ -1176,7 +1178,7 @@

bold :

- the new bold color or NULL. [allow-none] +the new bold color or NULL. [allow-none] @@ -1200,8 +1202,7 @@

foreground :

-the new foreground color - +the new foreground color @@ -1225,8 +1226,7 @@

foreground :

-the new foreground color - +the new foreground color @@ -1252,8 +1252,7 @@

background :

-the new background color - +the new background color @@ -1279,8 +1278,7 @@

background :

-the new background color - +the new background color @@ -1304,8 +1302,7 @@

dim :

-the new dim color - +the new dim color @@ -1329,7 +1326,7 @@

dim :

- the new dim color or NULL. [allow-none] +the new dim color or NULL. [allow-none] @@ -1356,7 +1353,7 @@

cursor_background :

- the new color to use for the text cursor, or NULL. [allow-none] +the new color to use for the text cursor, or NULL. [allow-none] @@ -1383,7 +1380,7 @@

cursor_background :

- the new color to use for the text cursor, or NULL. [allow-none] +the new color to use for the text cursor, or NULL. [allow-none] @@ -1410,7 +1407,7 @@

highlight_background :

- the new color to use for highlighted text, or NULL. [allow-none] +the new color to use for highlighted text, or NULL. [allow-none] @@ -1438,7 +1435,7 @@

highlight_background :

- the new color to use for highlighted text, or NULL. [allow-none] +the new color to use for highlighted text, or NULL. [allow-none] @@ -1479,17 +1476,17 @@

foreground :

- the new foreground color, or NULL. [allow-none] +the new foreground color, or NULL. [allow-none]

background :

- the new background color, or NULL. [allow-none] +the new background color, or NULL. [allow-none]

palette :

- the color palette. [array length=palette_size zero-terminated=0][element-type Gdk.Color] +the color palette. [array length=palette_size zero-terminated=0][element-type Gdk.Color] @@ -1534,17 +1531,17 @@

foreground :

- the new foreground color, or NULL. [allow-none] +the new foreground color, or NULL. [allow-none]

background :

- the new background color, or NULL. [allow-none] +the new background color, or NULL. [allow-none]

palette :

- the color palette. [array length=palette_size zero-terminated=0][element-type Gdk.RGBA] +the color palette. [array length=palette_size zero-terminated=0][element-type Gdk.RGBA] @@ -1591,8 +1588,7 @@

opacity :

-the new opacity - +the new opacity @@ -1620,7 +1616,7 @@

image :

- a GdkPixbuf to use, or NULL to unset the background. [allow-none] +a GdkPixbuf to use, or NULL to unset the background. [allow-none] @@ -1647,7 +1643,7 @@

path :

- path to an image file. [type filename] +path to an image file. [type filename] @@ -1678,8 +1674,7 @@

saturation :

-a floating point value between 0.0 and 1.0. - +a floating point value between 0.0 and 1.0. @@ -1705,8 +1700,7 @@

transparent :

-whether the terminal should fake transparency - +whether the terminal should fake transparency @@ -1739,8 +1733,7 @@

color :

a color which the terminal background should be tinted to if its - saturation is not 1.0. - +saturation is not 1.0. @@ -1766,8 +1759,7 @@

scroll :

whether the terminal should scroll the background image along with - the text - +the text @@ -1777,7 +1769,7 @@

vte_terminal_set_cursor_shape ()

void                vte_terminal_set_cursor_shape       (VteTerminal *terminal,
-                                                         VteTerminalCursorShape shape);
+ VteTerminalCursorShape shape);

Sets the shape of the cursor drawn.

@@ -1791,8 +1783,7 @@

shape :

-the VteTerminalCursorShape to use - +the VteTerminalCursorShape to use
@@ -1801,7 +1792,7 @@

vte_terminal_get_cursor_shape ()

-
VteTerminalCursorShape  vte_terminal_get_cursor_shape   (VteTerminal *terminal);
+
VteTerminalCursorShape vte_terminal_get_cursor_shape    (VteTerminal *terminal);

Returns the currently set cursor shape.

@@ -1815,9 +1806,7 @@

Returns :

- cursor shape. - - +cursor shape.
@@ -1845,8 +1834,7 @@

blink :

-whether the cursor should blink - +whether the cursor should blink @@ -1854,7 +1842,7 @@

vte_terminal_get_cursor_blink_mode ()

-
VteTerminalCursorBlinkMode  vte_terminal_get_cursor_blink_mode
+
VteTerminalCursorBlinkMode vte_terminal_get_cursor_blink_mode
                                                         (VteTerminal *terminal);

 

 Returns the currently set cursor blink mode.
@@ -1869,9 +1857,7 @@
 
 
 
Returns :

- cursor blink mode.
-
-
+cursor blink mode.
@@ -1881,7 +1867,7 @@

vte_terminal_set_cursor_blink_mode ()

void                vte_terminal_set_cursor_blink_mode  (VteTerminal *terminal,
-                                                         VteTerminalCursorBlinkMode mode);
+ VteTerminalCursorBlinkMode mode);

Sets whether or not the cursor will blink. Using VTE_CURSOR_BLINK_SYSTEM will use the "gtk-cursor-blink" setting. @@ -1896,8 +1882,7 @@

mode :

-the VteTerminalCursorBlinkMode to use - +the VteTerminalCursorBlinkMode to use
@@ -1932,8 +1917,7 @@

lines :

-the length of the history buffer - +the length of the history buffer @@ -1960,7 +1944,7 @@

font_desc :

- a PangoFontDescription for the desired font, or NULL. [allow-none] +a PangoFontDescription for the desired font, or NULL. [allow-none] @@ -1985,7 +1969,7 @@

name :

- a pango font description in string form. [type utf8] +a pango font description in string form. [type utf8] @@ -1997,7 +1981,7 @@ 
void                vte_terminal_set_font_from_string_full
                                                         (VteTerminal *terminal,
                                                          const char *name,
-                                                         VteTerminalAntiAlias antialias);
+ VteTerminalAntiAlias antialias);

Warning

vte_terminal_set_font_from_string_full has been deprecated since version 0.20 and should not be used in newly-written code. Use vte_terminal_set_font()

@@ -2016,13 +2000,11 @@

name :

-A string describing the font. - +A string describing the font.

antialias :

-Whether or not to antialias the font (if possible). - +Whether or not to antialias the font (if possible).
@@ -2033,7 +2015,7 @@

vte_terminal_set_font_full ()

void                vte_terminal_set_font_full          (VteTerminal *terminal,
                                                          const PangoFontDescription *font_desc,
-                                                         VteTerminalAntiAlias antialias);
+ VteTerminalAntiAlias antialias);

Warning

vte_terminal_set_font_full has been deprecated since version 0.20 and should not be used in newly-written code. Use vte_terminal_set_font()

@@ -2060,8 +2042,7 @@

antialias :

-Specify if anti aliasing of the fonts is to be used or not. - +Specify if anti aliasing of the fonts is to be used or not.
@@ -2085,8 +2066,8 @@

Returns :

- a PangoFontDescription describing the font the terminal is - currently using to render text. [transfer none] +a PangoFontDescription describing the font the terminal is +currently using to render text. [transfer none] @@ -2116,9 +2097,7 @@

Returns :

- TRUE - - +TRUE @@ -2142,8 +2121,8 @@

Returns :

- TRUE if part of the text in the terminal is selected. - + +TRUE if part of the text in the terminal is selected. @@ -2173,8 +2152,7 @@

spec :

-a specification - +a specification @@ -2198,13 +2176,12 @@

c :

-a candidate Unicode code point - +a candidate Unicode code point

Returns :

- TRUE if the character is considered to be part of a word - + +TRUE if the character is considered to be part of a word @@ -2213,7 +2190,7 @@

vte_terminal_set_backspace_binding ()

void                vte_terminal_set_backspace_binding  (VteTerminal *terminal,
-                                                         VteTerminalEraseBinding binding);
+ VteTerminalEraseBinding binding);

Modifies the terminal's backspace key binding, which controls what string or control sequence the terminal sends to its child when the user @@ -2229,8 +2206,7 @@

binding :

-a VteTerminalEraseBinding for the backspace key - +a VteTerminalEraseBinding for the backspace key
@@ -2239,7 +2215,7 @@

vte_terminal_set_delete_binding ()

void                vte_terminal_set_delete_binding     (VteTerminal *terminal,
-                                                         VteTerminalEraseBinding binding);
+ VteTerminalEraseBinding binding);

Modifies the terminal's delete key binding, which controls what string or control sequence the terminal sends to its child when the user @@ -2255,8 +2231,7 @@

binding :

-a VteTerminalEraseBinding for the delete key - +a VteTerminalEraseBinding for the delete key
@@ -2282,8 +2257,7 @@

setting :

-whether the mouse pointer should autohide - +whether the mouse pointer should autohide @@ -2308,8 +2282,8 @@

Returns :

- TRUE if autohiding is enabled, FALSE if not - + +TRUE if autohiding is enabled, FALSE if not @@ -2336,13 +2310,11 @@

clear_tabstops :

-whether to reset tabstops - +whether to reset tabstops

clear_history :

-whether to empty the terminal's scrollback buffer - +whether to empty the terminal's scrollback buffer @@ -2371,22 +2343,21 @@

is_selected :

-a VteSelectionFunc callback - +a VteSelectionFunc callback

user_data :

- user data to be passed to the callback. [closure] +user data to be passed to the callback. [closure]

attributes :

- location for storing text attributes. [out][transfer full][array][element-type Vte.CharAttributes] +location for storing text attributes. [out][transfer full][array][element-type Vte.CharAttributes]

Returns :

- a newly allocated text string, or NULL. [transfer full] +a newly allocated text string, or NULL. [transfer full] @@ -2419,22 +2390,21 @@

is_selected :

-a VteSelectionFunc callback - +a VteSelectionFunc callback

user_data :

- user data to be passed to the callback. [closure] +user data to be passed to the callback. [closure]

attributes :

- location for storing text attributes. [out][transfer full][array][element-type Vte.CharAttributes] +location for storing text attributes. [out][transfer full][array][element-type Vte.CharAttributes]

Returns :

- a newly allocated text string, or NULL. [transfer full] +a newly allocated text string, or NULL. [transfer full] @@ -2471,42 +2441,37 @@

start_row :

-first row to search for data - +first row to search for data

start_col :

-first column to search for data - +first column to search for data

end_row :

-last row to search for data - +last row to search for data

end_col :

-last column to search for data - +last column to search for data

is_selected :

-a VteSelectionFunc callback - +a VteSelectionFunc callback

user_data :

- user data to be passed to the callback. [closure] +user data to be passed to the callback. [closure]

attributes :

- location for storing text attributes. [out][transfer full][array][element-type Vte.CharAttributes] +location for storing text attributes. [out][transfer full][array][element-type Vte.CharAttributes]

Returns :

- a newly allocated text string, or NULL. [transfer full] +a newly allocated text string, or NULL. [transfer full] @@ -2532,12 +2497,12 @@

column :

- a location to store the column, or NULL. [out][allow-none] +a location to store the column, or NULL. [out][allow-none]

row :

- a location to store the row, or NULL. [out][allow-none] +a location to store the row, or NULL. [out][allow-none] @@ -2584,14 +2549,11 @@

match :

-a regular expression - +a regular expression

Returns :

- an integer associated with this expression - - +an integer associated with this expression @@ -2622,14 +2584,11 @@

flags :

-the GRegexMatchFlags to use when matching the regex - +the GRegexMatchFlags to use when matching the regex

Returns :

- an integer associated with this expression - - +an integer associated with this expression @@ -2655,8 +2614,7 @@

tag :

-the tag of the regex to remove - +the tag of the regex to remove @@ -2689,23 +2647,21 @@

column :

-the text column - +the text column

row :

-the text row - +the text row

tag :

- a location to store the tag, or NULL. [out][allow-none] +a location to store the tag, or NULL. [out][allow-none]

Returns :

- a newly allocated string which matches one of the previously - set regular expressions. [transfer full] +a newly allocated string which matches one of the previously +set regular expressions. [transfer full] @@ -2731,13 +2687,12 @@

tag :

-the tag of the regex which should use the specified cursor - +the tag of the regex which should use the specified cursor

cursor :

- the GdkCursor which the terminal should use when the pattern is - highlighted, or NULL to use the standard cursor. [allow-none] +the GdkCursor which the terminal should use when the pattern is +highlighted, or NULL to use the standard cursor. [allow-none] @@ -2764,8 +2719,7 @@

tag :

-the tag of the regex which should use the specified cursor - +the tag of the regex which should use the specified cursor

cursor_type :

@@ -2796,13 +2750,11 @@

tag :

-the tag of the regex which should use the specified cursor - +the tag of the regex which should use the specified cursor

cursor_name :

-the name of the cursor - +the name of the cursor @@ -2828,7 +2780,7 @@

emulation :

- the name of a terminal description, or NULL to use the default. [allow-none] +the name of a terminal description, or NULL to use the default. [allow-none] @@ -2852,9 +2804,8 @@

Returns :

- an interned string containing the name of the terminal type the - widget is attempting to emulate - +an interned string containing the name of the terminal type the +widget is attempting to emulate @@ -2877,8 +2828,8 @@

Returns :

- an interned string containing the name of the default terminal - type the widget attempts to emulate. [transfer none][type utf8] +an interned string containing the name of the default terminal +type the widget attempts to emulate. [transfer none][type utf8] @@ -2906,7 +2857,7 @@

codeset :

- a valid GIConv target, or NULL to use the default encoding. [allow-none] +a valid GIConv target, or NULL to use the default encoding. [allow-none] @@ -2930,7 +2881,7 @@

Returns :

- the current encoding for the terminal. [transfer none] +the current encoding for the terminal. [transfer none] @@ -2955,9 +2906,9 @@

Returns :

- the current contents of the terminal's status line. - For terminals like "xterm", this will usually be the empty string. The string - must not be modified or freed by the caller. [transfer none] +the current contents of the terminal's status line. +For terminals like "xterm", this will usually be the empty string. The string +must not be modified or freed by the caller. [transfer none] @@ -2994,13 +2945,11 @@

xpad :

-address in which to store left/right-edge padding - +address in which to store left/right-edge padding

ypad :

-address in which to store top/bottom-edge ypadding - +address in which to store top/bottom-edge ypadding @@ -3010,7 +2959,7 @@

vte_terminal_write_contents ()

gboolean            vte_terminal_write_contents         (VteTerminal *terminal,
                                                          GOutputStream *stream,
-                                                         VteTerminalWriteFlags flags,
+                                                         VteTerminalWriteFlags flags,
                                                          GCancellable *cancellable,
                                                          GError **error);

@@ -3037,29 +2986,27 @@

stream :

-a GOutputStream to write to - +a GOutputStream to write to

flags :

-a set of VteTerminalWriteFlags +a set of VteTerminalWriteFlags

cancellable :

- a GCancellable object, or NULL. [allow-none] +a GCancellable object, or NULL. [allow-none]

error :

- a GError location to store the error occuring, or NULL. [allow-none] +a GError location to store the error occuring, or NULL. [allow-none]

Returns :

- TRUE on success, FALSE if there was an error - - + +TRUE on success, FALSE if there was an error @@ -3083,9 +3030,8 @@

Returns :

- TRUE if a match was found - - + +TRUE if a match was found @@ -3109,9 +3055,8 @@

Returns :

- TRUE if a match was found - - + +TRUE if a match was found @@ -3131,7 +3076,7 @@

Returns :

- the search GRegex regex set in terminal, or NULL. [transfer none] +the search GRegex regex set in terminal, or NULL. [transfer none] @@ -3152,9 +3097,7 @@

Returns :

- whether searching will wrap around - - +whether searching will wrap around @@ -3178,7 +3121,7 @@

regex :

- a GRegex, or NULL. [allow-none] +a GRegex, or NULL. [allow-none] @@ -3204,8 +3147,7 @@

wrap_around :

-whether search should wrap - +whether search should wrap @@ -3223,8 +3165,8 @@

Returns :

- a newly allocated string with the - user's shell, or NULL. [tranfer full][type filename] +a newly allocated string with the +user's shell, or NULL. [tranfer full][type filename] @@ -3267,48 +3209,43 @@

command :

- the name of a binary to run, or NULL to spawn the user's shell. [allow-none][type filename] +the name of a binary to run, or NULL to spawn the user's shell. [allow-none][type filename]

argv :

- the argument list to be passed to command, or NULL. [allow-none][array zero-terminated=1][element-type filename] +the argument list to be passed to command, or NULL. [allow-none][array zero-terminated=1][element-type filename]

envv :

- a list of environment variables to be added to the environment before - starting command, or NULL. [allow-none][array zero-terminated=1][element-type filename] +a list of environment variables to be added to the environment before +starting command, or NULL. [allow-none][array zero-terminated=1][element-type filename]

working_directory :

- the name of a directory the command should start in, or NULL. [allow-none][type filename] +the name of a directory the command should start in, or NULL. [allow-none][type filename]

lastlog :

-TRUE if the session should be logged to the lastlog - +TRUE if the session should be logged to the lastlog

utmp :

-TRUE if the session should be logged to the utmp/utmpx log - +TRUE if the session should be logged to the utmp/utmpx log

wtmp :

-TRUE if the session should be logged to the wtmp/wtmpx log - +TRUE if the session should be logged to the wtmp/wtmpx log

Returns :

- the PID of the new process, or -1 on failure - - +the PID of the new process, or -1 on failure @@ -3317,7 +3254,7 @@

vte_terminal_fork_command_full ()

gboolean            vte_terminal_fork_command_full      (VteTerminal *terminal,
-                                                         VtePtyFlags pty_flags,
+                                                         VtePtyFlags pty_flags,
                                                          const char *working_directory,
                                                          char **argv,
                                                          char **envv,
@@ -3354,24 +3291,24 @@
 
 
 
pty_flags :

-flags from VtePtyFlags
+flags from VtePtyFlags
 
 
 
 
working_directory :

- the name of a directory the command should start
-  in, or NULL to use the current working directory. [allow-none]
+the name of a directory the command should start
+in, or NULL to use the current working directory. [allow-none]
 
 
 
 
argv :

- child's argument vector. [array zero-terminated=1][element-type filename]
+child's argument vector. [array zero-terminated=1][element-type filename]
 
 
 
 
envv :

- a list of environment
-  variables to be added to the environment before starting the process, or NULL. [allow-none][array zero-terminated=1][element-type filename]
+a list of environment
+variables to be added to the environment before starting the process, or NULL. [allow-none][array zero-terminated=1][element-type filename]
 
 
 
@@ -3381,7 +3318,7 @@
 
 
 
child_setup :

- function to run in the child just before exec(), or NULL. [allow-none][scope call]
+function to run in the child just before exec(), or NULL. [allow-none][scope call]
 
 
 
@@ -3391,19 +3328,18 @@
 
 
 
child_pid :

- a location to store the child PID, or NULL. [out][allow-none][transfer full]
+a location to store the child PID, or NULL. [out][allow-none][transfer full]
 
 
 
 
error :

- return location for a GError, or NULL. [allow-none]
+return location for a GError, or NULL. [allow-none]
 
 
 
 
Returns :

- TRUE on success, or FALSE on error with error filled in
-
-
+
+TRUE on success, or FALSE on error with error filled in
@@ -3458,27 +3394,22 @@

lastlog :

-TRUE if the session should be logged to the lastlog - +TRUE if the session should be logged to the lastlog

utmp :

-TRUE if the session should be logged to the utmp/utmpx log - +TRUE if the session should be logged to the utmp/utmpx log

wtmp :

-TRUE if the session should be logged to the wtmp/wtmpx log - +TRUE if the session should be logged to the wtmp/wtmpx log

Returns :

- the ID of the new process in the parent, 0 in the child, and -1 if -there was an error - - +the ID of the new process in the parent, 0 in the child, and -1 if +there was an error @@ -3505,9 +3436,7 @@

Returns :

- the file descriptor, or -1 if the terminal has no PTY. - - +the file descriptor, or -1 if the terminal has no PTY. @@ -3530,7 +3459,7 @@

Returns :

- a VtePty, or NULL. [transfer none] +a VtePty, or NULL. [transfer none] @@ -3541,7 +3470,7 @@

vte_terminal_pty_new ()

VtePty *            vte_terminal_pty_new                (VteTerminal *terminal,
-                                                         VtePtyFlags flags,
+                                                         VtePtyFlags flags,
                                                          GError **error);

Creates a new VtePty, and sets the emulation property @@ -3560,17 +3489,17 @@

flags :

-flags from VtePtyFlags +flags from VtePtyFlags

error :

- return location for a GError, or NULL. [allow-none] +return location for a GError, or NULL. [allow-none]

Returns :

- a new VtePty. [transfer full] +a new VtePty. [transfer full] @@ -3626,7 +3555,7 @@

pty :

- a VtePty, or NULL. [allow-none] +a VtePty, or NULL. [allow-none] @@ -3695,7 +3624,7 @@

Returns :

- the contents of terminal's adjustment field. [transfer none] +the contents of terminal's adjustment field. [transfer none] @@ -3722,9 +3651,7 @@

Returns :

- the contents of terminal's char_ascent field - - +the contents of terminal's char_ascent field
@@ -3750,9 +3677,7 @@

Returns :

- the contents of terminal's char_descent field - - +the contents of terminal's char_descent field @@ -3771,8 +3696,7 @@

Returns :

- the height of a character cell - +the height of a character cell @@ -3791,8 +3715,7 @@

Returns :

- the width of a character cell - +the width of a character cell @@ -3811,8 +3734,7 @@

Returns :

- the number of columns - +the number of columns @@ -3831,7 +3753,7 @@

Returns :

- the icon title. [transfer none] +the icon title. [transfer none] @@ -3851,8 +3773,7 @@

Returns :

- the number of rows - +the number of rows @@ -3871,7 +3792,7 @@

Returns :

- the window title. [transfer none] +the window title. [transfer none] @@ -3986,7 +3907,7 @@

The "backspace-binding" property

-
  "backspace-binding"        VteTerminalEraseBinding  : Read / Write
+
  "backspace-binding"        VteTerminalEraseBinding  : Read / Write

*Controls what string or control sequence the terminal sends to its child when the user presses the backspace key. @@ -3997,7 +3918,7 @@

The "cursor-blink-mode" property

-
  "cursor-blink-mode"        VteTerminalCursorBlinkMode  : Read / Write
+
  "cursor-blink-mode"        VteTerminalCursorBlinkMode  : Read / Write

Sets whether or not the cursor will blink. Using VTE_CURSOR_BLINK_SYSTEM will use the "gtk-cursor-blink" setting. @@ -4008,7 +3929,7 @@

The "cursor-shape" property

-
  "cursor-shape"             VteTerminalCursorShape  : Read / Write
+
  "cursor-shape"             VteTerminalCursorShape  : Read / Write

Controls the shape of the cursor.

@@ -4018,7 +3939,7 @@

The "delete-binding" property

-
  "delete-binding"           VteTerminalEraseBinding  : Read / Write
+
  "delete-binding"           VteTerminalEraseBinding  : Read / Write

Controls what string or control sequence the terminal sends to its child when the user presses the delete key. @@ -4225,8 +4146,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4251,18 +4171,15 @@

vteterminal :

-the object which received the signal - +the object which received the signal

width :

-the new character cell width - +the new character cell width

height :

-the new character cell height - +the new character cell height

user_data :

@@ -4285,8 +4202,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4312,18 +4228,15 @@

vteterminal :

-the object which received the signal - +the object which received the signal

text :

-a string of text - +a string of text

size :

-the length of that string of text - +the length of that string of text

user_data :

@@ -4346,8 +4259,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4369,8 +4281,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4393,8 +4304,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4416,8 +4326,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4439,8 +4348,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4463,8 +4371,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4488,8 +4395,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4513,8 +4419,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4536,8 +4441,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4559,8 +4463,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4582,8 +4485,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4605,8 +4507,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4628,8 +4529,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4653,18 +4553,15 @@

vteterminal :

-the object which received the signal - +the object which received the signal

x :

-the terminal's desired location, X coordinate - +the terminal's desired location, X coordinate

y :

-the terminal's desired location, Y coordinate - +the terminal's desired location, Y coordinate

user_data :

@@ -4686,8 +4583,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4709,8 +4605,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4732,8 +4627,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4757,18 +4651,15 @@

vteterminal :

-the object which received the signal - +the object which received the signal

width :

-the desired width in pixels, including padding - +the desired width in pixels, including padding

height :

-the desired height in pixels, including padding - +the desired height in pixels, including padding

user_data :

@@ -4790,8 +4681,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4813,8 +4703,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4837,8 +4726,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4862,8 +4750,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4887,8 +4774,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4912,8 +4798,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4938,13 +4823,11 @@

vteterminal :

-the object which received the signal - +the object which received the signal

delta :

-the number of lines scrolled - +the number of lines scrolled

user_data :

@@ -4966,8 +4849,7 @@

vteterminal :

-the object which received the signal - +the object which received the signal

user_data :

@@ -4980,6 +4862,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/vte-Version-Information.html vte3-0.32.0/doc/reference/html/vte-Version-Information.html --- vte3-0.31.0/doc/reference/html/vte-Version-Information.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/vte-Version-Information.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -67,7 +67,7 @@

VTE_MINOR_VERSION

-
#define VTE_MINOR_VERSION (31)
+
#define VTE_MINOR_VERSION (32)
 

 

 The minor version number of the VTE library
@@ -100,18 +100,15 @@
 
 
 
major :

-required major version
-
+required major version
 
 
 
minor :

-required minor version
-
+required minor version
 
 
 
micro :

-required micro version
-
+required micro version
@@ -121,6 +118,6 @@
- Generated by GTK-Doc V1.15.1
+ Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/html/vte-Vte-PTY.html vte3-0.32.0/doc/reference/html/vte-Vte-PTY.html --- vte3-0.31.0/doc/reference/html/vte-Vte-PTY.html 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/html/vte-Vte-PTY.html 2012-03-19 17:27:00.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -44,10 +44,10 @@

Synopsis

-
enum                VtePtyFlags;
-enum                VtePtyError;
+
enum                VtePtyFlags;
+enum                VtePtyError;
                     VtePty;
-VtePty *            vte_pty_new                         (VtePtyFlags flags,
+VtePty *            vte_pty_new                         (VtePtyFlags flags,
                                                          GError **error);
 VtePty *            vte_pty_new_foreign                 (int fd,
                                                          GError **error);
@@ -72,6 +72,14 @@
 

 
Object Hierarchy

 
+  GFlags
+   +----VtePtyFlags
+

+
+  GEnum
+   +----VtePtyError
+

+
   GObject
    +----VtePty
 

@@ -86,7 +94,7 @@
 
Properties

 
   "fd"                       gint                  : Read / Write / Construct Only
-  "flags"                    VtePtyFlags           : Read / Write / Construct Only
+  "flags"                    VtePtyFlags           : Read / Write / Construct Only
   "term"                     gchar*                : Read / Write
 

 

@@ -100,7 +108,7 @@
 

 
Details

 

-
enum VtePtyFlags

+
enum VtePtyFlags

 
typedef enum {
   VTE_PTY_NO_LASTLOG  = 1 << 0,
   VTE_PTY_NO_UTMP     = 1 << 1,
@@ -150,7 +158,7 @@
 

 

 

-
enum VtePtyError

+
enum VtePtyError

 
typedef enum {
   VTE_PTY_ERROR_PTY_HELPER_FAILED = 0,
   VTE_PTY_ERROR_PTY98_FAILED
@@ -183,7 +191,7 @@
 

 

 
vte_pty_new ()

-
VtePty *            vte_pty_new                         (VtePtyFlags flags,
+
VtePty *            vte_pty_new                         (VtePtyFlags flags,
                                                          GError **error);

 

 Allocates a new pseudo-terminal.
@@ -219,17 +227,17 @@
 
 
 
flags :

-flags from VtePtyFlags
+flags from VtePtyFlags
 
 
 
 
error :

- return location for a GError, or NULL. [allow-none]
+return location for a GError, or NULL. [allow-none]
 
 
 
 
Returns :

- a new VtePty, or NULL on error with error filled in. [transfer full]
+a new VtePty, or NULL on error with error filled in. [transfer full]
 
 
 
@@ -256,17 +264,17 @@
 
 
 
fd :

- a file descriptor to the PTY. [transfer full]
+a file descriptor to the PTY. [transfer full]
 
 
 
 
error :

- return location for a GError, or NULL. [allow-none]
+return location for a GError, or NULL. [allow-none]
 
 
 
 
Returns :

- a new VtePty for fd, or NULL on error with error filled in. [transfer full]
+a new VtePty for fd, or NULL on error with error filled in. [transfer full]
 
 
 
@@ -322,8 +330,8 @@
 
 
 
Returns :

- the file descriptor of the PTY master in pty. The
-  file descriptor belongs to pty and must not be closed. [transfer none]
+the file descriptor of the PTY master in pty. The
+file descriptor belongs to pty and must not be closed. [transfer none]
 
 
 
@@ -353,13 +361,11 @@
 
 
 
rows :

-the desired number of rows
-
+the desired number of rows
 
 
 
columns :

-the desired number of columns
-
+the desired number of columns
 
 
 
error :

@@ -368,9 +374,8 @@
 
 
 
Returns :

- TRUE on success, FALSE on failure with error filled in
-
-
+
+TRUE on success, FALSE on failure with error filled in
 
 
 

@@ -399,12 +404,12 @@
 
 
 
rows :

- a location to store the number of rows, or NULL. [out][allow-none]
+a location to store the number of rows, or NULL. [out][allow-none]
 
 
 
 
columns :

- a location to store the number of columns, or NULL. [out][allow-none]
+a location to store the number of columns, or NULL. [out][allow-none]
 
 
 
@@ -414,9 +419,8 @@
 
 
 
Returns :

- TRUE on success, FALSE on failure with error filled in
-
-
+
+TRUE on success, FALSE on failure with error filled in
 
 
 

@@ -440,7 +444,7 @@
 
 
 
emulation :

- the name of a terminal description, or NULL. [allow-none]
+the name of a terminal description, or NULL. [allow-none]
 
 
 
@@ -468,19 +472,17 @@
 
 
 
utf8 :

-whether or not the pty is in UTF-8 mode
-
+whether or not the pty is in UTF-8 mode
 
 
 
error :

- return location to store a GError, or NULL. [allow-none]
+return location to store a GError, or NULL. [allow-none]
 
 
 
 
Returns :

- TRUE on success, FALSE on failure with error filled in
-
-
+
+TRUE on success, FALSE on failure with error filled in
 
 
 

@@ -502,7 +504,7 @@
 

 

 
The "flags" property

-
  "flags"                    VtePtyFlags           : Read / Write / Construct Only

+
  "flags"                    VtePtyFlags           : Read / Write / Construct Only

 

 Controls how the session is recorded in lastlog, utmp, and wtmp,
 and whether to use the GNOME PTY helper.
@@ -524,6 +526,6 @@
 

 

 

-          Generated by GTK-Doc V1.15.1

+          Generated by GTK-Doc V1.18.1
\ No newline at end of file diff -Nru vte3-0.31.0/doc/reference/Makefile.in vte3-0.32.0/doc/reference/Makefile.in --- vte3-0.31.0/doc/reference/Makefile.in 2011-11-21 13:48:19.000000000 +0000 +++ vte3-0.32.0/doc/reference/Makefile.in 2012-03-19 17:25:20.000000000 +0000 @@ -63,7 +63,10 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ +AM_CPPFLAGS = @AM_CPPFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_LDFLAGS = @AM_LDFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -94,6 +97,7 @@ GLADE_ICON_DIR = @GLADE_ICON_DIR@ GLADE_MODULE_DIR = @GLADE_MODULE_DIR@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -102,6 +106,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_API_VERSION = @GTK_API_VERSION@ @@ -180,7 +186,6 @@ VTE_API_VERSION = @VTE_API_VERSION@ VTE_API_VERSION_U = @VTE_API_VERSION_U@ VTE_CFLAGS = @VTE_CFLAGS@ -VTE_DEFAULT_EMULATION = @VTE_DEFAULT_EMULATION@ VTE_LDFLAGS = @VTE_LDFLAGS@ VTE_LIBRARY_SUFFIX_U = @VTE_LIBRARY_SUFFIX_U@ VTE_LIBS = @VTE_LIBS@ @@ -377,10 +382,10 @@ $(top_builddir)/src/libvte@VTE_LIBRARY_SUFFIX_U@.la \ $(VTE_LIBS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute @@ -391,17 +396,21 @@ # GPATH = $(srcdir) TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +SETUP_FILES = \ + $(content_files) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + # This includes the standard gtk-doc make rules, copied by gtkdocize. # Other files to distribute # e.g. EXTRA_DIST += version.xml.in -EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \ - version.xml.in -DOC_STAMPS = scan-build.stamp sgml-build.stamp html-build.stamp pdf-build.stamp \ - $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ - $(srcdir)/pdf.stamp +EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in +DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ + sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -622,22 +631,44 @@ $(REPORT_FILES): sgml-build.stamp +#### setup #### + +setup-build.stamp: + -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + echo ' DOC Preparing build'; \ + files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + test -f $(abs_srcdir)/$$file && \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + done; \ + fi; \ + fi + @touch setup-build.stamp + #### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + @echo ' DOC Scanning header files' + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + echo " DOC Introspecting gobjects"; \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ + fi; \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ else \ - cd $(srcdir) ; \ for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ + test -f $$i || touch $$i ; \ done \ fi @touch scan-build.stamp @@ -647,14 +678,13 @@ #### xml #### -sgml-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) - @echo 'gtk-doc: Building XML' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) + @echo ' DOC Building XML' + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) @touch sgml-build.stamp sgml.stamp: sgml-build.stamp @@ -663,58 +693,78 @@ #### html #### html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/html - @mkdir $(srcdir)/html + @echo ' DOC Building HTML' + @rm -rf html + @mkdir html @mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ if test "$(?)" = "0"; then \ - mkhtml_options=--path="$(srcdir)"; \ + mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ - cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + -@test "x$(HTML_IMAGES)" = "x" || \ + for file in $(HTML_IMAGES) ; do \ + if test -f $(abs_srcdir)/$$file ; then \ + cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + fi; \ + if test -f $(abs_builddir)/$$file ; then \ + cp $(abs_builddir)/$$file $(abs_builddir)/html; \ + fi; \ + done; + @echo ' DOC Fixing cross-references' + @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @touch html-build.stamp #### pdf #### pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building PDF' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/$(DOC_MODULE).pdf - @mkpdf_imgdirs=""; \ + @echo ' DOC Building PDF' + @rm -f $(DOC_MODULE).pdf + @mkpdf_options=""; \ + gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkpdf_options="$$mkpdf_options --verbose"; \ + fi; \ + fi; \ if test "x$(HTML_IMAGES)" != "x"; then \ for img in $(HTML_IMAGES); do \ part=`dirname $$img`; \ - echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ + echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ if test $$? != 0; then \ - mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ + mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ fi; \ done; \ fi; \ - cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) @touch pdf-build.stamp ############## clean-local: - rm -f *~ *.bak - rm -rf .libs + @rm -f *~ *.bak + @rm -rf .libs distclean-local: - cd $(srcdir) && \ - rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ + fi maintainer-clean-local: clean - cd $(srcdir) && rm -rf html + @rm -rf xml html install-data-local: - @installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ + @installfiles=`echo $(builddir)/html/*`; \ + if test "$$installfiles" = '$(builddir)/html/*'; \ + then echo 1>&2 'Nothing to install' ; \ else \ if test -n "$(DOC_MODULE_VERSION)"; then \ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ @@ -723,14 +773,12 @@ fi; \ $(mkinstalldirs) $${installdir} ; \ for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ + echo ' $(INSTALL_DATA) '$$i ; \ $(INSTALL_DATA) $$i $${installdir}; \ done; \ if test -n "$(DOC_MODULE_VERSION)"; then \ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ - mv -f $${installdir}/$(DOC_MODULE).devhelp \ - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ fi; \ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ fi @@ -752,13 +800,13 @@ @ENABLE_GTK_DOC_FALSE@ @false dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/html - cp $(srcdir)/html/* $(distdir)/html - -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) - $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + @mkdir $(distdir)/html + @cp ./html/* $(distdir)/html + @-cp ./$(DOC_MODULE).pdf $(distdir)/ + @-cp ./$(DOC_MODULE).types $(distdir)/ + @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ + @cd $(distdir) && rm -f $(DISTCLEANFILES) + @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs diff -Nru vte3-0.31.0/doc/reference/version.xml vte3-0.32.0/doc/reference/version.xml --- vte3-0.31.0/doc/reference/version.xml 2011-11-21 13:48:42.000000000 +0000 +++ vte3-0.32.0/doc/reference/version.xml 2012-03-19 17:25:30.000000000 +0000 @@ -1 +1 @@ -0.31.0 +0.32.0 diff -Nru vte3-0.31.0/glade/Makefile.am vte3-0.32.0/glade/Makefile.am --- vte3-0.31.0/glade/Makefile.am 2011-09-26 12:32:16.000000000 +0000 +++ vte3-0.32.0/glade/Makefile.am 2012-03-10 15:55:12.000000000 +0000 @@ -1,8 +1,8 @@ NULL = cataloguedir = $(GLADE_CATALOGUE_DIR) -catalogue_in_files = vte.xml.in -catalogue_DATA = $(catalogue_in_files:.xml.in=.xml) +catalogue_in_files = vte.xml.in.in +catalogue_DATA = $(catalogue_in_files:.xml.in.in=.xml) icons = \ hicolor_actions_16x16_widget-vte-terminal.png \ @@ -10,7 +10,6 @@ $(NULL) EXTRA_DIST = \ - $(catalogue_DATA) \ $(icons) \ $(NULL) diff -Nru vte3-0.31.0/glade/Makefile.in vte3-0.32.0/glade/Makefile.in --- vte3-0.31.0/glade/Makefile.in 2011-11-21 13:48:19.000000000 +0000 +++ vte3-0.32.0/glade/Makefile.in 2012-03-19 17:25:20.000000000 +0000 @@ -35,7 +35,8 @@ build_triplet = @build@ host_triplet = @host@ subdir = glade -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/vte.xml.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.in @@ -43,7 +44,7 @@ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = vte.xml.in CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -80,7 +81,10 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ +AM_CPPFLAGS = @AM_CPPFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_LDFLAGS = @AM_LDFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -111,6 +115,7 @@ GLADE_ICON_DIR = @GLADE_ICON_DIR@ GLADE_MODULE_DIR = @GLADE_MODULE_DIR@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -119,6 +124,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_API_VERSION = @GTK_API_VERSION@ @@ -197,7 +204,6 @@ VTE_API_VERSION = @VTE_API_VERSION@ VTE_API_VERSION_U = @VTE_API_VERSION_U@ VTE_CFLAGS = @VTE_CFLAGS@ -VTE_DEFAULT_EMULATION = @VTE_DEFAULT_EMULATION@ VTE_LDFLAGS = @VTE_LDFLAGS@ VTE_LIBRARY_SUFFIX_U = @VTE_LIBRARY_SUFFIX_U@ VTE_LIBS = @VTE_LIBS@ @@ -263,15 +269,14 @@ top_srcdir = @top_srcdir@ NULL = cataloguedir = $(GLADE_CATALOGUE_DIR) -catalogue_in_files = vte.xml.in -catalogue_DATA = $(catalogue_in_files:.xml.in=.xml) +catalogue_in_files = vte.xml.in.in +catalogue_DATA = $(catalogue_in_files:.xml.in.in=.xml) icons = \ hicolor_actions_16x16_widget-vte-terminal.png \ hicolor_actions_22x22_widget-vte-terminal.png \ $(NULL) EXTRA_DIST = \ - $(catalogue_DATA) \ $(icons) \ $(NULL) @@ -309,6 +314,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +vte.xml.in: $(top_builddir)/config.status $(srcdir)/vte.xml.in.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo diff -Nru vte3-0.31.0/glade/vte.xml vte3-0.32.0/glade/vte.xml --- vte3-0.31.0/glade/vte.xml 2011-11-21 13:50:19.000000000 +0000 +++ vte3-0.32.0/glade/vte.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff -Nru vte3-0.31.0/glade/vte.xml.in.in vte3-0.32.0/glade/vte.xml.in.in --- vte3-0.31.0/glade/vte.xml.in.in 1970-01-01 00:00:00.000000000 +0000 +++ vte3-0.32.0/glade/vte.xml.in.in 2012-03-10 15:55:12.000000000 +0000 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru vte3-0.31.0/gnome-pty-helper/aclocal.m4 vte3-0.32.0/gnome-pty-helper/aclocal.m4 --- vte3-0.31.0/gnome-pty-helper/aclocal.m4 2011-10-17 11:12:18.000000000 +0000 +++ vte3-0.32.0/gnome-pty-helper/aclocal.m4 2012-03-08 20:55:05.000000000 +0000 @@ -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.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. 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'.])]) diff -Nru vte3-0.31.0/gnome-pty-helper/configure vte3-0.32.0/gnome-pty-helper/configure --- vte3-0.31.0/gnome-pty-helper/configure 2011-10-27 18:29:28.000000000 +0000 +++ vte3-0.32.0/gnome-pty-helper/configure 2012-03-08 20:55:05.000000000 +0000 @@ -607,6 +607,8 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +SUID_LDFLAGS +SUID_CFLAGS host_os host_vendor host_cpu @@ -712,7 +714,9 @@ LDFLAGS LIBS CPPFLAGS -CPP' +CPP +SUID_CFLAGS +SUID_LDFLAGS' # Initialize some variables set by options. @@ -1348,6 +1352,9 @@ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor + SUID_CFLAGS CFLAGS used for binaries which are usually with the suid bit + SUID_LDFLAGS + LDFLAGS used for binaries which are usually with the suid bit Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -6323,6 +6330,9 @@ ;; esac + + + ac_config_files="$ac_config_files Makefile" diff -Nru vte3-0.31.0/gnome-pty-helper/configure.in vte3-0.32.0/gnome-pty-helper/configure.in --- vte3-0.31.0/gnome-pty-helper/configure.in 2011-09-26 12:32:16.000000000 +0000 +++ vte3-0.32.0/gnome-pty-helper/configure.in 2012-03-08 20:37:13.000000000 +0000 @@ -45,6 +45,11 @@ ;; esac +AC_ARG_VAR([SUID_CFLAGS], + [CFLAGS used for binaries which are usually with the suid bit]) +AC_ARG_VAR([SUID_LDFLAGS], + [LDFLAGS used for binaries which are usually with the suid bit]) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff -Nru vte3-0.31.0/gnome-pty-helper/Makefile.am vte3-0.32.0/gnome-pty-helper/Makefile.am --- vte3-0.31.0/gnome-pty-helper/Makefile.am 2011-09-26 12:32:16.000000000 +0000 +++ vte3-0.32.0/gnome-pty-helper/Makefile.am 2012-03-08 20:37:13.000000000 +0000 @@ -7,6 +7,9 @@ gnome-pty-helper.c \ gnome-utmp.c +gnome_pty_helper_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) +gnome_pty_helper_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) + install-exec-hook: chown root.utmp $(DESTDIR)$(libexecdir)/gnome-pty-helper || true chmod g+s $(DESTDIR)$(libexecdir)/gnome-pty-helper || true diff -Nru vte3-0.31.0/gnome-pty-helper/Makefile.in vte3-0.32.0/gnome-pty-helper/Makefile.in --- vte3-0.31.0/gnome-pty-helper/Makefile.in 2011-11-21 13:48:11.000000000 +0000 +++ vte3-0.32.0/gnome-pty-helper/Makefile.in 2012-03-08 20:55:07.000000000 +0000 @@ -53,10 +53,14 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(libexecdir)" PROGRAMS = $(libexec_PROGRAMS) -am_gnome_pty_helper_OBJECTS = gnome-login-support.$(OBJEXT) \ - gnome-pty-helper.$(OBJEXT) gnome-utmp.$(OBJEXT) +am_gnome_pty_helper_OBJECTS = \ + gnome_pty_helper-gnome-login-support.$(OBJEXT) \ + gnome_pty_helper-gnome-pty-helper.$(OBJEXT) \ + gnome_pty_helper-gnome-utmp.$(OBJEXT) gnome_pty_helper_OBJECTS = $(am_gnome_pty_helper_OBJECTS) gnome_pty_helper_LDADD = $(LDADD) +gnome_pty_helper_LINK = $(CCLD) $(gnome_pty_helper_CFLAGS) $(CFLAGS) \ + $(gnome_pty_helper_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -124,6 +128,8 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SUID_CFLAGS = @SUID_CFLAGS@ +SUID_LDFLAGS = @SUID_LDFLAGS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -182,6 +188,8 @@ gnome-pty-helper.c \ gnome-utmp.c +gnome_pty_helper_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) +gnome_pty_helper_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) MAINTAINERCLEANFILES = \ $(srcdir)/INSTALL \ $(srcdir)/aclocal.m4 \ @@ -292,7 +300,7 @@ -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS) gnome-pty-helper$(EXEEXT): $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_DEPENDENCIES) @rm -f gnome-pty-helper$(EXEEXT) - $(LINK) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) + $(gnome_pty_helper_LINK) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -300,9 +308,9 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-login-support.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-pty-helper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-utmp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_pty_helper-gnome-login-support.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_pty_helper-gnome-pty-helper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_pty_helper-gnome-utmp.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -318,6 +326,48 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +gnome_pty_helper-gnome-login-support.o: gnome-login-support.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_pty_helper_CFLAGS) $(CFLAGS) -MT gnome_pty_helper-gnome-login-support.o -MD -MP -MF $(DEPDIR)/gnome_pty_helper-gnome-login-support.Tpo -c -o gnome_pty_helper-gnome-login-support.o `test -f 'gnome-login-support.c' || echo '$(srcdir)/'`gnome-login-support.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gnome_pty_helper-gnome-login-support.Tpo $(DEPDIR)/gnome_pty_helper-gnome-login-support.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnome-login-support.c' object='gnome_pty_helper-gnome-login-support.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_pty_helper_CFLAGS) $(CFLAGS) -c -o gnome_pty_helper-gnome-login-support.o `test -f 'gnome-login-support.c' || echo '$(srcdir)/'`gnome-login-support.c + +gnome_pty_helper-gnome-login-support.obj: gnome-login-support.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_pty_helper_CFLAGS) $(CFLAGS) -MT gnome_pty_helper-gnome-login-support.obj -MD -MP -MF $(DEPDIR)/gnome_pty_helper-gnome-login-support.Tpo -c -o gnome_pty_helper-gnome-login-support.obj `if test -f 'gnome-login-support.c'; then $(CYGPATH_W) 'gnome-login-support.c'; else $(CYGPATH_W) '$(srcdir)/gnome-login-support.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gnome_pty_helper-gnome-login-support.Tpo $(DEPDIR)/gnome_pty_helper-gnome-login-support.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnome-login-support.c' object='gnome_pty_helper-gnome-login-support.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_pty_helper_CFLAGS) $(CFLAGS) -c -o gnome_pty_helper-gnome-login-support.obj `if test -f 'gnome-login-support.c'; then $(CYGPATH_W) 'gnome-login-support.c'; else $(CYGPATH_W) '$(srcdir)/gnome-login-support.c'; fi` + +gnome_pty_helper-gnome-pty-helper.o: gnome-pty-helper.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_pty_helper_CFLAGS) $(CFLAGS) -MT gnome_pty_helper-gnome-pty-helper.o -MD -MP -MF $(DEPDIR)/gnome_pty_helper-gnome-pty-helper.Tpo -c -o gnome_pty_helper-gnome-pty-helper.o `test -f 'gnome-pty-helper.c' || echo '$(srcdir)/'`gnome-pty-helper.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gnome_pty_helper-gnome-pty-helper.Tpo $(DEPDIR)/gnome_pty_helper-gnome-pty-helper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnome-pty-helper.c' object='gnome_pty_helper-gnome-pty-helper.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_pty_helper_CFLAGS) $(CFLAGS) -c -o gnome_pty_helper-gnome-pty-helper.o `test -f 'gnome-pty-helper.c' || echo '$(srcdir)/'`gnome-pty-helper.c + +gnome_pty_helper-gnome-pty-helper.obj: gnome-pty-helper.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_pty_helper_CFLAGS) $(CFLAGS) -MT gnome_pty_helper-gnome-pty-helper.obj -MD -MP -MF $(DEPDIR)/gnome_pty_helper-gnome-pty-helper.Tpo -c -o gnome_pty_helper-gnome-pty-helper.obj `if test -f 'gnome-pty-helper.c'; then $(CYGPATH_W) 'gnome-pty-helper.c'; else $(CYGPATH_W) '$(srcdir)/gnome-pty-helper.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gnome_pty_helper-gnome-pty-helper.Tpo $(DEPDIR)/gnome_pty_helper-gnome-pty-helper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnome-pty-helper.c' object='gnome_pty_helper-gnome-pty-helper.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_pty_helper_CFLAGS) $(CFLAGS) -c -o gnome_pty_helper-gnome-pty-helper.obj `if test -f 'gnome-pty-helper.c'; then $(CYGPATH_W) 'gnome-pty-helper.c'; else $(CYGPATH_W) '$(srcdir)/gnome-pty-helper.c'; fi` + +gnome_pty_helper-gnome-utmp.o: gnome-utmp.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_pty_helper_CFLAGS) $(CFLAGS) -MT gnome_pty_helper-gnome-utmp.o -MD -MP -MF $(DEPDIR)/gnome_pty_helper-gnome-utmp.Tpo -c -o gnome_pty_helper-gnome-utmp.o `test -f 'gnome-utmp.c' || echo '$(srcdir)/'`gnome-utmp.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gnome_pty_helper-gnome-utmp.Tpo $(DEPDIR)/gnome_pty_helper-gnome-utmp.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnome-utmp.c' object='gnome_pty_helper-gnome-utmp.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_pty_helper_CFLAGS) $(CFLAGS) -c -o gnome_pty_helper-gnome-utmp.o `test -f 'gnome-utmp.c' || echo '$(srcdir)/'`gnome-utmp.c + +gnome_pty_helper-gnome-utmp.obj: gnome-utmp.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_pty_helper_CFLAGS) $(CFLAGS) -MT gnome_pty_helper-gnome-utmp.obj -MD -MP -MF $(DEPDIR)/gnome_pty_helper-gnome-utmp.Tpo -c -o gnome_pty_helper-gnome-utmp.obj `if test -f 'gnome-utmp.c'; then $(CYGPATH_W) 'gnome-utmp.c'; else $(CYGPATH_W) '$(srcdir)/gnome-utmp.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gnome_pty_helper-gnome-utmp.Tpo $(DEPDIR)/gnome_pty_helper-gnome-utmp.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnome-utmp.c' object='gnome_pty_helper-gnome-utmp.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_pty_helper_CFLAGS) $(CFLAGS) -c -o gnome_pty_helper-gnome-utmp.obj `if test -f 'gnome-utmp.c'; then $(CYGPATH_W) 'gnome-utmp.c'; else $(CYGPATH_W) '$(srcdir)/gnome-utmp.c'; fi` + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ diff -Nru vte3-0.31.0/gtk-doc.make vte3-0.32.0/gtk-doc.make --- vte3-0.31.0/gtk-doc.make 2011-11-21 13:48:12.000000000 +0000 +++ vte3-0.32.0/gtk-doc.make 2012-03-08 20:55:08.000000000 +0000 @@ -5,12 +5,12 @@ #################################### if GTK_DOC_USE_LIBTOOL -GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) GTKDOC_RUN = $(LIBTOOL) --mode=execute else -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) GTKDOC_RUN = endif @@ -23,16 +23,19 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) -EXTRA_DIST = \ +SETUP_FILES = \ $(content_files) \ - $(HTML_IMAGES) \ $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt -DOC_STAMPS=scan-build.stamp sgml-build.stamp html-build.stamp pdf-build.stamp \ - $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ - $(srcdir)/pdf.stamp +EXTRA_DIST = \ + $(HTML_IMAGES) \ + $(SETUP_FILES) + +DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ + sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -69,22 +72,45 @@ $(REPORT_FILES): sgml-build.stamp +#### setup #### + +setup-build.stamp: + -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + echo ' DOC Preparing build'; \ + files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + test -f $(abs_srcdir)/$$file && \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + done; \ + fi; \ + fi + @touch setup-build.stamp + + #### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ + @echo ' DOC Scanning header files' + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + echo " DOC Introspecting gobjects"; \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ + fi; \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ else \ - cd $(srcdir) ; \ for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ + test -f $$i || touch $$i ; \ done \ fi @touch scan-build.stamp @@ -94,14 +120,13 @@ #### xml #### -sgml-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) - @echo 'gtk-doc: Building XML' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) + @echo ' DOC Building XML' + @_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) @touch sgml-build.stamp sgml.stamp: sgml-build.stamp @@ -110,58 +135,78 @@ #### html #### html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/html - @mkdir $(srcdir)/html + @echo ' DOC Building HTML' + @rm -rf html + @mkdir html @mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ if test "$(?)" = "0"; then \ - mkhtml_options=--path="$(srcdir)"; \ + mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ - cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + -@test "x$(HTML_IMAGES)" = "x" || \ + for file in $(HTML_IMAGES) ; do \ + if test -f $(abs_srcdir)/$$file ; then \ + cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + fi; \ + if test -f $(abs_builddir)/$$file ; then \ + cp $(abs_builddir)/$$file $(abs_builddir)/html; \ + fi; \ + done; + @echo ' DOC Fixing cross-references' + @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) @touch html-build.stamp #### pdf #### pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building PDF' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/$(DOC_MODULE).pdf - @mkpdf_imgdirs=""; \ + @echo ' DOC Building PDF' + @rm -f $(DOC_MODULE).pdf + @mkpdf_options=""; \ + gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkpdf_options="$$mkpdf_options --verbose"; \ + fi; \ + fi; \ if test "x$(HTML_IMAGES)" != "x"; then \ for img in $(HTML_IMAGES); do \ part=`dirname $$img`; \ - echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ + echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ if test $$? != 0; then \ - mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ + mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ fi; \ done; \ fi; \ - cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) @touch pdf-build.stamp ############## clean-local: - rm -f *~ *.bak - rm -rf .libs + @rm -f *~ *.bak + @rm -rf .libs distclean-local: - cd $(srcdir) && \ - rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ + fi maintainer-clean-local: clean - cd $(srcdir) && rm -rf html + @rm -rf xml html install-data-local: - @installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ + @installfiles=`echo $(builddir)/html/*`; \ + if test "$$installfiles" = '$(builddir)/html/*'; \ + then echo 1>&2 'Nothing to install' ; \ else \ if test -n "$(DOC_MODULE_VERSION)"; then \ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ @@ -170,14 +215,12 @@ fi; \ $(mkinstalldirs) $${installdir} ; \ for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ + echo ' $(INSTALL_DATA) '$$i ; \ $(INSTALL_DATA) $$i $${installdir}; \ done; \ if test -n "$(DOC_MODULE_VERSION)"; then \ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ - mv -f $${installdir}/$(DOC_MODULE).devhelp \ - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ fi; \ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ fi @@ -202,12 +245,12 @@ endif dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/html - cp $(srcdir)/html/* $(distdir)/html - -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) - $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + @mkdir $(distdir)/html + @cp ./html/* $(distdir)/html + @-cp ./$(DOC_MODULE).pdf $(distdir)/ + @-cp ./$(DOC_MODULE).types $(distdir)/ + @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ + @cd $(distdir) && rm -f $(DISTCLEANFILES) + @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs diff -Nru vte3-0.31.0/ltmain.sh vte3-0.32.0/ltmain.sh --- vte3-0.31.0/ltmain.sh 2011-11-21 13:48:11.000000000 +0000 +++ vte3-0.32.0/ltmain.sh 2012-03-08 20:55:07.000000000 +0000 @@ -8050,7 +8050,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done diff -Nru vte3-0.31.0/Makefile.in vte3-0.32.0/Makefile.in --- vte3-0.31.0/Makefile.in 2011-11-21 13:48:20.000000000 +0000 +++ vte3-0.32.0/Makefile.in 2012-03-19 17:25:21.000000000 +0000 @@ -140,7 +140,10 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ +AM_CPPFLAGS = @AM_CPPFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_LDFLAGS = @AM_LDFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -171,6 +174,7 @@ GLADE_ICON_DIR = @GLADE_ICON_DIR@ GLADE_MODULE_DIR = @GLADE_MODULE_DIR@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -179,6 +183,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_API_VERSION = @GTK_API_VERSION@ @@ -257,7 +263,6 @@ VTE_API_VERSION = @VTE_API_VERSION@ VTE_API_VERSION_U = @VTE_API_VERSION_U@ VTE_CFLAGS = @VTE_CFLAGS@ -VTE_DEFAULT_EMULATION = @VTE_DEFAULT_EMULATION@ VTE_LDFLAGS = @VTE_LDFLAGS@ VTE_LIBRARY_SUFFIX_U = @VTE_LIBRARY_SUFFIX_U@ VTE_LIBS = @VTE_LIBS@ diff -Nru vte3-0.31.0/NEWS vte3-0.32.0/NEWS --- vte3-0.31.0/NEWS 2011-11-21 13:46:26.000000000 +0000 +++ vte3-0.32.0/NEWS 2012-03-19 17:22:01.000000000 +0000 @@ -1,3 +1,13 @@ +0.32.0 +====== +- Use GResource for our default termcap +- build fixes for interix (#652290) +- Allocate PTYs with openpty on BSD (#670758) +- Introspection fixes (#648183, #655402, #661716) +- Fix mouse whell scrolling with gtk+ 3.4 (#671305) +- Use correct library name for glade integration (#671760) +- gnome-pty-helper: Respect SUID_CFLAGS and SUID_LDFLAGS (#670732) + 0.31.0 ====== - Don't override the widget background colour diff -Nru vte3-0.31.0/perf/Makefile.in vte3-0.32.0/perf/Makefile.in --- vte3-0.31.0/perf/Makefile.in 2011-11-21 13:48:19.000000000 +0000 +++ vte3-0.32.0/perf/Makefile.in 2012-03-19 17:25:21.000000000 +0000 @@ -56,7 +56,10 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ +AM_CPPFLAGS = @AM_CPPFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_LDFLAGS = @AM_LDFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -87,6 +90,7 @@ GLADE_ICON_DIR = @GLADE_ICON_DIR@ GLADE_MODULE_DIR = @GLADE_MODULE_DIR@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -95,6 +99,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_API_VERSION = @GTK_API_VERSION@ @@ -173,7 +179,6 @@ VTE_API_VERSION = @VTE_API_VERSION@ VTE_API_VERSION_U = @VTE_API_VERSION_U@ VTE_CFLAGS = @VTE_CFLAGS@ -VTE_DEFAULT_EMULATION = @VTE_DEFAULT_EMULATION@ VTE_LDFLAGS = @VTE_LDFLAGS@ VTE_LIBRARY_SUFFIX_U = @VTE_LIBRARY_SUFFIX_U@ VTE_LIBS = @VTE_LIBS@ diff -Nru vte3-0.31.0/src/interpret.c vte3-0.32.0/src/interpret.c --- vte3-0.31.0/src/interpret.c 2011-11-21 13:41:46.000000000 +0000 +++ vte3-0.32.0/src/interpret.c 2012-03-10 15:55:12.000000000 +0000 @@ -72,10 +72,12 @@ g_type_init(); terminal = argv[1]; - termcap = _vte_termcap_new(g_build_filename(TERMCAPDIR, terminal, NULL)); - if (termcap == NULL) { - termcap = _vte_termcap_new("/etc/termcap"); - } + termcap = _vte_termcap_new(terminal); + if (termcap == NULL) { + g_printerr ("No termcap entry for '%s'\n", terminal); + return 1; + } + array = g_array_new(FALSE, FALSE, sizeof(gunichar)); matcher = _vte_matcher_new(terminal, termcap); diff -Nru vte3-0.31.0/src/Makefile.am vte3-0.32.0/src/Makefile.am --- vte3-0.31.0/src/Makefile.am 2011-11-21 13:41:46.000000000 +0000 +++ vte3-0.32.0/src/Makefile.am 2012-03-10 15:55:12.000000000 +0000 @@ -72,6 +72,7 @@ vtepty-private.h \ vteregex.c \ vteregex.h \ + vteresources.c \ vterowdata.c \ vterowdata.h \ vteseq.c \ @@ -93,10 +94,10 @@ libvte@VTE_LIBRARY_SUFFIX_U@_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Vte-$(VTE_API_VERSION)\" \ + -DVTE_API_VERSION=\"$(VTE_API_VERSION)\" \ -DDATADIR='"$(datadir)"' \ -DLIBEXECDIR='"$(libexecdir)"' \ -DLOCALEDIR='"$(localedir)"' \ - -DTERMCAPDIR='"$(pkgdatadir)/termcap-$(VTE_API_VERSION)"' \ -DVTE_COMPILATION \ $(AM_CPPFLAGS) @@ -113,10 +114,10 @@ # Generated sources VTESEQ_BUILTSOURCES = vteseq-list.h vteseq-2.c vteseq-n.c -BUILT_SOURCES = marshal.c marshal.h vtetypebuiltins.c vtetypebuiltins.h $(VTESEQ_BUILTSOURCES) +BUILT_SOURCES = marshal.c marshal.h vtetypebuiltins.c vtetypebuiltins.h vteresources.c $(VTESEQ_BUILTSOURCES) MAINTAINERCLEANFILES = $(VTESEQ_BUILTSOURCES) EXTRA_DIST += $(VTESEQ_BUILTSOURCES) -CLEANFILES = marshal.c marshal.h vtetypebuiltins.c vtetypebuiltins.h stamp-vtetypebuiltins.h +CLEANFILES = marshal.c marshal.h vtetypebuiltins.c vtetypebuiltins.h stamp-vtetypebuiltins.h vteresources.c marshal.c: marshal.list $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_vte_marshal --header --body --internal $< > $@ @@ -150,6 +151,8 @@ cat $^ | grep -v '^#' | grep '\'| sed 's/.*, //' | LANG=C sort -u >> $@.tmp && \ mv -f $@.tmp $@ +vteresources.c: vte.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies vte.gresource.xml) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir . --generate --c-name vte $< # vte the application @@ -171,6 +174,8 @@ Vte_@VTE_API_VERSION_U@_gir_INCLUDES = Pango-1.0 Gdk-$(GTK_API_VERSION) Gtk-$(GTK_API_VERSION) Vte_@VTE_API_VERSION_U@_gir_CFLAGS = $(VTE_CFLAGS) -DVTE_COMPILATION -I$(top_srcdir) Vte_@VTE_API_VERSION_U@_gir_LIBS = libvte@VTE_LIBRARY_SUFFIX_U@.la +Vte_@VTE_API_VERSION_U@_gir_EXPORT_PACKAGES = vte-$(VTE_API_VERSION) +Vte_@VTE_API_VERSION_U@_gir_SCANNERFLAGS = --c-include "vte/vte.h" Vte_@VTE_API_VERSION_U@_gir_FILES = \ vte.c \ vte.h \ @@ -182,10 +187,10 @@ INTROSPECTION_GIRS += Vte-$(VTE_API_VERSION).gir -girdir = $(INTROSPECTION_GIRDIR) +girdir = $(datadir)/gir-1.0 nodist_gir_DATA = $(INTROSPECTION_GIRS) -typelibdir = $(INTROSPECTION_TYPELIBDIR) +typelibdir = $(libdir)/girepository-1.0 nodist_typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(nodist_gir_DATA) $(nodist_typelib_DATA) @@ -233,14 +238,16 @@ trie.h \ vteconv.c \ vteconv.h \ + vteresources.c \ vtetc.c \ vtetc.h \ vtetree.c \ vtetree.h \ interpret.c interpret_CPPFLAGS = \ - -DINTERPRET_MAIN \ - -DTERMCAPDIR='"$(pkgdatadir)/termcap-$(VTE_API_VERSION)"' + -DINTERPRET_MAIN \ + -DVTE_API_VERSION=\"$(VTE_API_VERSION)\" \ + $(AM_CPPFLAGS) interpret_CFLAGS = $(GTK_CFLAGS) interpret_LDADD = $(GTK_LIBS) diff -Nru vte3-0.31.0/src/Makefile.in vte3-0.32.0/src/Makefile.in --- vte3-0.31.0/src/Makefile.in 2011-11-21 13:48:19.000000000 +0000 +++ vte3-0.32.0/src/Makefile.in 2012-03-19 17:25:21.000000000 +0000 @@ -49,7 +49,8 @@ TESTS = table$(EXEEXT) trie$(EXEEXT) $(TEST_SH) subdir = src DIST_COMMON = $(header_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/vteversion.h.in TODO + $(srcdir)/Makefile.in $(srcdir)/vte.gresource.xml.in \ + $(srcdir)/vteversion.h.in TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.in @@ -57,7 +58,7 @@ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = vteversion.h +CONFIG_CLEAN_FILES = vteversion.h vte.gresource.xml CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -104,6 +105,7 @@ libvte@VTE_LIBRARY_SUFFIX_U@_la-vteconv.lo \ libvte@VTE_LIBRARY_SUFFIX_U@_la-vtedraw.lo \ libvte@VTE_LIBRARY_SUFFIX_U@_la-vteregex.lo \ + libvte@VTE_LIBRARY_SUFFIX_U@_la-vteresources.lo \ libvte@VTE_LIBRARY_SUFFIX_U@_la-vterowdata.lo \ libvte@VTE_LIBRARY_SUFFIX_U@_la-vteseq.lo \ libvte@VTE_LIBRARY_SUFFIX_U@_la-vtestream.lo \ @@ -129,8 +131,8 @@ interpret-debug.$(OBJEXT) interpret-iso2022.$(OBJEXT) \ interpret-matcher.$(OBJEXT) interpret-table.$(OBJEXT) \ interpret-trie.$(OBJEXT) interpret-vteconv.$(OBJEXT) \ - interpret-vtetc.$(OBJEXT) interpret-vtetree.$(OBJEXT) \ - interpret-interpret.$(OBJEXT) + interpret-vteresources.$(OBJEXT) interpret-vtetc.$(OBJEXT) \ + interpret-vtetree.$(OBJEXT) interpret-interpret.$(OBJEXT) interpret_OBJECTS = $(am_interpret_OBJECTS) interpret_DEPENDENCIES = $(am__DEPENDENCIES_1) interpret_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -272,7 +274,10 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_CFLAGS = $(GLIB_CFLAGS) +AM_CPPFLAGS = @AM_CPPFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_LDFLAGS = @AM_LDFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -303,6 +308,7 @@ GLADE_ICON_DIR = @GLADE_ICON_DIR@ GLADE_MODULE_DIR = @GLADE_MODULE_DIR@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -311,6 +317,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_API_VERSION = @GTK_API_VERSION@ @@ -389,7 +397,6 @@ VTE_API_VERSION = @VTE_API_VERSION@ VTE_API_VERSION_U = @VTE_API_VERSION_U@ VTE_CFLAGS = @VTE_CFLAGS@ -VTE_DEFAULT_EMULATION = @VTE_DEFAULT_EMULATION@ VTE_LDFLAGS = @VTE_LDFLAGS@ VTE_LIBRARY_SUFFIX_U = @VTE_LIBRARY_SUFFIX_U@ VTE_LIBS = @VTE_LIBS@ @@ -523,6 +530,7 @@ vtepty-private.h \ vteregex.c \ vteregex.h \ + vteresources.c \ vterowdata.c \ vterowdata.h \ vteseq.c \ @@ -543,10 +551,10 @@ libvte@VTE_LIBRARY_SUFFIX_U@_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Vte-$(VTE_API_VERSION)\" \ + -DVTE_API_VERSION=\"$(VTE_API_VERSION)\" \ -DDATADIR='"$(datadir)"' \ -DLIBEXECDIR='"$(libexecdir)"' \ -DLOCALEDIR='"$(localedir)"' \ - -DTERMCAPDIR='"$(pkgdatadir)/termcap-$(VTE_API_VERSION)"' \ -DVTE_COMPILATION \ $(AM_CPPFLAGS) @@ -562,10 +570,10 @@ # Generated sources VTESEQ_BUILTSOURCES = vteseq-list.h vteseq-2.c vteseq-n.c -BUILT_SOURCES = marshal.c marshal.h vtetypebuiltins.c vtetypebuiltins.h $(VTESEQ_BUILTSOURCES) +BUILT_SOURCES = marshal.c marshal.h vtetypebuiltins.c vtetypebuiltins.h vteresources.c $(VTESEQ_BUILTSOURCES) MAINTAINERCLEANFILES = $(VTESEQ_BUILTSOURCES) CLEANFILES = marshal.c marshal.h vtetypebuiltins.c vtetypebuiltins.h \ - stamp-vtetypebuiltins.h $(am__append_2) + stamp-vtetypebuiltins.h vteresources.c $(am__append_2) vte@VTE_LIBRARY_SUFFIX_U@_SOURCES = vteapp.c vte@VTE_LIBRARY_SUFFIX_U@_CFLAGS = $(VTE_CFLAGS) vte@VTE_LIBRARY_SUFFIX_U@_LDADD = libvte@VTE_LIBRARY_SUFFIX_U@.la $(VTE_LIBS) @@ -577,6 +585,8 @@ @HAVE_INTROSPECTION_TRUE@Vte_@VTE_API_VERSION_U@_gir_INCLUDES = Pango-1.0 Gdk-$(GTK_API_VERSION) Gtk-$(GTK_API_VERSION) @HAVE_INTROSPECTION_TRUE@Vte_@VTE_API_VERSION_U@_gir_CFLAGS = $(VTE_CFLAGS) -DVTE_COMPILATION -I$(top_srcdir) @HAVE_INTROSPECTION_TRUE@Vte_@VTE_API_VERSION_U@_gir_LIBS = libvte@VTE_LIBRARY_SUFFIX_U@.la +@HAVE_INTROSPECTION_TRUE@Vte_@VTE_API_VERSION_U@_gir_EXPORT_PACKAGES = vte-$(VTE_API_VERSION) +@HAVE_INTROSPECTION_TRUE@Vte_@VTE_API_VERSION_U@_gir_SCANNERFLAGS = --c-include "vte/vte.h" @HAVE_INTROSPECTION_TRUE@Vte_@VTE_API_VERSION_U@_gir_FILES = \ @HAVE_INTROSPECTION_TRUE@ vte.c \ @HAVE_INTROSPECTION_TRUE@ vte.h \ @@ -586,13 +596,12 @@ @HAVE_INTROSPECTION_TRUE@ vtetypebuiltins.h \ @HAVE_INTROSPECTION_TRUE@ $(NULL) -@HAVE_INTROSPECTION_TRUE@girdir = $(INTROSPECTION_GIRDIR) +@HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0 @HAVE_INTROSPECTION_TRUE@nodist_gir_DATA = $(INTROSPECTION_GIRS) -@HAVE_INTROSPECTION_TRUE@typelibdir = $(INTROSPECTION_TYPELIBDIR) +@HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0 @HAVE_INTROSPECTION_TRUE@nodist_typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) noinst_SCRIPTS = decset osc window TEST_SH = check-doc-syntax.sh -AM_CFLAGS = $(GLIB_CFLAGS) LDADD = $(GLIB_LIBS) reflect_text_view_CPPFLAGS = -DUSE_TEXT_VIEW reflect_text_view_CFLAGS = $(VTE_CFLAGS) @@ -618,6 +627,7 @@ trie.h \ vteconv.c \ vteconv.h \ + vteresources.c \ vtetc.c \ vtetc.h \ vtetree.c \ @@ -625,8 +635,9 @@ interpret.c interpret_CPPFLAGS = \ - -DINTERPRET_MAIN \ - -DTERMCAPDIR='"$(pkgdatadir)/termcap-$(VTE_API_VERSION)"' + -DINTERPRET_MAIN \ + -DVTE_API_VERSION=\"$(VTE_API_VERSION)\" \ + $(AM_CPPFLAGS) interpret_CFLAGS = $(GTK_CFLAGS) interpret_LDADD = $(GTK_LIBS) @@ -746,6 +757,8 @@ $(am__aclocal_m4_deps): vteversion.h: $(top_builddir)/config.status $(srcdir)/vteversion.h.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +vte.gresource.xml: $(top_builddir)/config.status $(srcdir)/vte.gresource.xml.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @@ -901,6 +914,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interpret-table.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interpret-trie.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interpret-vteconv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interpret-vteresources.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interpret-vtetc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interpret-vtetree.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iso2022-caps.Po@am__quote@ @@ -930,6 +944,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvte@VTE_LIBRARY_SUFFIX_U@_la-vteconv.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvte@VTE_LIBRARY_SUFFIX_U@_la-vtedraw.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvte@VTE_LIBRARY_SUFFIX_U@_la-vteregex.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvte@VTE_LIBRARY_SUFFIX_U@_la-vteresources.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvte@VTE_LIBRARY_SUFFIX_U@_la-vterowdata.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvte@VTE_LIBRARY_SUFFIX_U@_la-vteseq-2.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvte@VTE_LIBRARY_SUFFIX_U@_la-vteseq-n.Plo@am__quote@ @@ -1128,6 +1143,14 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvte@VTE_LIBRARY_SUFFIX_U@_la_CPPFLAGS) $(CPPFLAGS) $(libvte@VTE_LIBRARY_SUFFIX_U@_la_CFLAGS) $(CFLAGS) -c -o libvte@VTE_LIBRARY_SUFFIX_U@_la-vteregex.lo `test -f 'vteregex.c' || echo '$(srcdir)/'`vteregex.c +libvte@VTE_LIBRARY_SUFFIX_U@_la-vteresources.lo: vteresources.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvte@VTE_LIBRARY_SUFFIX_U@_la_CPPFLAGS) $(CPPFLAGS) $(libvte@VTE_LIBRARY_SUFFIX_U@_la_CFLAGS) $(CFLAGS) -MT libvte@VTE_LIBRARY_SUFFIX_U@_la-vteresources.lo -MD -MP -MF $(DEPDIR)/libvte@VTE_LIBRARY_SUFFIX_U@_la-vteresources.Tpo -c -o libvte@VTE_LIBRARY_SUFFIX_U@_la-vteresources.lo `test -f 'vteresources.c' || echo '$(srcdir)/'`vteresources.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvte@VTE_LIBRARY_SUFFIX_U@_la-vteresources.Tpo $(DEPDIR)/libvte@VTE_LIBRARY_SUFFIX_U@_la-vteresources.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vteresources.c' object='libvte@VTE_LIBRARY_SUFFIX_U@_la-vteresources.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvte@VTE_LIBRARY_SUFFIX_U@_la_CPPFLAGS) $(CPPFLAGS) $(libvte@VTE_LIBRARY_SUFFIX_U@_la_CFLAGS) $(CFLAGS) -c -o libvte@VTE_LIBRARY_SUFFIX_U@_la-vteresources.lo `test -f 'vteresources.c' || echo '$(srcdir)/'`vteresources.c + libvte@VTE_LIBRARY_SUFFIX_U@_la-vterowdata.lo: vterowdata.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvte@VTE_LIBRARY_SUFFIX_U@_la_CPPFLAGS) $(CPPFLAGS) $(libvte@VTE_LIBRARY_SUFFIX_U@_la_CFLAGS) $(CFLAGS) -MT libvte@VTE_LIBRARY_SUFFIX_U@_la-vterowdata.lo -MD -MP -MF $(DEPDIR)/libvte@VTE_LIBRARY_SUFFIX_U@_la-vterowdata.Tpo -c -o libvte@VTE_LIBRARY_SUFFIX_U@_la-vterowdata.lo `test -f 'vterowdata.c' || echo '$(srcdir)/'`vterowdata.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvte@VTE_LIBRARY_SUFFIX_U@_la-vterowdata.Tpo $(DEPDIR)/libvte@VTE_LIBRARY_SUFFIX_U@_la-vterowdata.Plo @@ -1320,6 +1343,22 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(interpret_CPPFLAGS) $(CPPFLAGS) $(interpret_CFLAGS) $(CFLAGS) -c -o interpret-vteconv.obj `if test -f 'vteconv.c'; then $(CYGPATH_W) 'vteconv.c'; else $(CYGPATH_W) '$(srcdir)/vteconv.c'; fi` +interpret-vteresources.o: vteresources.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(interpret_CPPFLAGS) $(CPPFLAGS) $(interpret_CFLAGS) $(CFLAGS) -MT interpret-vteresources.o -MD -MP -MF $(DEPDIR)/interpret-vteresources.Tpo -c -o interpret-vteresources.o `test -f 'vteresources.c' || echo '$(srcdir)/'`vteresources.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/interpret-vteresources.Tpo $(DEPDIR)/interpret-vteresources.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vteresources.c' object='interpret-vteresources.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(interpret_CPPFLAGS) $(CPPFLAGS) $(interpret_CFLAGS) $(CFLAGS) -c -o interpret-vteresources.o `test -f 'vteresources.c' || echo '$(srcdir)/'`vteresources.c + +interpret-vteresources.obj: vteresources.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(interpret_CPPFLAGS) $(CPPFLAGS) $(interpret_CFLAGS) $(CFLAGS) -MT interpret-vteresources.obj -MD -MP -MF $(DEPDIR)/interpret-vteresources.Tpo -c -o interpret-vteresources.obj `if test -f 'vteresources.c'; then $(CYGPATH_W) 'vteresources.c'; else $(CYGPATH_W) '$(srcdir)/vteresources.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/interpret-vteresources.Tpo $(DEPDIR)/interpret-vteresources.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vteresources.c' object='interpret-vteresources.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(interpret_CPPFLAGS) $(CPPFLAGS) $(interpret_CFLAGS) $(CFLAGS) -c -o interpret-vteresources.obj `if test -f 'vteresources.c'; then $(CYGPATH_W) 'vteresources.c'; else $(CYGPATH_W) '$(srcdir)/vteresources.c'; fi` + interpret-vtetc.o: vtetc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(interpret_CPPFLAGS) $(CPPFLAGS) $(interpret_CFLAGS) $(CFLAGS) -MT interpret-vtetc.o -MD -MP -MF $(DEPDIR)/interpret-vtetc.Tpo -c -o interpret-vtetc.o `test -f 'vtetc.c' || echo '$(srcdir)/'`vtetc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/interpret-vtetc.Tpo $(DEPDIR)/interpret-vtetc.Po @@ -2308,6 +2347,9 @@ cat $^ | grep -v '^#' | grep '\'| sed 's/.*, //' | LANG=C sort -u >> $@.tmp && \ mv -f $@.tmp $@ +vteresources.c: vte.gresource.xml Makefile $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies vte.gresource.xml) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target $@ --sourcedir . --generate --c-name vte $< + @HAVE_INTROSPECTION_TRUE@Vte-@VTE_API_VERSION@.gir: libvte@VTE_LIBRARY_SUFFIX_U@.la # diff -Nru vte3-0.31.0/src/pty.c vte3-0.32.0/src/pty.c --- vte3-0.31.0/src/pty.c 2011-11-21 13:41:46.000000000 +0000 +++ vte3-0.32.0/src/pty.c 2012-03-10 15:55:12.000000000 +0000 @@ -54,6 +54,9 @@ #include #endif #include +#ifdef HAVE_UTIL_H +#include +#endif #ifdef HAVE_STROPTS_H #include #endif @@ -81,6 +84,12 @@ static int _vte_pty_helper_tunnel = -1; #endif +#if defined(HAVE_PTSNAME_R) || defined(HAVE_PTSNAME) || defined(TIOCGPTN) +#define HAVE_UNIX98_PTY +#else +#undef HAVE_UNIX98_PTY +#endif + /* Reset the handlers for all known signals to their defaults. The parent * (or one of the libraries it links to) may have changed one to be ignored. */ static void @@ -734,6 +743,8 @@ } } +#if defined(HAVE_UNIX98_PTY) + /* * _vte_pty_ptsname: * @master: file descriptor to the PTY master @@ -951,6 +962,44 @@ return TRUE; } +#elif defined(HAVE_OPENPTY) + +/* + * _vte_pty_open_bsd: + * @pty: a #VtePty + * @error: a location to store a #GError, or %NULL + * + * Opens new file descriptors to a new PTY master and slave. + * + * Returns: %TRUE on success, %FALSE on failure with @error filled in + */ +static gboolean +_vte_pty_open_bsd(VtePty *pty, + GError **error) +{ + VtePtyPrivate *priv = pty->priv; + int parentfd, childfd; + + if (openpty(&parentfd, &childfd, NULL, NULL, NULL) != 0) { + int errsv = errno; + g_set_error(error, VTE_PTY_ERROR, VTE_PTY_ERROR_PTY98_FAILED, + "%s failed: %s", "openpty", g_strerror(errsv)); + errno = errsv; + return FALSE; + } + + priv->pty_fd = parentfd; + priv->child_setup_data.mode = TTY_OPEN_BY_FD; + priv->child_setup_data.tty.fd = childfd; + priv->using_helper = FALSE; + + return TRUE; +} + +#else +#error Have neither UNIX98 PTY nor BSD openpty! +#endif /* HAVE_UNIX98_PTY */ + #ifdef VTE_USE_GNOME_PTY_HELPER #ifdef HAVE_RECVMSG static void @@ -1511,7 +1560,7 @@ } g_error_free(err); - /* Fall back to unix98 PTY */ + /* Fall back to unix98 or bsd PTY */ } #else if (priv->flags & VTE_PTY_NO_FALLBACK) { @@ -1521,7 +1570,13 @@ } #endif /* VTE_USE_GNOME_PTY_HELPER */ +#if defined(HAVE_UNIX98_PTY) ret = _vte_pty_open_unix98(pty, error); +#elif defined(HAVE_OPENPTY) + ret = _vte_pty_open_bsd(pty, error); +#else +#error Have neither UNIX98 PTY nor BSD openpty! +#endif out: _vte_debug_print(VTE_DEBUG_PTY, diff -Nru vte3-0.31.0/src/vte.c vte3-0.32.0/src/vte.c --- vte3-0.31.0/src/vte.c 2011-11-21 13:41:47.000000000 +0000 +++ vte3-0.32.0/src/vte.c 2012-03-10 15:55:12.000000000 +0000 @@ -63,6 +63,16 @@ #include #endif +#ifndef HAVE_ROUND +static inline double round(double x) { + if(x - floor(x) < 0.5) { + return floor(x); + } else { + return ceil(x); + } +} +#endif + #if GTK_CHECK_VERSION (2, 90, 7) #define GDK_KEY(symbol) GDK_KEY_##symbol #else @@ -82,8 +92,7 @@ static void vte_terminal_set_visibility (VteTerminal *terminal, GdkVisibilityState state); -static void vte_terminal_set_termcap(VteTerminal *terminal, const char *path, - gboolean reset); +static void vte_terminal_set_termcap(VteTerminal *terminal); static void vte_terminal_paste(VteTerminal *terminal, GdkAtom board); static void vte_terminal_real_copy_clipboard(VteTerminal *terminal); static void vte_terminal_real_paste_clipboard(VteTerminal *terminal); @@ -4615,7 +4624,7 @@ /** * vte_terminal_feed: * @terminal: a #VteTerminal - * @data: a string in the terminal's current encoding + * @data: (array length=length) (element-type guint8): a string in the terminal's current encoding * @length: the length of the string * * Interprets @data as if it were data received from a child process. This @@ -8192,7 +8201,7 @@ _vte_debug_print(VTE_DEBUG_MISC, "Setting emulation to `%s'...\n", emulation); /* Find and read the right termcap file. */ - vte_terminal_set_termcap(terminal, NULL, FALSE); + vte_terminal_set_termcap(terminal); /* Create a table to hold the control sequences. */ if (terminal->pvt->matcher != NULL) { @@ -8296,50 +8305,27 @@ /* Set the path to the termcap file we read, and read it in. */ static void -vte_terminal_set_termcap(VteTerminal *terminal, const char *path, - gboolean reset) +vte_terminal_set_termcap(VteTerminal *terminal) { GObject *object = G_OBJECT(terminal); - struct stat st; - char *wpath; - - if (path == NULL) { - wpath = g_build_filename(TERMCAPDIR, - terminal->pvt->emulation ? - terminal->pvt->emulation : - vte_terminal_get_default_emulation(terminal), - NULL); - if (g_stat(wpath, &st) != 0) { - g_free(wpath); - wpath = g_strdup("/etc/termcap"); - } - path = g_intern_string (wpath); - g_free(wpath); - } else { - path = g_intern_string (path); - } - if (path == terminal->pvt->termcap_path) { - return; - } + const char *emulation; g_object_freeze_notify(object); - terminal->pvt->termcap_path = path; + emulation = terminal->pvt->emulation ? terminal->pvt->emulation + : vte_terminal_get_default_emulation(terminal); _vte_debug_print(VTE_DEBUG_MISC, "Loading termcap `%s'...", - terminal->pvt->termcap_path); + emulation); if (terminal->pvt->termcap != NULL) { _vte_termcap_free(terminal->pvt->termcap); } - terminal->pvt->termcap = _vte_termcap_new(terminal->pvt->termcap_path); + terminal->pvt->termcap = _vte_termcap_new(emulation); _vte_debug_print(VTE_DEBUG_MISC, "\n"); if (terminal->pvt->termcap == NULL) { _vte_terminal_inline_error_message(terminal, - "Failed to load terminal capabilities from '%s'", - terminal->pvt->termcap_path); - } - if (reset) { - vte_terminal_set_emulation(terminal, terminal->pvt->emulation); + "Failed to load terminal capabilities for '%s'", + emulation); } g_object_thaw_notify(object); @@ -9089,6 +9075,7 @@ GDK_EXPOSURE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | + GDK_SCROLL_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | diff -Nru vte3-0.31.0/src/vte.gresource.xml.in vte3-0.32.0/src/vte.gresource.xml.in --- vte3-0.31.0/src/vte.gresource.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ vte3-0.32.0/src/vte.gresource.xml.in 2012-03-10 15:55:12.000000000 +0000 @@ -0,0 +1,22 @@ + + + + + @top_srcdir@/termcaps/xterm + + diff -Nru vte3-0.31.0/src/vte-private.h vte3-0.32.0/src/vte-private.h --- vte3-0.31.0/src/vte-private.h 2011-11-21 13:41:47.000000000 +0000 +++ vte3-0.32.0/src/vte-private.h 2012-03-10 15:55:12.000000000 +0000 @@ -152,7 +152,6 @@ /* Emulation setup data. */ struct _vte_termcap *termcap; /* termcap storage */ struct _vte_matcher *matcher; /* control sequence matcher */ - const char *termcap_path; /* path to termcap file */ const char *emulation; /* terminal type to emulate */ struct vte_terminal_flags { /* boolean termcap flags */ gboolean am; diff -Nru vte3-0.31.0/src/vteresources.c vte3-0.32.0/src/vteresources.c --- vte3-0.31.0/src/vteresources.c 1970-01-01 00:00:00.000000000 +0000 +++ vte3-0.32.0/src/vteresources.c 2012-03-19 17:25:33.000000000 +0000 @@ -0,0 +1,371 @@ +#include + +#if defined (__ELF__) && ( __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6)) +# define SECTION __attribute__ ((section (".gresource.vte"), aligned (8))) +#else +# define SECTION +#endif + +static const SECTION union { const guint8 data[1900]; const double alignment; void * const ptr;} vte_resource_data = { { + 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x28, 0x07, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, 0x4b, 0x50, 0x90, 0x0b, + 0x03, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x4c, 0x00, 0xe8, 0x00, 0x00, 0x00, + 0xec, 0x00, 0x00, 0x00, 0x46, 0x53, 0xd6, 0x7c, + 0x04, 0x00, 0x00, 0x00, 0xec, 0x00, 0x00, 0x00, + 0x05, 0x00, 0x4c, 0x00, 0xf4, 0x00, 0x00, 0x00, + 0xf8, 0x00, 0x00, 0x00, 0xc1, 0x22, 0xe7, 0xa3, + 0x01, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x4c, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x04, 0x01, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, + 0xff, 0xff, 0xff, 0xff, 0x04, 0x01, 0x00, 0x00, + 0x01, 0x00, 0x4c, 0x00, 0x08, 0x01, 0x00, 0x00, + 0x0c, 0x01, 0x00, 0x00, 0x0e, 0xbf, 0x5b, 0x9e, + 0x06, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, + 0x04, 0x00, 0x4c, 0x00, 0x10, 0x01, 0x00, 0x00, + 0x14, 0x01, 0x00, 0x00, 0x91, 0xd8, 0x9c, 0x46, + 0x02, 0x00, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00, + 0x05, 0x00, 0x76, 0x00, 0x20, 0x01, 0x00, 0x00, + 0x60, 0x07, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30, + 0x00, 0x00, 0x00, 0x00, 0x60, 0x07, 0x00, 0x00, + 0x06, 0x00, 0x4c, 0x00, 0x68, 0x07, 0x00, 0x00, + 0x6c, 0x07, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, + 0x06, 0x00, 0x00, 0x00, 0x32, 0x2e, 0x39, 0x30, + 0x2f, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x74, 0x65, 0x72, 0x6d, 0x63, 0x61, 0x70, 0x2f, + 0x05, 0x00, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x76, 0x74, 0x65, 0x2f, + 0x01, 0x00, 0x00, 0x00, 0x78, 0x74, 0x65, 0x72, + 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x30, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x23, 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x69, + 0x73, 0x20, 0x61, 0x20, 0x63, 0x75, 0x74, 0x2d, + 0x64, 0x6f, 0x77, 0x6e, 0x20, 0x76, 0x65, 0x72, + 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, + 0x74, 0x68, 0x65, 0x20, 0x74, 0x65, 0x72, 0x6d, + 0x63, 0x61, 0x70, 0x20, 0x66, 0x69, 0x6c, 0x65, + 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x6d, 0x79, + 0x20, 0x62, 0x6f, 0x78, 0x20, 0x77, 0x69, 0x74, + 0x68, 0x20, 0x73, 0x6f, 0x6d, 0x65, 0x20, 0x65, + 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x0a, 0x23, + 0x20, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, + 0x20, 0x28, 0x61, 0x64, 0x64, 0x20, 0x74, 0x68, + 0x65, 0x6d, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x20, + 0x69, 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x6f, 0x76, + 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x74, 0x65, 0x72, 0x6d, 0x69, + 0x6e, 0x61, 0x6c, 0x27, 0x73, 0x20, 0x62, 0x65, + 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x29, 0x3a, + 0x0a, 0x23, 0x20, 0x6b, 0x49, 0x20, 0x28, 0x49, + 0x6e, 0x73, 0x65, 0x72, 0x74, 0x2c, 0x20, 0x44, + 0x65, 0x6c, 0x65, 0x74, 0x65, 0x20, 0x69, 0x73, + 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x64, + 0x20, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d, + 0x6d, 0x61, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x6c, + 0x79, 0x29, 0x0a, 0x23, 0x20, 0x6b, 0x50, 0x2f, + 0x6b, 0x4e, 0x20, 0x28, 0x50, 0x61, 0x67, 0x65, + 0x20, 0x55, 0x70, 0x2c, 0x20, 0x50, 0x61, 0x67, + 0x65, 0x20, 0x44, 0x6f, 0x77, 0x6e, 0x29, 0x0a, + 0x23, 0x20, 0x6b, 0x75, 0x2f, 0x6b, 0x64, 0x2f, + 0x6b, 0x6c, 0x2f, 0x6b, 0x72, 0x20, 0x28, 0x55, + 0x70, 0x2c, 0x20, 0x44, 0x6f, 0x77, 0x6e, 0x2c, + 0x20, 0x4c, 0x65, 0x66, 0x74, 0x2c, 0x20, 0x52, + 0x69, 0x67, 0x68, 0x74, 0x29, 0x0a, 0x23, 0x20, + 0x6b, 0x31, 0x2f, 0x6b, 0x64, 0x32, 0x2f, 0x6b, + 0x33, 0x2f, 0x6b, 0x34, 0x2f, 0x6b, 0x35, 0x2f, + 0x6b, 0x36, 0x2f, 0x6b, 0x37, 0x2f, 0x6b, 0x38, + 0x2f, 0x6b, 0x39, 0x2f, 0x6b, 0x3b, 0x20, 0x28, + 0x46, 0x31, 0x2d, 0x46, 0x31, 0x30, 0x29, 0x0a, + 0x23, 0x20, 0x4b, 0x31, 0x2f, 0x4b, 0x32, 0x2f, + 0x4b, 0x33, 0x2f, 0x4b, 0x34, 0x2f, 0x4b, 0x35, + 0x20, 0x28, 0x4b, 0x50, 0x20, 0x55, 0x70, 0x2c, + 0x20, 0x44, 0x6f, 0x77, 0x6e, 0x2c, 0x20, 0x4c, + 0x65, 0x66, 0x74, 0x2c, 0x20, 0x52, 0x69, 0x67, + 0x68, 0x74, 0x2c, 0x20, 0x42, 0x65, 0x67, 0x69, + 0x6e, 0x29, 0x0a, 0x78, 0x74, 0x65, 0x72, 0x6d, + 0x2d, 0x78, 0x66, 0x72, 0x65, 0x65, 0x38, 0x36, + 0x7c, 0x78, 0x74, 0x65, 0x72, 0x6d, 0x2d, 0x6e, + 0x65, 0x77, 0x7c, 0x78, 0x74, 0x65, 0x72, 0x6d, + 0x20, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, + 0x6c, 0x20, 0x65, 0x6d, 0x75, 0x6c, 0x61, 0x74, + 0x6f, 0x72, 0x20, 0x28, 0x58, 0x46, 0x72, 0x65, + 0x65, 0x38, 0x36, 0x29, 0x3a, 0x5c, 0x0a, 0x09, + 0x3a, 0x61, 0x6d, 0x3a, 0x6b, 0x6d, 0x3a, 0x6d, + 0x69, 0x3a, 0x6d, 0x73, 0x3a, 0x78, 0x6e, 0x3a, + 0x5c, 0x0a, 0x09, 0x3a, 0x63, 0x6f, 0x23, 0x38, + 0x30, 0x3a, 0x69, 0x74, 0x23, 0x38, 0x3a, 0x6c, + 0x69, 0x23, 0x32, 0x34, 0x3a, 0x5c, 0x0a, 0x09, + 0x3a, 0x41, 0x4c, 0x3d, 0x5c, 0x45, 0x5b, 0x25, + 0x64, 0x4c, 0x3a, 0x44, 0x43, 0x3d, 0x5c, 0x45, + 0x5b, 0x25, 0x64, 0x50, 0x3a, 0x44, 0x4c, 0x3d, + 0x5c, 0x45, 0x5b, 0x25, 0x64, 0x4d, 0x3a, 0x44, + 0x4f, 0x3d, 0x5c, 0x45, 0x5b, 0x25, 0x64, 0x42, + 0x3a, 0x49, 0x43, 0x3d, 0x5c, 0x45, 0x5b, 0x25, + 0x64, 0x40, 0x3a, 0x5c, 0x0a, 0x09, 0x3a, 0x4c, + 0x45, 0x3d, 0x5c, 0x45, 0x5b, 0x25, 0x64, 0x44, + 0x3a, 0x5c, 0x0a, 0x09, 0x3a, 0x52, 0x49, 0x3d, + 0x5c, 0x45, 0x5b, 0x25, 0x64, 0x43, 0x3a, 0x55, + 0x50, 0x3d, 0x5c, 0x45, 0x5b, 0x25, 0x64, 0x41, + 0x3a, 0x61, 0x65, 0x3d, 0x5e, 0x4f, 0x3a, 0x61, + 0x6c, 0x3d, 0x5c, 0x45, 0x5b, 0x4c, 0x3a, 0x61, + 0x73, 0x3d, 0x5e, 0x4e, 0x3a, 0x62, 0x6c, 0x3d, + 0x5e, 0x47, 0x3a, 0x62, 0x74, 0x3d, 0x5c, 0x45, + 0x5b, 0x5a, 0x3a, 0x5c, 0x0a, 0x09, 0x3a, 0x63, + 0x64, 0x3d, 0x5c, 0x45, 0x5b, 0x4a, 0x3a, 0x63, + 0x65, 0x3d, 0x5c, 0x45, 0x5b, 0x4b, 0x3a, 0x63, + 0x6c, 0x3d, 0x5c, 0x45, 0x5b, 0x48, 0x5c, 0x45, + 0x5b, 0x32, 0x4a, 0x3a, 0x63, 0x6d, 0x3d, 0x5c, + 0x45, 0x5b, 0x25, 0x69, 0x25, 0x64, 0x3b, 0x25, + 0x64, 0x48, 0x3a, 0x63, 0x72, 0x3d, 0x5e, 0x4d, + 0x3a, 0x5c, 0x0a, 0x09, 0x3a, 0x63, 0x73, 0x3d, + 0x5c, 0x45, 0x5b, 0x25, 0x69, 0x25, 0x64, 0x3b, + 0x25, 0x64, 0x72, 0x3a, 0x63, 0x74, 0x3d, 0x5c, + 0x45, 0x5b, 0x33, 0x67, 0x3a, 0x64, 0x63, 0x3d, + 0x5c, 0x45, 0x5b, 0x50, 0x3a, 0x64, 0x6c, 0x3d, + 0x5c, 0x45, 0x5b, 0x4d, 0x3a, 0x64, 0x6f, 0x3d, + 0x5e, 0x4a, 0x3a, 0x65, 0x63, 0x3d, 0x5c, 0x45, + 0x5b, 0x25, 0x64, 0x58, 0x3a, 0x5c, 0x0a, 0x09, + 0x3a, 0x65, 0x69, 0x3d, 0x5c, 0x45, 0x5b, 0x34, + 0x6c, 0x3a, 0x68, 0x6f, 0x3d, 0x5c, 0x45, 0x5b, + 0x48, 0x3a, 0x69, 0x6d, 0x3d, 0x5c, 0x45, 0x5b, + 0x34, 0x68, 0x3a, 0x69, 0x73, 0x3d, 0x5c, 0x45, + 0x5b, 0x21, 0x70, 0x5c, 0x45, 0x5b, 0x3f, 0x33, + 0x3b, 0x34, 0x6c, 0x5c, 0x45, 0x5b, 0x34, 0x6c, + 0x5c, 0x45, 0x3e, 0x3a, 0x5c, 0x0a, 0x09, 0x3a, + 0x6b, 0x44, 0x3d, 0x5c, 0x31, 0x37, 0x37, 0x3a, + 0x5c, 0x0a, 0x09, 0x3a, 0x6b, 0x62, 0x3d, 0x5e, + 0x48, 0x3a, 0x6b, 0x65, 0x3d, 0x5c, 0x45, 0x5b, + 0x3f, 0x31, 0x6c, 0x5c, 0x45, 0x3e, 0x3a, 0x5c, + 0x0a, 0x09, 0x3a, 0x6b, 0x73, 0x3d, 0x5c, 0x45, + 0x5b, 0x3f, 0x31, 0x68, 0x5c, 0x45, 0x3d, 0x3a, + 0x6c, 0x65, 0x3d, 0x5e, 0x48, 0x3a, 0x6d, 0x62, + 0x3d, 0x5c, 0x45, 0x5b, 0x35, 0x6d, 0x3a, 0x6d, + 0x64, 0x3d, 0x5c, 0x45, 0x5b, 0x31, 0x6d, 0x3a, + 0x5c, 0x0a, 0x09, 0x3a, 0x6d, 0x65, 0x3d, 0x5c, + 0x45, 0x5b, 0x6d, 0x5c, 0x30, 0x31, 0x37, 0x3a, + 0x6d, 0x72, 0x3d, 0x5c, 0x45, 0x5b, 0x37, 0x6d, + 0x3a, 0x6e, 0x64, 0x3d, 0x5c, 0x45, 0x5b, 0x43, + 0x3a, 0x72, 0x63, 0x3d, 0x5c, 0x45, 0x38, 0x3a, + 0x73, 0x63, 0x3d, 0x5c, 0x45, 0x37, 0x3a, 0x73, + 0x65, 0x3d, 0x5c, 0x45, 0x5b, 0x32, 0x37, 0x6d, + 0x3a, 0x5c, 0x0a, 0x09, 0x3a, 0x73, 0x66, 0x3d, + 0x5e, 0x4a, 0x3a, 0x73, 0x6f, 0x3d, 0x5c, 0x45, + 0x5b, 0x37, 0x6d, 0x3a, 0x73, 0x72, 0x3d, 0x5c, + 0x45, 0x4d, 0x3a, 0x73, 0x74, 0x3d, 0x5c, 0x45, + 0x48, 0x3a, 0x74, 0x61, 0x3d, 0x5e, 0x49, 0x3a, + 0x74, 0x65, 0x3d, 0x5c, 0x45, 0x5b, 0x3f, 0x31, + 0x30, 0x34, 0x37, 0x6c, 0x5c, 0x45, 0x5b, 0x3f, + 0x31, 0x30, 0x34, 0x38, 0x6c, 0x3a, 0x5c, 0x0a, + 0x09, 0x3a, 0x74, 0x69, 0x3d, 0x5c, 0x45, 0x5b, + 0x3f, 0x31, 0x30, 0x34, 0x38, 0x68, 0x5c, 0x45, + 0x5b, 0x3f, 0x31, 0x30, 0x34, 0x37, 0x68, 0x3a, + 0x75, 0x65, 0x3d, 0x5c, 0x45, 0x5b, 0x32, 0x34, + 0x6d, 0x3a, 0x75, 0x70, 0x3d, 0x5c, 0x45, 0x5b, + 0x41, 0x3a, 0x75, 0x73, 0x3d, 0x5c, 0x45, 0x5b, + 0x34, 0x6d, 0x3a, 0x5c, 0x0a, 0x09, 0x3a, 0x76, + 0x62, 0x3d, 0x5c, 0x45, 0x5b, 0x3f, 0x35, 0x68, + 0x5c, 0x45, 0x5b, 0x3f, 0x35, 0x6c, 0x3a, 0x76, + 0x65, 0x3d, 0x5c, 0x45, 0x5b, 0x3f, 0x32, 0x35, + 0x68, 0x3a, 0x76, 0x69, 0x3d, 0x5c, 0x45, 0x5b, + 0x3f, 0x32, 0x35, 0x6c, 0x3a, 0x76, 0x73, 0x3d, + 0x5c, 0x45, 0x5b, 0x3f, 0x32, 0x35, 0x68, 0x3a, + 0x0a, 0x23, 0x20, 0x78, 0x74, 0x65, 0x72, 0x6d, + 0x2d, 0x72, 0x65, 0x64, 0x68, 0x61, 0x74, 0x20, + 0x69, 0x73, 0x20, 0x69, 0x64, 0x65, 0x6e, 0x74, + 0x69, 0x63, 0x61, 0x6c, 0x20, 0x74, 0x6f, 0x20, + 0x78, 0x74, 0x65, 0x72, 0x6d, 0x2d, 0x78, 0x66, + 0x72, 0x65, 0x65, 0x38, 0x36, 0x20, 0x77, 0x69, + 0x74, 0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, + 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20, + 0x6f, 0x66, 0x20, 0x61, 0x20, 0x73, 0x6d, 0x61, + 0x6c, 0x6c, 0x0a, 0x23, 0x20, 0x56, 0x54, 0x32, + 0x32, 0x30, 0x2d, 0x69, 0x73, 0x6d, 0x20, 0x72, + 0x65, 0x67, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, + 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x61, 0x63, + 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x20, 0x61, + 0x6e, 0x64, 0x20, 0x64, 0x65, 0x6c, 0x65, 0x74, + 0x65, 0x20, 0x6b, 0x65, 0x79, 0x73, 0x3b, 0x20, + 0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, + 0x6d, 0x61, 0x6e, 0x64, 0x61, 0x74, 0x65, 0x64, + 0x20, 0x62, 0x79, 0x0a, 0x23, 0x20, 0x74, 0x68, + 0x65, 0x20, 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, + 0x72, 0x64, 0x20, 0x63, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, + 0x44, 0x65, 0x62, 0x69, 0x61, 0x6e, 0x20, 0x50, + 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x20, 0x4d, 0x61, + 0x6e, 0x75, 0x61, 0x6c, 0x2e, 0x0a, 0x78, 0x74, + 0x65, 0x72, 0x6d, 0x2d, 0x72, 0x65, 0x64, 0x68, + 0x61, 0x74, 0x7c, 0x52, 0x65, 0x64, 0x20, 0x48, + 0x61, 0x74, 0x20, 0x78, 0x74, 0x65, 0x72, 0x6d, + 0x20, 0x28, 0x62, 0x61, 0x63, 0x6b, 0x73, 0x70, + 0x61, 0x63, 0x65, 0x20, 0x61, 0x6e, 0x64, 0x20, + 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x20, 0x63, + 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x29, 0x3a, + 0x5c, 0x0a, 0x09, 0x3a, 0x6b, 0x44, 0x3d, 0x5c, + 0x45, 0x5b, 0x33, 0x7e, 0x3a, 0x6b, 0x62, 0x3d, + 0x5c, 0x31, 0x37, 0x37, 0x3a, 0x74, 0x63, 0x3d, + 0x78, 0x74, 0x65, 0x72, 0x6d, 0x2d, 0x78, 0x66, + 0x72, 0x65, 0x65, 0x38, 0x36, 0x3a, 0x0a, 0x23, + 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, + 0x20, 0x74, 0x68, 0x65, 0x20, 0x6f, 0x6e, 0x6c, + 0x79, 0x20, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x20, + 0x77, 0x68, 0x69, 0x63, 0x68, 0x20, 0x79, 0x6f, + 0x75, 0x20, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, + 0x20, 0x68, 0x61, 0x76, 0x65, 0x20, 0x74, 0x6f, + 0x20, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x69, + 0x7a, 0x65, 0x2c, 0x20, 0x73, 0x69, 0x6e, 0x63, + 0x65, 0x20, 0x22, 0x78, 0x74, 0x65, 0x72, 0x6d, + 0x22, 0x0a, 0x23, 0x20, 0x69, 0x73, 0x20, 0x77, + 0x69, 0x64, 0x65, 0x6c, 0x79, 0x20, 0x75, 0x73, + 0x65, 0x64, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x61, + 0x20, 0x76, 0x61, 0x72, 0x69, 0x65, 0x74, 0x79, + 0x20, 0x6f, 0x66, 0x20, 0x69, 0x6e, 0x63, 0x6f, + 0x6d, 0x70, 0x61, 0x74, 0x69, 0x62, 0x6c, 0x65, + 0x20, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, + 0x6c, 0x20, 0x65, 0x6d, 0x75, 0x6c, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x69, 0x6e, 0x63, + 0x6c, 0x75, 0x64, 0x69, 0x6e, 0x67, 0x0a, 0x23, + 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x78, + 0x74, 0x65, 0x72, 0x6d, 0x20, 0x61, 0x6e, 0x64, + 0x20, 0x72, 0x78, 0x76, 0x74, 0x2e, 0x0a, 0x78, + 0x74, 0x65, 0x72, 0x6d, 0x7c, 0x58, 0x31, 0x31, + 0x20, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, + 0x6c, 0x20, 0x65, 0x6d, 0x75, 0x6c, 0x61, 0x74, + 0x6f, 0x72, 0x3a, 0x5c, 0x0a, 0x09, 0x3a, 0x74, + 0x63, 0x3d, 0x78, 0x74, 0x65, 0x72, 0x6d, 0x2d, + 0x72, 0x65, 0x64, 0x68, 0x61, 0x74, 0x3a, 0x0a, + 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, + 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00 +} }; + +static GStaticResource static_resource = { vte_resource_data.data, sizeof (vte_resource_data.data) }; +extern GResource *vte_get_resource (void); +GResource *vte_get_resource (void) +{ + return g_static_resource_get_resource (&static_resource); +} +/* + If G_HAS_CONSTRUCTORS is true then the compiler support *both* constructors and + destructors, in a sane way, including e.g. on library unload. If not you're on + your own. + + Some compilers need #pragma to handle this, which does not work with macros, + so the way you need to use this is (for constructors): + + #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA + #pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(my_constructor) + #endif + G_DEFINE_CONSTRUCTOR(my_constructor) + static void my_constructor(void) { + ... + } + +*/ + +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) + +#define G_HAS_CONSTRUCTORS 1 + +#define G_DEFINE_CONSTRUCTOR(_func) static void __attribute__((constructor)) _func (void); +#define G_DEFINE_DESTRUCTOR(_func) static void __attribute__((destructor)) _func (void); + +#elif defined (_MSC_VER) && (_MSC_VER >= 1500) +/* Visual studio 2008 and later has _Pragma */ + +#define G_HAS_CONSTRUCTORS 1 + +#define G_DEFINE_CONSTRUCTOR(_func) \ + static void _func(void); \ + static int _func ## _wrapper(void) { _func(); return 0; } \ + __pragma(section(".CRT$XCU",read)) \ + __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _wrapper; + +#define G_DEFINE_DESTRUCTOR(_func) \ + static void _func(void); \ + static int _func ## _constructor(void) { atexit (_func); return 0; } \ + __pragma(section(".CRT$XCU",read)) \ + __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor; + +#elif defined (_MSC_VER) + +#define G_HAS_CONSTRUCTORS 1 + +/* Pre Visual studio 2008 must use #pragma section */ +#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1 +#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1 + +#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \ + section(".CRT$XCU",read) +#define G_DEFINE_CONSTRUCTOR(_func) \ + static void _func(void); \ + static int _func ## _wrapper(void) { _func(); return 0; } \ + __declspec(allocate(".CRT$XCU")) static int (*p)(void) = _func ## _wrapper; + +#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \ + section(".CRT$XCU",read) +#define G_DEFINE_DESTRUCTOR(_func) \ + static void _func(void); \ + static int _func ## _constructor(void) { atexit (_func); return 0; } \ + __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor; + +#elif defined(__SUNPRO_C) + +/* This is not tested, but i believe it should work, based on: + * http://opensource.apple.com/source/OpenSSL098/OpenSSL098-35/src/fips/fips_premain.c + */ + +#define G_HAS_CONSTRUCTORS 1 + +#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1 +#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1 + +#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \ + init(_func) +#define G_DEFINE_CONSTRUCTOR(_func) \ + static void _func(void); + +#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \ + fini(_func) +#define G_DEFINE_DESTRUCTOR(_func) \ + static void _func(void); + +#else + +/* constructors not supported for this compiler */ + +#endif + + +#ifdef G_HAS_CONSTRUCTORS + +#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA +#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(resource_constructor) +#endif +G_DEFINE_CONSTRUCTOR(resource_constructor) +#ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA +#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(resource_destructor) +#endif +G_DEFINE_DESTRUCTOR(resource_destructor) + +#else +#warning "Constructor not supported on this compiler, linking in resources will not work" +#endif + +static void resource_constructor (void) +{ + g_static_resource_init (&static_resource); +} + +static void resource_destructor (void) +{ + g_static_resource_fini (&static_resource); +} diff -Nru vte3-0.31.0/src/vtetc.c vte3-0.32.0/src/vtetc.c --- vte3-0.31.0/src/vtetc.c 2011-11-21 13:41:47.000000000 +0000 +++ vte3-0.32.0/src/vtetc.c 2012-03-10 15:55:12.000000000 +0000 @@ -20,6 +20,7 @@ #include #include #include +#include #include "vtetc.h" @@ -28,7 +29,7 @@ */ typedef struct _vte_termcap { - GMappedFile *file; + GBytes *data; GTree *tree; const char *end; } VteTermcap; @@ -470,35 +471,71 @@ } static VteTermcap * -_vte_termcap_create (const char *filename) +_vte_termcap_new_take_bytes (GBytes *data) { - const char *contents; VteTermcap *termcap; - GMappedFile *file; - int length; - - file = g_mapped_file_new (filename, FALSE, NULL); - if (file == NULL) - return NULL; + const char *contents; + gsize length; - contents = g_mapped_file_get_contents (file); - length = g_mapped_file_get_length (file); + contents = g_bytes_get_data (data, &length); termcap = g_slice_new (VteTermcap); - termcap->file = file; + termcap->data = data; /* adopted */ termcap->tree = _vte_termcap_parse_file (contents, length); termcap->end = contents + length; return termcap; } +static VteTermcap * +_vte_termcap_new_from_file (const char *path) +{ + GMappedFile *file; + GBytes *data; + + file = g_mapped_file_new (path, FALSE, NULL); + if (file == NULL) + return NULL; + + data = g_bytes_new_with_free_func (g_mapped_file_get_contents (file), + g_mapped_file_get_length (file), + (GDestroyNotify) g_mapped_file_unref, + file); + + return _vte_termcap_new_take_bytes (data); +} + +static VteTermcap * +_vte_termcap_create (const char *name) +{ +#ifdef VTE_API_VERSION + char *path; + GBytes *data; + + /* First try the builtin termcaps */ + path = g_build_path ("/", + "/org/gnome/vte", + VTE_API_VERSION, + "termcap", + name, + NULL); + data = g_resources_lookup_data (path, G_RESOURCE_LOOKUP_FLAGS_NONE, NULL); + g_free(path); + if (data != NULL) + return _vte_termcap_new_take_bytes (data); +#endif /* VTE_API_VERSION */ + + /* Try /etc/termcap */ + return _vte_termcap_new_from_file ("/etc/termcap"); +} + static void _vte_termcap_destroy (VteTermcap *termcap) { if (!termcap) return; g_tree_destroy (termcap->tree); - g_mapped_file_unref (termcap->file); + g_bytes_unref (termcap->data); g_slice_free (VteTermcap, termcap); } @@ -509,7 +546,7 @@ static GCache *_vte_termcap_cache = NULL; VteTermcap * -_vte_termcap_new(const char *filename) +_vte_termcap_new(const char *name) { VteTermcap *result; @@ -522,7 +559,7 @@ (GCacheDestroyFunc) g_free, g_str_hash, g_direct_hash, g_str_equal); - result = g_cache_insert (_vte_termcap_cache, (gpointer) filename); + result = g_cache_insert (_vte_termcap_cache, (gpointer) name); g_static_mutex_unlock (&_vte_termcap_mutex); @@ -559,7 +596,7 @@ return 1; } - tc = _vte_termcap_new (argv[1]); + tc = _vte_termcap_new_from_file (argv[1]); if (tc == NULL) { diff -Nru vte3-0.31.0/src/vtetc.h vte3-0.32.0/src/vtetc.h --- vte3-0.31.0/src/vtetc.h 2011-11-21 13:41:47.000000000 +0000 +++ vte3-0.32.0/src/vtetc.h 2012-03-10 15:55:12.000000000 +0000 @@ -29,7 +29,7 @@ struct _vte_termcap; /* Create a new termcap structure. */ -struct _vte_termcap *_vte_termcap_new(const char *filename); +struct _vte_termcap *_vte_termcap_new(const char *name); /* Free a termcap structure. */ void _vte_termcap_free(struct _vte_termcap *termcap); diff -Nru vte3-0.31.0/src/vteversion.h vte3-0.32.0/src/vteversion.h --- vte3-0.31.0/src/vteversion.h 2011-11-21 13:48:41.000000000 +0000 +++ vte3-0.32.0/src/vteversion.h 2012-03-19 17:25:30.000000000 +0000 @@ -50,7 +50,7 @@ * * Since: 0.16.15 */ -#define VTE_MINOR_VERSION (31) +#define VTE_MINOR_VERSION (32) /** * VTE_MICRO_VERSION: diff -Nru vte3-0.31.0/termcaps/Makefile.am vte3-0.32.0/termcaps/Makefile.am --- vte3-0.31.0/termcaps/Makefile.am 2011-09-26 12:32:16.000000000 +0000 +++ vte3-0.32.0/termcaps/Makefile.am 2012-02-15 01:00:33.000000000 +0000 @@ -1,12 +1,4 @@ -EXTRA_DIST = xterm xterm.baseline -termcapdir = $(pkgdatadir)/termcap-$(VTE_API_VERSION) -termcap_DATA = xterm - -if VTE_DEFAULT_EMULATION -termcap_DATA += $(VTE_DEFAULT_EMULATION) -$(VTE_DEFAULT_EMULATION): xterm - $(AM_V_GEN) $(SED) -e s,^xterm:,$(VTE_DEFAULT_EMULATION):,g \ - -e s,^xterm\|,$(VTE_DEFAULT_EMULATION)\|,g $< > $@ -endif +EXTRA_DIST = xterm.baseline +dist_noinst_DATA = xterm -include $(top_srcdir)/git.mk diff -Nru vte3-0.31.0/termcaps/Makefile.in vte3-0.32.0/termcaps/Makefile.in --- vte3-0.31.0/termcaps/Makefile.in 2011-11-21 13:48:20.000000000 +0000 +++ vte3-0.32.0/termcaps/Makefile.in 2012-03-19 17:25:21.000000000 +0000 @@ -34,9 +34,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@VTE_DEFAULT_EMULATION_TRUE@am__append_1 = $(VTE_DEFAULT_EMULATION) subdir = termcaps -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(dist_noinst_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.in @@ -54,34 +54,15 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(termcapdir)" -DATA = $(termcap_DATA) +DATA = $(dist_noinst_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ +AM_CPPFLAGS = @AM_CPPFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_LDFLAGS = @AM_LDFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -112,6 +93,7 @@ GLADE_ICON_DIR = @GLADE_ICON_DIR@ GLADE_MODULE_DIR = @GLADE_MODULE_DIR@ GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -120,6 +102,8 @@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_API_VERSION = @GTK_API_VERSION@ @@ -198,7 +182,6 @@ VTE_API_VERSION = @VTE_API_VERSION@ VTE_API_VERSION_U = @VTE_API_VERSION_U@ VTE_CFLAGS = @VTE_CFLAGS@ -VTE_DEFAULT_EMULATION = @VTE_DEFAULT_EMULATION@ VTE_LDFLAGS = @VTE_LDFLAGS@ VTE_LIBRARY_SUFFIX_U = @VTE_LIBRARY_SUFFIX_U@ VTE_LIBS = @VTE_LIBS@ @@ -262,9 +245,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = xterm xterm.baseline -termcapdir = $(pkgdatadir)/termcap-$(VTE_API_VERSION) -termcap_DATA = xterm $(am__append_1) +EXTRA_DIST = xterm.baseline +dist_noinst_DATA = xterm all: all-am .SUFFIXES: @@ -304,26 +286,6 @@ clean-libtool: -rm -rf .libs _libs -install-termcapDATA: $(termcap_DATA) - @$(NORMAL_INSTALL) - test -z "$(termcapdir)" || $(MKDIR_P) "$(DESTDIR)$(termcapdir)" - @list='$(termcap_DATA)'; test -n "$(termcapdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(termcapdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(termcapdir)" || exit $$?; \ - done - -uninstall-termcapDATA: - @$(NORMAL_UNINSTALL) - @list='$(termcap_DATA)'; test -n "$(termcapdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(termcapdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(termcapdir)" && rm -f $$files tags: TAGS TAGS: @@ -365,9 +327,6 @@ check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(termcapdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -413,7 +372,7 @@ info-am: -install-data-am: install-termcapDATA +install-data-am: install-dvi: install-dvi-am @@ -457,7 +416,7 @@ ps-am: -uninstall-am: uninstall-termcapDATA +uninstall-am: .MAKE: install-am install-strip @@ -468,14 +427,10 @@ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ - install-termcapDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-termcapDATA - -@VTE_DEFAULT_EMULATION_TRUE@$(VTE_DEFAULT_EMULATION): xterm -@VTE_DEFAULT_EMULATION_TRUE@ $(AM_V_GEN) $(SED) -e s,^xterm:,$(VTE_DEFAULT_EMULATION):,g \ -@VTE_DEFAULT_EMULATION_TRUE@ -e s,^xterm\|,$(VTE_DEFAULT_EMULATION)\|,g $< > $@ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + -include $(top_srcdir)/git.mk