[genius] Sat Apr 07 18:10:46 2018 Jiri (George) Lebl <jirka 5z com>
- From: George Lebl <jirka src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [genius] Sat Apr 07 18:10:46 2018 Jiri (George) Lebl <jirka 5z com>
- Date: Sat, 7 Apr 2018 23:11:33 +0000 (UTC)
commit ec0783c92182585ef2a6b76a815d495e8d8518b1
Author: Jiri (George) Lebl <jiri lebl gmail com>
Date: Sat Apr 7 18:10:49 2018 -0500
Sat Apr 07 18:10:46 2018 Jiri (George) Lebl <jirka 5z com>
* Add in internal version of a GTK 2.0 version of VTE A temporary
fix. When star trek future arrives, the GtkExtra stuff will be
ported to GTK+3.0 and all will be well. Of course by then we will
be on GTK+10.0 so ...
ChangeLog | 7 +
INSTALL | 320 +++---
configure.ac | 120 +++-
gtkextra/Makefile.am | 2 +-
src/Makefile.am | 6 +-
src/calc.c | 8 +-
src/eval.c | 12 +-
src/funclib.c | 2 +-
src/genius-readline-helper.c | 2 +-
src/gnome-genius.c | 7 +-
src/mpwrap.c | 4 +-
src/mpzextra.c | 4 +-
src/parseutil.c | 2 +-
src/util.c | 5 +-
vte/HACKING | 8 +
vte/Makefile.am | 18 +-
vte/README | 5 +
vte/acinclude.m4 | 32 -
vte/autogen.sh | 29 -
vte/configure.in | 458 ---------
vte/depcomp | 630 ------------
vte/src/Makefile.am | 213 +----
vte/src/Makefile.in | 2335 ------------------------------------------
vte/src/check-doc-syntax.sh | 78 --
vte/src/decset | 16 -
vte/src/interpret.c | 170 ---
vte/src/marshal.c | 136 ++--
vte/src/marshal.h | 64 +-
vte/src/mev.c | 311 ------
vte/src/osc | 22 -
vte/src/reflect.c | 340 ------
vte/src/slowcat.c | 118 ---
vte/src/ssfe.c | 1271 -----------------------
vte/src/vteapp.c | 1105 --------------------
vte/src/vtetypebuiltins.c | 52 +-
vte/src/vtetypebuiltins.h | 10 +-
vte/src/window | 28 -
vte/termcaps/Makefile.am | 11 +-
vte/termcaps/Makefile.in | 499 ---------
39 files changed, 474 insertions(+), 7986 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9fd357d..e3a2b3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Apr 07 18:10:46 2018 Jiri (George) Lebl <jirka 5z com>
+
+ * Add in internal version of a GTK 2.0 version of VTE A temporary
+ fix. When star trek future arrives, the GtkExtra stuff will be
+ ported to GTK+3.0 and all will be well. Of course by then we will
+ be on GTK+10.0 so ...
+
Fri Jan 12 23:27:23 2018 Jiri (George) Lebl <jirka 5z com>
* lib/number_theory/primes.gel: update for newest data from GIMPS
diff --git a/INSTALL b/INSTALL
index 2099840..8865734 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
+ Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
+Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -12,97 +12,96 @@ without warranty of any kind.
Basic Installation
==================
- Briefly, the shell command `./configure && make && make install'
+ Briefly, the shell command './configure && make && make install'
should configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
+more-detailed instructions are generic; see the 'README' file for
instructions specific to this package. Some packages provide this
-`INSTALL' file but do not implement all of the features documented
+'INSTALL' file but do not implement all of the features documented
below. The lack of an optional feature in a given package is not
necessarily a bug. More recommendations for GNU packages can be found
in *note Makefile Conventions: (standards)Makefile Conventions.
- The `configure' shell script attempts to guess correct values for
+ The 'configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
+those values to create a 'Makefile' in each directory of the package.
+It may also create one or more '.h' files containing system-dependent
+definitions. Finally, it creates a shell script 'config.status' that
you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
+file 'config.log' containing compiler output (useful mainly for
+debugging 'configure').
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
+ It can also use an optional file (typically called 'config.cache' and
+enabled with '--cache-file=config.cache' or simply '-C') that saves the
+results of its tests to speed up reconfiguring. Caching is disabled by
+default to prevent problems with accidental use of stale cache files.
If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
+to figure out how 'configure' could check whether to do them, and mail
+diffs or instructions to the address given in the 'README' so they can
be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
+some point 'config.cache' contains results you don't want to keep, you
may remove or edit it.
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
+ The file 'configure.ac' (or 'configure.in') is used to create
+'configure' by a program called 'autoconf'. You need 'configure.ac' if
+you want to change it or regenerate 'configure' using a newer version of
+'autoconf'.
The simplest way to compile this package is:
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
+ 1. 'cd' to the directory containing the package's source code and type
+ './configure' to configure the package for your system.
- Running `configure' might take a while. While running, it prints
+ Running 'configure' might take a while. While running, it prints
some messages telling which features it is checking for.
- 2. Type `make' to compile the package.
+ 2. Type 'make' to compile the package.
- 3. Optionally, type `make check' to run any self-tests that come with
+ 3. Optionally, type 'make check' to run any self-tests that come with
the package, generally using the just-built uninstalled binaries.
- 4. Type `make install' to install the programs and any data files and
+ 4. Type 'make install' to install the programs and any data files and
documentation. When installing into a prefix owned by root, it is
recommended that the package be configured and built as a regular
- user, and only the `make install' phase executed with root
+ user, and only the 'make install' phase executed with root
privileges.
- 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ 5. Optionally, type 'make installcheck' to repeat any self-tests, but
this time using the binaries in their final installed location.
This target does not install anything. Running this target as a
- regular user, particularly if the prior `make install' required
+ regular user, particularly if the prior 'make install' required
root privileges, verifies that the installation completed
correctly.
6. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
+ source code directory by typing 'make clean'. To also remove the
+ files that 'configure' created (so you can compile the package for
+ a different kind of computer), type 'make distclean'. There is
+ also a 'make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
- 7. Often, you can also type `make uninstall' to remove the installed
+ 7. Often, you can also type 'make uninstall' to remove the installed
files again. In practice, not all packages have tested that
uninstallation works correctly, even though it is required by the
GNU Coding Standards.
- 8. Some packages, particularly those that use Automake, provide `make
+ 8. Some packages, particularly those that use Automake, provide 'make
distcheck', which can by used by developers to test that all other
- targets like `make install' and `make uninstall' work correctly.
+ targets like 'make install' and 'make uninstall' work correctly.
This target is generally not run by end users.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
+the 'configure' script does not know about. Run './configure --help'
for details on some of the pertinent environment variables.
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
+ You can give 'configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here is
+an example:
./configure CC=c99 CFLAGS=-g LIBS=-lposix
@@ -113,21 +112,21 @@ Compiling For Multiple Architectures
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
+own directory. To do this, you can use GNU 'make'. 'cd' to the
directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'. This
-is known as a "VPATH" build.
+the 'configure' script. 'configure' automatically checks for the source
+code in the directory that 'configure' is in and in '..'. This is known
+as a "VPATH" build.
- With a non-GNU `make', it is safer to compile the package for one
+ With a non-GNU 'make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
+installed the package for one architecture, use 'make distclean' before
reconfiguring for another architecture.
On MacOS X 10.5 and later systems, you can create libraries and
executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor. Like
+"universal" binaries--by specifying multiple '-arch' options to the
+compiler but only a single '-arch' option to the preprocessor. Like
this:
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
@@ -136,105 +135,104 @@ this:
This is not guaranteed to produce working output in all cases, you
may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
+using the 'lipo' tool if you have problems.
Installation Names
==================
- By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
+ By default, 'make install' installs the package's commands under
+'/usr/local/bin', include files under '/usr/local/include', etc. You
+can specify an installation prefix other than '/usr/local' by giving
+'configure' the option '--prefix=PREFIX', where PREFIX must be an
absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them. In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
+options like '--bindir=DIR' to specify different values for particular
+kinds of files. Run 'configure --help' for a list of the directories
+you can set and what kinds of files go in them. In general, the default
+for these options is expressed in terms of '${prefix}', so that
+specifying just '--prefix' will affect all of the other directory
specifications that were not explicitly provided.
The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
+correct locations to 'configure'; however, many packages provide one or
both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
+'make install' command line to change installation locations without
having to reconfigure or recompile.
The first method involves providing an override variable for each
-affected directory. For example, `make install
+affected directory. For example, 'make install
prefix=/alternate/directory' will choose an alternate location for all
directory configuration variables that were expressed in terms of
-`${prefix}'. Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated. The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
- The second method involves providing the `DESTDIR' variable. For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names. The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
+'${prefix}'. Any directories that were specified during 'configure',
+but not in terms of '${prefix}', must each be overridden at install time
+for the entire installation to be relocated. The approach of makefile
+variable overrides for each directory variable is required by the GNU
+Coding Standards, and ideally causes no recompilation. However, some
+platforms have known limitations with the semantics of shared libraries
+that end up requiring recompilation when using this method, particularly
+noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the 'DESTDIR' variable. For
+example, 'make install DESTDIR=/alternate/directory' will prepend
+'/alternate/directory' before all installation names. The approach of
+'DESTDIR' overrides is not required by the GNU Coding Standards, and
does not work on platforms that have drive letters. On the other hand,
it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
+when some directory options were not specified in terms of '${prefix}'
+at 'configure' time.
Optional Features
=================
If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
+with an extra prefix or suffix on their names by giving 'configure' the
+option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
+
+ Some packages pay attention to '--enable-FEATURE' options to
+'configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to '--with-PACKAGE' options, where PACKAGE
+is something like 'gnu-as' or 'x' (for the X Window System). The
+'README' should mention any '--enable-' and '--with-' options that the
package recognizes.
- For packages that use the X Window System, `configure' can usually
+ For packages that use the X Window System, 'configure' can usually
find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
+you can use the 'configure' options '--x-includes=DIR' and
+'--x-libraries=DIR' to specify their locations.
Some packages offer the ability to configure how verbose the
-execution of `make' will be. For these packages, running `./configure
+execution of 'make' will be. For these packages, running './configure
--enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
+overridden with 'make V=1'; while running './configure
--disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
+overridden with 'make V=0'.
Particular systems
==================
- On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-CC is not installed, it is recommended to use the following options in
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC
+is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
- HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved. Use GNU `make'
-instead.
+ HP-UX 'make' updates targets which have the same time stamps as their
+prerequisites, which makes it generally unusable when shipped generated
+files such as 'configure' are involved. Use GNU 'make' instead.
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file. The option `-nodtk' can be used as
-a workaround. If GNU CC is not installed, it is therefore recommended
-to try
+parse its '<wchar.h>' header file. The option '-nodtk' can be used as a
+workaround. If GNU CC is not installed, it is therefore recommended to
+try
./configure CC="cc"
@@ -242,26 +240,26 @@ and if that doesn't work, try
./configure CC="cc -nodtk"
- On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+ On Solaris, don't put '/usr/ucb' early in your 'PATH'. This
directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
+these programs are available in '/usr/bin'. So, if you need '/usr/ucb'
+in your 'PATH', put it _after_ '/usr/bin'.
- On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'. It is recommended to use the following options:
+ On Haiku, software installed for all users goes in '/boot/common',
+not '/usr/local'. It is recommended to use the following options:
./configure --prefix=/boot/common
Specifying the System Type
==========================
- There may be some features `configure' cannot figure out
+ There may be some features 'configure' cannot figure out
automatically, but needs to determine by the type of machine the package
will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
+_same_ architectures, 'configure' can figure that out, but if it prints
a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
+'--build=TYPE' option. TYPE can either be a short name for the system
+type, such as 'sun4', or a canonical name which has the form:
CPU-COMPANY-SYSTEM
@@ -270,101 +268,101 @@ where SYSTEM can have one of these forms:
OS
KERNEL-OS
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
+ See the file 'config.sub' for the possible values of each field. If
+'config.sub' isn't included in this package, then this package doesn't
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
+use the option '--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
+eventually be run) with '--host=TYPE'.
Sharing Defaults
================
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
+ If you want to set default values for 'configure' scripts to share,
+you can create a site shell script called 'config.site' that gives
+default values for variables like 'CC', 'cache_file', and 'prefix'.
+'configure' looks for 'PREFIX/share/config.site' if it exists, then
+'PREFIX/etc/config.site' if it exists. Or, you can set the
+'CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all 'configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
+environment passed to 'configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
+them in the 'configure' command line, using 'VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
-causes the specified `gcc' to be used as the C compiler (unless it is
+causes the specified 'gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation. Until the limitation is lifted, you can use
-this workaround:
+Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an
+Autoconf limitation. Until the limitation is lifted, you can use this
+workaround:
CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-`configure' Invocation
+'configure' Invocation
======================
- `configure' recognizes the following options to control how it
+ 'configure' recognizes the following options to control how it
operates.
-`--help'
-`-h'
- Print a summary of all of the options to `configure', and exit.
+'--help'
+'-h'
+ Print a summary of all of the options to 'configure', and exit.
-`--help=short'
-`--help=recursive'
+'--help=short'
+'--help=recursive'
Print a summary of the options unique to this package's
- `configure', and exit. The `short' variant lists options used
- only in the top level, while the `recursive' variant lists options
- also present in any nested packages.
+ 'configure', and exit. The 'short' variant lists options used only
+ in the top level, while the 'recursive' variant lists options also
+ present in any nested packages.
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
+'--version'
+'-V'
+ Print the version of Autoconf used to generate the 'configure'
script, and exit.
-`--cache-file=FILE'
+'--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
+ traditionally 'config.cache'. FILE defaults to '/dev/null' to
disable caching.
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
+'--config-cache'
+'-C'
+ Alias for '--cache-file=config.cache'.
-`--quiet'
-`--silent'
-`-q'
+'--quiet'
+'--silent'
+'-q'
Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
+ suppress all normal output, redirect it to '/dev/null' (any error
messages will still be shown).
-`--srcdir=DIR'
+'--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
+ 'configure' can determine that directory automatically.
-`--prefix=DIR'
- Use DIR as the installation prefix. *note Installation Names::
- for more details, including other options available for fine-tuning
- the installation locations.
+'--prefix=DIR'
+ Use DIR as the installation prefix. *note Installation Names:: for
+ more details, including other options available for fine-tuning the
+ installation locations.
-`--no-create'
-`-n'
+'--no-create'
+'-n'
Run the configure checks, but stop before creating any output
files.
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
+'configure' also accepts some other, not widely useful, options. Run
+'configure --help' for more details.
diff --git a/configure.ac b/configure.ac
index 859fe31..f890839 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,8 +17,9 @@ AC_PROG_INTLTOOL([0.21])
dnl ================= Requirements ================================================
-GTK_REQUIRED=2.18.0
-GLIB_REQUIRED=2.12.0
+GTK_REQUIRED=2.20.0
+GLIB_REQUIRED=2.26.0
+PANGO_REQUIRED=1.22.0
GTKSOURCEVIEW_REQUIRED=0.3.0
GTKSOURCEVIEW2_REQUIRED=2.0.2
GIO_REQUIRED=2.16.0
@@ -103,9 +104,6 @@ AC_CHECK_LIB(mpfr, mpfr_j0, [],
#AC_SUBST(GCONF_CONFIG_SOURCE)
#AC_SUBST(INSTALL_GCONF_CONFIG_SOURCE)
-AC_CONFIG_SUBDIRS(vte)
-
-
AC_ARG_ENABLE(gtksourceview,
[ --disable-gtksourceview Do not use GtkSourceView library even if detected],
use_gtksourceview="$enableval",use_gtksourceview=yes)
@@ -267,6 +265,115 @@ AC_ARG_ENABLE(update-mimedb,
enable_update_mimedb=yes)
AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
+
+####
+# VTE STUFF, this is all temporary pending a port to gtk 3.0 in the star trek future
+
+AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
+AC_DEFINE_UNQUOTED(VTE_DEFAULT_EMULATION,"xterm",[The default terminal type to be emulated.])
+VTE_DEFAULT_EMULATION="xterm"
+AC_SUBST(VTE_DEFAULT_EMULATION)
+
+# 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_HEADER_TIOCGWINSZ
+
+# Check for PTY handling functions.
+AC_CHECK_FUNCS([cfmakeraw fork setsid setpgid getpgid getpt grantpt unlockpt ptsname ptsname_r tcgetattr
tcsetattr])
+
+# Pull in the right libraries for various functions which might not be
+# bundled into an exploded libc.
+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"]))
+if test x$have_socket = x1 ; then
+ AC_DEFINE(HAVE_SOCKET,1,[Define if you have the socket function.])
+fi
+if test x$have_socketpair = x1 ; then
+ AC_DEFINE(HAVE_SOCKETPAIR,1,[Define if you have the socketpair function.])
+fi
+if test x$have_recvmsg = x1 ; then
+ AC_DEFINE(HAVE_RECVMSG,1,[Define if you have the recvmsg function.])
+fi
+AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
+AC_CHECK_FUNCS([ceil floor])
+
+# Look for tgetent
+
+AC_CHECK_FUNC([tgetent],[vte_cv_termcap_lib=libc],
+ [AC_CHECK_LIB([ncurses],[tgetent],[vte_cv_termcap_lib=libncurses],
+ [AC_CHECK_LIB([tinfo],[tgetent],[vte_cv_termcap_lib=libtinfo],
+ [AC_CHECK_LIB([curses],[tgetent],[vte_cv_termcap_lib=libcurses],
+ [AC_CHECK_LIB([termcap],[tgetent],[vte_cv_termcap_lib=libtermcap],
+ [vte_cv_termcap_lib=])])])])])
+
+case "$vte_cv_termcap_lib" in
+ libc) # FIXME: which headers to include here?
+ ;;
+ libncurses) # We need ncurses.h and term.h, or ncurses/curses.h and ncurses/term.h
+ AC_CHECK_HEADERS([ncurses.h term.h],[],
+ [AC_CHECK_HEADERS([ncurses/curses.h ncurses/term.h],[],
+ [AC_MSG_ERROR([ncurses headers not found])])])
+ LIBS="-lncurses $LIBS"
+ ;;
+ libtinfo) # Need ncurses/curses.h and ncurses/term.h
+ AC_CHECK_HEADERS([ncurses.h term.h],[],
+ [AC_CHECK_HEADERS([ncurses/curses.h ncurses/term.h],[],
+ [AC_MSG_ERROR([ncurses headers not found])])])
+ LIBS="-ltinfo $LIBS"
+ ;;
+ libcurses) # Need curses.h and term.h
+ AC_CHECK_HEADERS([curses.h term.h],[],
+ [AC_MSG_ERROR([curses headers not found])],
+ [[#ifdef HAVE_CURSES_H
+ #include <curses.h>
+ #endif]])
+ LIBS="-lcurses $LIBS"
+ ;;
+ libtermcap) # Need termcap.h
+ AC_CHECK_HEADERS([termcap.h],[],
+ [AC_MSG_ERROR([termcap headers not found])])
+ LIBS="-ltermcap $LIBS"
+ ;;
+ *) AC_MSG_ERROR([tgetent not found in any library]) ;;
+esac
+
+# Search for the required modules.
+
+# We have a direct dependency on X11 on gdk-x11, see bug #613525
+AC_MSG_CHECKING([for GDK target])
+GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)"
+AC_MSG_RESULT([$GDK_TARGET])
+case "$GDK_TARGET" in
+ x11) PLATFORM_PKGS="x11 cairo-xlib" ;;
+ *) PLATFORM_PKGS="" ;;
+esac
+
+VTE_PKGS="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED
gobject-2.0 gio-2.0 gio-unix-2.0 $PLATFORM_PKGS"
+PKG_CHECK_MODULES([VTE],[$VTE_PKGS])
+AC_SUBST([VTE_PKGS])
+
+wcs_funcs_includes="
+#ifdef HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+# include <memory.h>
+# endif
+# include <string.h>
+#else
+# ifdef HAVE_STRINGS_H
+# include <strings.h>
+# endif
+#endif
+#ifdef HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+"
+
+AC_CHECK_TYPES(wint_t, AC_DEFINE(HAVE_WINT_T, , [Defined when the wint_t type is supported]),
,$wcs_funcs_includes)
+
+
+########
+
AC_OUTPUT([
genius.spec
Makefile
@@ -284,6 +391,9 @@ lib/statistics/Makefile
lib/symbolic/Makefile
lib/commutative_algebra/Makefile
ve/Makefile
+vte/Makefile
+vte/src/Makefile
+vte/termcaps/Makefile
gtkextra/Makefile
examples/Makefile
pixmaps/Makefile
diff --git a/gtkextra/Makefile.am b/gtkextra/Makefile.am
index be0604c..4643372 100644
--- a/gtkextra/Makefile.am
+++ b/gtkextra/Makefile.am
@@ -32,7 +32,7 @@ AM_CFLAGS = $(PGO_CFLAGS)
# AC_SUBST(VICIOUS_GNOME_LIBS)
noinst_LIBRARIES = \
- @GTKEXTRA_LIBS@
+ libgtkextra-genius.a
EXTRA_LIBRARIES = \
libgtkextra-genius.a
diff --git a/src/Makefile.am b/src/Makefile.am
index da44c55..9290a4a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,10 +18,13 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/ve \
-I$(top_srcdir)/gtkextra \
+ -I$(top_srcdir)/vte/src \
-I$(top_builddir) \
-I$(top_builddir)/ve \
-I$(top_builddir)/gtkextra \
+ -I$(top_builddir)/vte/src \
$(WARN_CFLAGS) \
+ $(VTE_CFLAGS) \
$(BINRELOC_CFLAGS) \
$(GMP_INCLUDEDIR) \
$(GENIUS_CFLAGS) \
@@ -95,13 +98,14 @@ gnome_genius_SOURCES = \
gnome_genius_LDADD = \
$(top_builddir)/ve/libviciousui.a \
$(top_builddir)/gtkextra/libgtkextra-genius.a \
- $(top_builddir)/vte/libvte.a \
+ $(top_builddir)/vte/src/libvte.a \
-lm \
@GMP_LIB@ \
-lmpfr \
@LEXLIB@ \
$(INTLLIBS) \
$(GENIUS_LIBS) \
+ $(VTE_LIBS) \
$(GENIUS_NOGUI_LIBS) \
$(GSV_LIBS) \
@READLINE_LIB@ \
diff --git a/src/calc.c b/src/calc.c
index 08eaaca..b207b6e 100644
--- a/src/calc.c
+++ b/src/calc.c
@@ -1569,7 +1569,7 @@ pretty_print_value_normal (GelOutput *gelo, GelETree *n)
z = mpw_peek_real_mpz (den);
if (z == NULL ||
- mpz_sizeinbase (z, gel_calcstate.integer_output_base) - 1
+ (int)mpz_sizeinbase (z, gel_calcstate.integer_output_base) - 1
> gel_calcstate.max_digits) {
mpw_clear (den);
mpw_clear (num);
@@ -1596,7 +1596,7 @@ pretty_print_value_normal (GelOutput *gelo, GelETree *n)
z = mpw_peek_real_mpz (whole);
if (z == NULL ||
- mpz_sizeinbase (z, gel_calcstate.integer_output_base) - 1
+ (int)mpz_sizeinbase (z, gel_calcstate.integer_output_base) - 1
> gel_calcstate.max_digits) {
mpw_clear (den);
mpw_clear (num);
@@ -1620,7 +1620,7 @@ pretty_print_value_normal (GelOutput *gelo, GelETree *n)
z = mpw_peek_real_mpz (num);
if (z == NULL ||
- mpz_sizeinbase (z, gel_calcstate.integer_output_base) - 1
+ (int)mpz_sizeinbase (z, gel_calcstate.integer_output_base) - 1
> gel_calcstate.max_digits) {
mpw_clear (den);
mpw_clear (num);
@@ -3100,7 +3100,7 @@ get_wordlist (const char *lst)
gel_errorout (_("Can't expand '%s'"), lst);
return NULL;
}
- for (i = 0; i < we.we_wordc; i++) {
+ for (i = 0; i < (int)we.we_wordc; i++) {
list = g_slist_prepend (list, g_strdup (we.we_wordv[i]));
}
wordfree (&we);
diff --git a/src/eval.c b/src/eval.c
index a542ebf..9715c85 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1116,7 +1116,7 @@ expand_col (GelMatrix *dest, GelMatrix *src, int si, int di, int w)
gel_matrix_index (dest, di+x, i) =
gel_copynode (gel_matrix_index (dest, di+xx, i));
xx++;
- if (xx >= et->row.nargs)
+ if (xx >= (int)et->row.nargs)
xx = 0;
}
freenode (et);
@@ -1146,7 +1146,7 @@ get_cols (GelMatrix *m, int *colwidths, gboolean *just_denull)
maxcol = 1;
} else if (et->type != GEL_NULL_NODE) {
/* Must be GEL_MATRIX_ROW_NODE then */
- if (et->row.nargs > maxcol)
+ if ((int)et->row.nargs > maxcol)
maxcol = et->row.nargs;
}
}
@@ -8975,7 +8975,7 @@ static long _gel_tree_num = 0;
void
_gel_make_free_trees (void)
{
- int i;
+ guint i;
char *p;
if G_UNLIKELY (_gel_max_nodes_check &&
@@ -9002,7 +9002,7 @@ _gel_make_free_trees (void)
static void
_gel_make_free_evl (void)
{
- int i;
+ guint i;
char *p;
p = g_malloc ((GEL_CHUNK_SIZE / ALIGNED_SIZE (GelEvalLoop)) *
@@ -9019,7 +9019,7 @@ _gel_make_free_evl (void)
static void
_gel_make_free_evf (void)
{
- int i;
+ guint i;
char *p;
p = g_malloc ((GEL_CHUNK_SIZE / ALIGNED_SIZE (GelEvalFor)) *
@@ -9036,7 +9036,7 @@ _gel_make_free_evf (void)
static void
_gel_make_free_evfi (void)
{
- int i;
+ guint i;
char *p;
p = g_malloc ((GEL_CHUNK_SIZE / ALIGNED_SIZE (GelEvalForIn)) *
diff --git a/src/funclib.c b/src/funclib.c
index f594037..71145ac 100644
--- a/src/funclib.c
+++ b/src/funclib.c
@@ -4679,7 +4679,7 @@ Factorize_op(GelCtx *ctx, GelETree * * a, gboolean *exception)
GArray *fact;
GelETree *n;
GelMatrixW *mn;
- int i;
+ guint i;
if (a[0]->type == GEL_MATRIX_NODE)
return gel_apply_func_to_matrix (ctx, a[0],
diff --git a/src/genius-readline-helper.c b/src/genius-readline-helper.c
index 17360d8..7b3ce5f 100644
--- a/src/genius-readline-helper.c
+++ b/src/genius-readline-helper.c
@@ -256,7 +256,7 @@ main(int argc, char *argv[])
int len = strlen(p);
if (write(outfd,"LINE",4) < 4)
printf ("write failed in readline-helper");
- if (write(outfd,(gpointer)&len,sizeof(int)) < sizeof (int))
+ if (write(outfd,(gpointer)&len,sizeof(int)) < (int)sizeof (int))
printf ("write failed in readline-helper");
if(len>0) {
if (write(outfd,p,len) < len) {
diff --git a/src/gnome-genius.c b/src/gnome-genius.c
index 3da89f2..70f687f 100644
--- a/src/gnome-genius.c
+++ b/src/gnome-genius.c
@@ -24,7 +24,8 @@
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include <vte/vte.h>
+
+#include "vte.h"
#include <string.h>
#include <unistd.h>
@@ -592,7 +593,7 @@ stock_init (void)
GtkIconFactory *factory;
GtkIconSource *source;
static gboolean stock_initialized = FALSE;
- int i;
+ guint i;
if (stock_initialized)
return;
@@ -4739,7 +4740,7 @@ my_fork_command (VteTerminal *terminal, char **argv)
GPid child_pid;
ret = vte_terminal_fork_command_full (terminal,
- VTE_PTY_DEFAULT,
+ VTE_PTY_DEFAULT | VTE_PTY_NO_LASTLOG | VTE_PTY_NO_UTMP |
VTE_PTY_NO_WTMP | VTE_PTY_NO_HELPER,
NULL,
argv,
NULL,
diff --git a/src/mpwrap.c b/src/mpwrap.c
index 86bb3a8..e743169 100644
--- a/src/mpwrap.c
+++ b/src/mpwrap.c
@@ -147,7 +147,7 @@ static MpwRealNum *free_reals = NULL;
static void
_gel_make_free_reals (void)
{
- int i;
+ guint i;
char *p;
p = g_malloc ((GEL_CHUNK_SIZE / ALIGNED_SIZE (MpwRealNum)) *
@@ -2977,7 +2977,7 @@ str_getstring_z (mpz_ptr num, int max_digits,int scientific_notation,
g_free(p);
p = p2;
}
- if(max_digits>0 && max_digits<strlen(p)) {
+ if(max_digits > 0 && max_digits < (int)strlen(p)) {
mpfr_init(fr);
mpfr_set_z(fr,num, GMP_RNDN);
p2=str_getstring_f(fr,max_digits,scientific_notation,postfix,
diff --git a/src/mpzextra.c b/src/mpzextra.c
index 3495bb4..904100d 100644
--- a/src/mpzextra.c
+++ b/src/mpzextra.c
@@ -251,7 +251,7 @@ static void
append_factor (GArray *fact, mpz_srcptr num)
{
GelFactor f;
- int i;
+ guint i;
/* FIXME: implement faster search, this is sorted */
/* We start at 1 since the 0 entry is always -1 or 1 */
for (i = 1; i < fact->len; i++) {
@@ -533,7 +533,7 @@ mympz_pollard_rho_factorize (mpz_srcptr t)
void
mympz_factorization_free (GArray *fact)
{
- int i;
+ guint i;
for (i = 0; i < fact->len; i++) {
mpz_clear (g_array_index (fact, GelFactor, i).num);
}
diff --git a/src/parseutil.c b/src/parseutil.c
index 3e160db..4ae3be7 100644
--- a/src/parseutil.c
+++ b/src/parseutil.c
@@ -371,7 +371,7 @@ gp_push_matrix(gboolean quoted)
gel_freetree(tree);
break;
} else if(tree->type==GEL_MATRIX_ROW_NODE) {
- if(tree->row.nargs>cols)
+ if((int)tree->row.nargs > cols)
cols = tree->row.nargs;
rowl = g_slist_prepend(rowl,tree->row.args);
tree->row.args = NULL;
diff --git a/src/util.c b/src/util.c
index dc099c9..ace468b 100644
--- a/src/util.c
+++ b/src/util.c
@@ -193,7 +193,10 @@ gel_escape_string(char *s)
case '"':
case '\\':
*(p++) = '\\';
- default: ; *(p++)=*(s++);
+ *(p++)=*(s++);
+ break;
+ default:
+ *(p++)=*(s++);
break;
}
}
diff --git a/vte/HACKING b/vte/HACKING
index b399c0e..96800a4 100644
--- a/vte/HACKING
+++ b/vte/HACKING
@@ -1,3 +1,11 @@
+THIS IS A PRIVATE COPY OF VTE FOR genius
+A TEMPORARY SOLUTION PENDING SOME FUTURE PORT TO GTK+3.0
+
+
+
+
+
+
This entire tree is "some highly unsupported crackrock", though we are
cleaning it as fast as possible and aiming for a 1.0 release "next year".
Please contact people listed in filed MAINTAINERS if you intend to hack
diff --git a/vte/Makefile.am b/vte/Makefile.am
index c856fb3..00a50c2 100644
--- a/vte/Makefile.am
+++ b/vte/Makefile.am
@@ -1,18 +1,14 @@
ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
-SUBDIRS = src termcaps po perf
+SUBDIRS = src termcaps
EXTRA_DIST = \
MAINTAINERS \
HACKING \
- autogen.sh \
ChangeLog.pre-git
DISTCLEANFILES =
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = vte$(VTE_PC_VERSION).pc
-
DISTCHECK_CONFIGURE_FLAGS = \
--enable-gtk-doc \
--disable-silent-rules
@@ -37,15 +33,3 @@ MAINTAINERCLEANFILES = \
$(srcdir)/xmldocs.make \
$(srcdir)/gtk-doc.make \
`find "$(srcdir)" -type f -name Makefile.in -print`
-
-# Build ChangeLog from GIT history
-ChangeLog:
- $(AM_V_GEN) if test -d $(top_srcdir)/.git; then \
- GIT_DIR="$(top_srcdir)/.git" git log --stat > $@; \
- fi
-
-dist: ChangeLog
-
-.PHONY: ChangeLog
-
--include $(top_srcdir)/git.mk
diff --git a/vte/README b/vte/README
index 190ef57..31741cf 100644
--- a/vte/README
+++ b/vte/README
@@ -1,3 +1,8 @@
+THIS IS A PRIVATE COPY OF VTE FOR genius
+A TEMPORARY SOLUTION PENDING SOME FUTURE PORT TO GTK+3.0
+
+
+
* What is VTE?
VTE is a library (libvte) implementing a terminal emulator widget for GTK+,
diff --git a/vte/src/Makefile.am b/vte/src/Makefile.am
index 1971458..3e690cf 100644
--- a/vte/src/Makefile.am
+++ b/vte/src/Makefile.am
@@ -4,12 +4,11 @@ EXTRA_DIST = iso2022.txt
# The library
-headerdir = $(includedir)/vte-$(VTE_API_VERSION)/vte
-header_HEADERS = pty.h reaper.h vte.h vteaccess.h vtepty.h vtetypebuiltins.h vteversion.h vtedeprecated.h
+noinst_HEADERS = pty.h reaper.h vte.h vteaccess.h vtepty.h vtetypebuiltins.h vteversion.h vtedeprecated.h
-lib_LTLIBRARIES = libvte@VTE_LIBRARY_SUFFIX_U@.la
+noinst_LIBRARIES = libvte.a
-EXTRA_libvte@VTE_LIBRARY_SUFFIX_U@_la_SOURCES = \
+EXTRA_libvte_a_SOURCES = \
genkeysyms.py \
keysyms.c \
marshal.list \
@@ -30,7 +29,7 @@ EXTRA_libvte@VTE_LIBRARY_SUFFIX_U@_la_SOURCES = \
vtetypebuiltins.h.template \
$(NULL)
-libvte@VTE_LIBRARY_SUFFIX_U@_la_SOURCES = \
+libvte_a_SOURCES = \
buffer.h \
caps.c \
caps.h \
@@ -91,23 +90,23 @@ libvte@VTE_LIBRARY_SUFFIX_U@_la_SOURCES = \
vteversion.h
$(NULL)
-libvte@VTE_LIBRARY_SUFFIX_U@_la_CPPFLAGS = \
- -DG_LOG_DOMAIN=\"Vte-$(VTE_API_VERSION)\" \
+libvte_a_CPPFLAGS = \
+ -DG_LOG_DOMAIN=\"Genius-Vte\" \
-DDATADIR='"$(datadir)"' \
-DLIBEXECDIR='"$(libexecdir)"' \
-DLOCALEDIR='"$(localedir)"' \
- -DTERMCAPDIR='"$(pkgdatadir)/termcap-$(VTE_API_VERSION)"' \
+ -DTERMCAPDIR='"$(datadir)/genius"' \
-DVTE_COMPILATION \
$(AM_CPPFLAGS)
-libvte@VTE_LIBRARY_SUFFIX_U@_la_CFLAGS = $(VTE_CFLAGS) $(AM_CFLAGS)
-libvte@VTE_LIBRARY_SUFFIX_U@_la_LIBADD = $(VTE_LIBS)
-libvte@VTE_LIBRARY_SUFFIX_U@_la_LDFLAGS = \
- $(VTE_LDFLAGS) \
- -version-info $(LT_VERSION_INFO) \
- -export-symbols-regex
"^vte_terminal_.*|^vte_pty_.*|^vte_get_.*|^_vte_pty_.*|^vte_reaper_.*|_vte_debug_.*" \
- @LIBTOOL_EXPORT_OPTIONS@ @LIBTOOL_FLAGS@ \
- $(AM_LDFLAGS)
+libvte_a_CFLAGS = $(VTE_CFLAGS) $(AM_CFLAGS)
+#libvte_a_LIBADD = $(VTE_LIBS)
+#libvte_a_LDFLAGS = \
+ #$(VTE_LDFLAGS) \
+ #-version-info $(LT_VERSION_INFO) \
+ #-export-symbols-regex
"^vte_terminal_.*|^vte_pty_.*|^vte_get_.*|^_vte_pty_.*|^vte_reaper_.*|_vte_debug_.*" \
+ #@LIBTOOL_EXPORT_OPTIONS@ @LIBTOOL_FLAGS@ \
+ #$(AM_LDFLAGS)
# Generated sources
@@ -149,185 +148,3 @@ vteseq-list.h: vteseq-2.gperf vteseq-n.gperf
$(AM_V_GEN) echo '/* Generated file. Do not edit */' > $@.tmp && \
cat $^ | grep -v '^#' | grep '\<VTE_SEQUENCE_HANDLER\>'| sed 's/.*, //' | LANG=C sort -u >> $@.tmp &&
\
mv -f $@.tmp $@
-
-
-# vte the application
-
-bin_PROGRAMS = vte@VTE_LIBRARY_SUFFIX_U@
-
-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)
-
-# introspection
-
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-
-if HAVE_INTROSPECTION
-
-Vte-@VTE_API_VERSION@.gir: libvte@VTE_LIBRARY_SUFFIX_U@.la
-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_FILES = \
- vte.c \
- vte.h \
- vtepty.h \
- pty.c \
- vtetypebuiltins.c \
- vtetypebuiltins.h \
- $(NULL)
-
-INTROSPECTION_GIRS += Vte-$(VTE_API_VERSION).gir
-
-girdir = $(INTROSPECTION_GIRDIR)
-nodist_gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(INTROSPECTION_TYPELIBDIR)
-nodist_typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(nodist_gir_DATA) $(nodist_typelib_DATA)
-endif
-
-
-# Misc unit tests and utilities
-
-noinst_PROGRAMS = interpret slowcat
-noinst_SCRIPTS = decset osc window
-EXTRA_DIST += $(noinst_SCRIPTS)
-
-TEST_SH = check-doc-syntax.sh
-EXTRA_DIST += $(TEST_SH)
-
-check_PROGRAMS = dumpkeys iso2022 reaper reflect-text-view reflect-vte mev ssfe table trie xticker vteconv
vtetc
-TESTS = table trie $(TEST_SH)
-
-AM_CFLAGS = $(GLIB_CFLAGS)
-LDADD = $(GLIB_LIBS)
-
-reflect_text_view_CPPFLAGS = -DUSE_TEXT_VIEW
-reflect_text_view_CFLAGS = $(VTE_CFLAGS)
-reflect_text_view_SOURCES = reflect.c
-reflect_text_view_LDADD = $(VTE_LIBS)
-
-reflect_vte_CPPFLAGS = -DUSE_VTE
-reflect_vte_CFLAGS = $(VTE_CFLAGS)
-reflect_vte_SOURCES = reflect.c
-reflect_vte_LDADD = libvte@VTE_LIBRARY_SUFFIX_U@.la $(VTE_LIBS)
-
-interpret_SOURCES = \
- buffer.h \
- caps.c \
- caps.h \
- debug.c \
- debug.h \
- iso2022.c \
- iso2022.h \
- matcher.c \
- matcher.h \
- table.c \
- table.h \
- trie.c \
- trie.h \
- vteconv.c \
- vteconv.h \
- vtetc.c \
- vtetc.h \
- vtetree.c \
- vtetree.h \
- interpret.c
-interpret_CPPFLAGS = \
- -DINTERPRET_MAIN \
- -DTERMCAPDIR='"$(pkgdatadir)/termcap-$(VTE_API_VERSION)"'
-interpret_CFLAGS = $(GTK_CFLAGS)
-interpret_LDADD = $(GTK_LIBS)
-
-iso2022_SOURCES = \
- buffer.h \
- caps.c \
- caps.h \
- debug.c \
- debug.h \
- iso2022.c \
- iso2022.h \
- matcher.c \
- matcher.h \
- table.c \
- table.h \
- trie.c \
- trie.h \
- vteconv.c \
- vteconv.h \
- vtetc.c \
- vtetc.h \
- vtetree.c \
- vtetree.h
-iso2022_CPPFLAGS = -DISO2022_MAIN
-iso2022_CFLAGS = $(GTK_CFLAGS)
-iso2022_LDADD = $(GTK_LIBS)
-
-slowcat_SOURCES = \
- slowcat.c
-
-table_SOURCES = \
- buffer.h \
- caps.c \
- caps.h \
- debug.c \
- debug.h \
- matcher.c \
- matcher.h \
- table.c \
- table.h \
- trie.c \
- trie.h \
- vteconv.c \
- vteconv.h \
- vtetc.c \
- vtetc.h
-table_CPPFLAGS = -DTABLE_MAIN
-table_CFLAGS = $(VTE_CFLAGS)
-table_LDADD = $(VTE_LIBS)
-
-trie_SOURCES = \
- trie.c \
- trie.h \
- buffer.h \
- caps.c \
- caps.h \
- debug.c \
- debug.h \
- matcher.c \
- matcher.h \
- table.c \
- table.h \
- vteconv.c \
- vteconv.h \
- vtetc.c \
- vtetc.h
-trie_CPPFLAGS = -DTRIE_MAIN
-trie_CFLAGS = $(VTE_CFLAGS)
-trie_LDADD = $(VTE_LIBS)
-
-vtetc_SOURCES = vtetc.c vtetc.h debug.c debug.h
-vtetc_CPPFLAGS = -DTERMCAP_MAIN
-
-reaper_SOURCES = reaper.c reaper.h debug.c debug.h marshal.c marshal.h
-reaper_CPPFLAGS = -DREAPER_MAIN -DLOCALEDIR='"$(localedir)"'
-
-vteconv_SOURCES = buffer.h debug.c debug.h vteconv.c vteconv.h
-vteconv_CPPFLAGS = -DVTECONV_MAIN
-vteconv_CFLAGS = $(VTE_CFLAGS)
-vteconv_LDADD = $(VTE_LIBS)
-
-dumpkeys_SOURCES = dumpkeys.c
-mev_SOURCES = mev.c
-ssfe_SOURCES = ssfe.c
-xticker_SOURCES = xticker.c
-
-#
-
--include $(top_srcdir)/git.mk
--include $(INTROSPECTION_MAKEFILE)
diff --git a/vte/src/marshal.c b/vte/src/marshal.c
index dc11916..2c6034b 100644
--- a/vte/src/marshal.c
+++ b/vte/src/marshal.c
@@ -1,14 +1,9 @@
-
-#ifndef ___vte_marshal_MARSHAL_H__
-#define ___vte_marshal_MARSHAL_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
+/* This file is generated by glib-genmarshal, do not modify it. This code is licensed under the same license
as the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */
+#include <glib-object.h>
#ifdef G_ENABLE_DEBUG
#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v) g_value_get_char (v)
+#define g_marshal_value_peek_char(v) g_value_get_schar (v)
#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
#define g_marshal_value_peek_int(v) g_value_get_int (v)
#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
@@ -52,14 +47,17 @@ G_BEGIN_DECLS
#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer
#endif /* !G_ENABLE_DEBUG */
-
/* VOID:INT,INT (marshal.list:1) */
-G_GNUC_INTERNAL void _vte_marshal_VOID__INT_INT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+G_GNUC_INTERNAL
+void _vte_marshal_VOID__INT_INT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+G_END_DECLS
void
_vte_marshal_VOID__INT_INT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -68,13 +66,13 @@ _vte_marshal_VOID__INT_INT (GClosure *closure,
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
- typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1,
- gint arg_1,
- gint arg_2,
- gpointer data2);
- register GMarshalFunc_VOID__INT_INT callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
+ typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1,
+ gint arg1,
+ gint arg2,
+ gpointer data2);
+ GCClosure *cc = (GCClosure *) closure;
+ gpointer data1, data2;
+ GMarshalFunc_VOID__INT_INT callback;
g_return_if_fail (n_param_values == 3);
@@ -97,12 +95,16 @@ _vte_marshal_VOID__INT_INT (GClosure *closure,
}
/* VOID:OBJECT,OBJECT (marshal.list:2) */
-G_GNUC_INTERNAL void _vte_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+G_GNUC_INTERNAL
+void _vte_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+G_END_DECLS
void
_vte_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -111,13 +113,13 @@ _vte_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
- typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- gpointer data2);
- register GMarshalFunc_VOID__OBJECT_OBJECT callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
+ typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1,
+ gpointer arg1,
+ gpointer arg2,
+ gpointer data2);
+ GCClosure *cc = (GCClosure *) closure;
+ gpointer data1, data2;
+ GMarshalFunc_VOID__OBJECT_OBJECT callback;
g_return_if_fail (n_param_values == 3);
@@ -140,12 +142,16 @@ _vte_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
}
/* VOID:STRING,UINT (marshal.list:3) */
-G_GNUC_INTERNAL void _vte_marshal_VOID__STRING_UINT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+G_GNUC_INTERNAL
+void _vte_marshal_VOID__STRING_UINT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+G_END_DECLS
void
_vte_marshal_VOID__STRING_UINT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -154,13 +160,13 @@ _vte_marshal_VOID__STRING_UINT (GClosure *closure,
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
- typedef void (*GMarshalFunc_VOID__STRING_UINT) (gpointer data1,
- gpointer arg_1,
- guint arg_2,
- gpointer data2);
- register GMarshalFunc_VOID__STRING_UINT callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
+ typedef void (*GMarshalFunc_VOID__STRING_UINT) (gpointer data1,
+ gpointer arg1,
+ guint arg2,
+ gpointer data2);
+ GCClosure *cc = (GCClosure *) closure;
+ gpointer data1, data2;
+ GMarshalFunc_VOID__STRING_UINT callback;
g_return_if_fail (n_param_values == 3);
@@ -183,12 +189,16 @@ _vte_marshal_VOID__STRING_UINT (GClosure *closure,
}
/* VOID:UINT,UINT (marshal.list:4) */
-G_GNUC_INTERNAL void _vte_marshal_VOID__UINT_UINT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
+/* Prototype for -Wmissing-prototypes */
+G_BEGIN_DECLS
+G_GNUC_INTERNAL
+void _vte_marshal_VOID__UINT_UINT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+G_END_DECLS
void
_vte_marshal_VOID__UINT_UINT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -197,13 +207,13 @@ _vte_marshal_VOID__UINT_UINT (GClosure *closure,
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
- typedef void (*GMarshalFunc_VOID__UINT_UINT) (gpointer data1,
- guint arg_1,
- guint arg_2,
- gpointer data2);
- register GMarshalFunc_VOID__UINT_UINT callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
+ typedef void (*GMarshalFunc_VOID__UINT_UINT) (gpointer data1,
+ guint arg1,
+ guint arg2,
+ gpointer data2);
+ GCClosure *cc = (GCClosure *) closure;
+ gpointer data1, data2;
+ GMarshalFunc_VOID__UINT_UINT callback;
g_return_if_fail (n_param_values == 3);
@@ -225,7 +235,3 @@ _vte_marshal_VOID__UINT_UINT (GClosure *closure,
data2);
}
-G_END_DECLS
-
-#endif /* ___vte_marshal_MARSHAL_H__ */
-
diff --git a/vte/src/marshal.h b/vte/src/marshal.h
index fb2584c..a83f439 100644
--- a/vte/src/marshal.h
+++ b/vte/src/marshal.h
@@ -1,44 +1,48 @@
+/* This file is generated by glib-genmarshal, do not modify it. This code is licensed under the same license
as the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */
+#ifndef ___VTE_MARSHAL_MARSHAL_H__
+#define ___VTE_MARSHAL_MARSHAL_H__
-#ifndef ___vte_marshal_MARSHAL_H__
-#define ___vte_marshal_MARSHAL_H__
-
-#include <glib-object.h>
+#include <glib-object.h>
G_BEGIN_DECLS
/* VOID:INT,INT (marshal.list:1) */
-G_GNUC_INTERNAL void _vte_marshal_VOID__INT_INT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
+G_GNUC_INTERNAL
+void _vte_marshal_VOID__INT_INT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
/* VOID:OBJECT,OBJECT (marshal.list:2) */
-G_GNUC_INTERNAL void _vte_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
+G_GNUC_INTERNAL
+void _vte_marshal_VOID__OBJECT_OBJECT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
/* VOID:STRING,UINT (marshal.list:3) */
-G_GNUC_INTERNAL void _vte_marshal_VOID__STRING_UINT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
+G_GNUC_INTERNAL
+void _vte_marshal_VOID__STRING_UINT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
/* VOID:UINT,UINT (marshal.list:4) */
-G_GNUC_INTERNAL void _vte_marshal_VOID__UINT_UINT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
+G_GNUC_INTERNAL
+void _vte_marshal_VOID__UINT_UINT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
-G_END_DECLS
-#endif /* ___vte_marshal_MARSHAL_H__ */
+G_END_DECLS
+#endif /* ___VTE_MARSHAL_MARSHAL_H__ */
diff --git a/vte/src/vtetypebuiltins.c b/vte/src/vtetypebuiltins.c
index 4f12d4a..c6e338a 100644
--- a/vte/src/vtetypebuiltins.c
+++ b/vte/src/vtetypebuiltins.c
@@ -1,8 +1,7 @@
-/* Generated data (by glib-mkenums) */
+/* This file is generated by glib-mkenums, do not modify it. This code is licensed under the same license as
the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */
#include "vte.h"
-
/* enumerations from "vte.h" */
GType
vte_terminal_erase_binding_get_type (void)
@@ -26,7 +25,6 @@ vte_terminal_erase_binding_get_type (void)
return g_define_type_id__volatile;
}
-
GType
vte_terminal_cursor_blink_mode_get_type (void)
{
@@ -47,7 +45,6 @@ vte_terminal_cursor_blink_mode_get_type (void)
return g_define_type_id__volatile;
}
-
GType
vte_terminal_cursor_shape_get_type (void)
{
@@ -68,7 +65,6 @@ vte_terminal_cursor_shape_get_type (void)
return g_define_type_id__volatile;
}
-
GType
vte_terminal_write_flags_get_type (void)
{
@@ -87,67 +83,64 @@ vte_terminal_write_flags_get_type (void)
return g_define_type_id__volatile;
}
-
-/* enumerations from "vtepty.h" */
+/* enumerations from "vtedeprecated.h" */
GType
-vte_pty_flags_get_type (void)
+vte_terminal_anti_alias_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile)) {
- static const GFlagsValue values[] = {
- { VTE_PTY_NO_LASTLOG, "VTE_PTY_NO_LASTLOG", "no-lastlog" },
- { VTE_PTY_NO_UTMP, "VTE_PTY_NO_UTMP", "no-utmp" },
- { VTE_PTY_NO_WTMP, "VTE_PTY_NO_WTMP", "no-wtmp" },
- { VTE_PTY_NO_HELPER, "VTE_PTY_NO_HELPER", "no-helper" },
- { VTE_PTY_NO_FALLBACK, "VTE_PTY_NO_FALLBACK", "no-fallback" },
- { VTE_PTY_DEFAULT, "VTE_PTY_DEFAULT", "default" },
+ static const GEnumValue values[] = {
+ { VTE_ANTI_ALIAS_USE_DEFAULT, "VTE_ANTI_ALIAS_USE_DEFAULT", "use-default" },
+ { VTE_ANTI_ALIAS_FORCE_ENABLE, "VTE_ANTI_ALIAS_FORCE_ENABLE", "force-enable" },
+ { VTE_ANTI_ALIAS_FORCE_DISABLE, "VTE_ANTI_ALIAS_FORCE_DISABLE", "force-disable" },
{ 0, NULL, NULL }
};
GType g_define_type_id = \
- g_flags_register_static (g_intern_static_string ("VtePtyFlags"), values);
+ g_enum_register_static (g_intern_static_string ("VteTerminalAntiAlias"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
-
+/* enumerations from "vtepty.h" */
GType
-vte_pty_error_get_type (void)
+vte_pty_flags_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile)) {
- static const GEnumValue values[] = {
- { VTE_PTY_ERROR_PTY_HELPER_FAILED, "VTE_PTY_ERROR_PTY_HELPER_FAILED", "pty-helper-failed" },
- { VTE_PTY_ERROR_PTY98_FAILED, "VTE_PTY_ERROR_PTY98_FAILED", "pty98-failed" },
+ static const GFlagsValue values[] = {
+ { VTE_PTY_NO_LASTLOG, "VTE_PTY_NO_LASTLOG", "no-lastlog" },
+ { VTE_PTY_NO_UTMP, "VTE_PTY_NO_UTMP", "no-utmp" },
+ { VTE_PTY_NO_WTMP, "VTE_PTY_NO_WTMP", "no-wtmp" },
+ { VTE_PTY_NO_HELPER, "VTE_PTY_NO_HELPER", "no-helper" },
+ { VTE_PTY_NO_FALLBACK, "VTE_PTY_NO_FALLBACK", "no-fallback" },
+ { VTE_PTY_DEFAULT, "VTE_PTY_DEFAULT", "default" },
{ 0, NULL, NULL }
};
GType g_define_type_id = \
- g_enum_register_static (g_intern_static_string ("VtePtyError"), values);
+ g_flags_register_static (g_intern_static_string ("VtePtyFlags"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
return g_define_type_id__volatile;
}
-
-/* enumerations from "vtedeprecated.h" */
GType
-vte_terminal_anti_alias_get_type (void)
+vte_pty_error_get_type (void)
{
static volatile gsize g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile)) {
static const GEnumValue values[] = {
- { VTE_ANTI_ALIAS_USE_DEFAULT, "VTE_ANTI_ALIAS_USE_DEFAULT", "use-default" },
- { VTE_ANTI_ALIAS_FORCE_ENABLE, "VTE_ANTI_ALIAS_FORCE_ENABLE", "force-enable" },
- { VTE_ANTI_ALIAS_FORCE_DISABLE, "VTE_ANTI_ALIAS_FORCE_DISABLE", "force-disable" },
+ { VTE_PTY_ERROR_PTY_HELPER_FAILED, "VTE_PTY_ERROR_PTY_HELPER_FAILED", "pty-helper-failed" },
+ { VTE_PTY_ERROR_PTY98_FAILED, "VTE_PTY_ERROR_PTY98_FAILED", "pty98-failed" },
{ 0, NULL, NULL }
};
GType g_define_type_id = \
- g_enum_register_static (g_intern_static_string ("VteTerminalAntiAlias"), values);
+ g_enum_register_static (g_intern_static_string ("VtePtyError"), values);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
}
@@ -156,6 +149,5 @@ vte_terminal_anti_alias_get_type (void)
}
-
/* Generated data ends here */
diff --git a/vte/src/vtetypebuiltins.h b/vte/src/vtetypebuiltins.h
index 2b9a0c5..5865c7e 100644
--- a/vte/src/vtetypebuiltins.h
+++ b/vte/src/vtetypebuiltins.h
@@ -1,5 +1,5 @@
-/* Generated data (by glib-mkenums) */
+/* This file is generated by glib-mkenums, do not modify it. This code is licensed under the same license as
the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */
#if !defined (__VTE_VTE_H_INSIDE__) && !defined (VTE_COMPILATION)
#error "Only <vte/vte.h> can be included directly."
@@ -22,15 +22,15 @@ GType vte_terminal_cursor_shape_get_type (void);
GType vte_terminal_write_flags_get_type (void);
#define VTE_TYPE_TERMINAL_WRITE_FLAGS (vte_terminal_write_flags_get_type ())
+/* enumerations from "vtedeprecated.h" */
+GType vte_terminal_anti_alias_get_type (void);
+#define VTE_TYPE_TERMINAL_ANTI_ALIAS (vte_terminal_anti_alias_get_type ())
+
/* enumerations from "vtepty.h" */
GType vte_pty_flags_get_type (void);
#define VTE_TYPE_PTY_FLAGS (vte_pty_flags_get_type ())
GType vte_pty_error_get_type (void);
#define VTE_TYPE_PTY_ERROR (vte_pty_error_get_type ())
-
-/* enumerations from "vtedeprecated.h" */
-GType vte_terminal_anti_alias_get_type (void);
-#define VTE_TYPE_TERMINAL_ANTI_ALIAS (vte_terminal_anti_alias_get_type ())
G_END_DECLS
#endif /* !VTE_TYPE_BUILTINS_H */
diff --git a/vte/termcaps/Makefile.am b/vte/termcaps/Makefile.am
index 965071b..0243751 100644
--- a/vte/termcaps/Makefile.am
+++ b/vte/termcaps/Makefile.am
@@ -1,12 +1,3 @@
EXTRA_DIST = xterm xterm.baseline
-termcapdir = $(pkgdatadir)/termcap-$(VTE_API_VERSION)
+termcapdir = $(datadir)/genius/
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
-
--include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
