Skip to content

Commit

Permalink
recompiling on F18
Browse files Browse the repository at this point in the history
  • Loading branch information
lzap committed Apr 2, 2013
1 parent 0ac7572 commit 8207b7e
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 17 deletions.
15 changes: 10 additions & 5 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Installation Instructions
*************************

Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006, 2007, 2008, 2009 Free Software Foundation, Inc.
Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
Inc.

Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
Expand Down Expand Up @@ -226,6 +226,11 @@ order to use an ANSI C compiler:

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.

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
Expand Down Expand Up @@ -304,9 +309,10 @@ 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 bug. Until the bug is fixed you can use this workaround:
an Autoconf limitation. Until the limitation is lifted, you can use
this workaround:

CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash

`configure' Invocation
======================
Expand Down Expand Up @@ -362,4 +368,3 @@ operates.

`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ AM_PROG_VALAC([0.7.0])
AC_PROG_INSTALL
IT_PROG_INTLTOOL([0.35])

pkg_modules="gtk+-2.0 >= 2.14.0 vte >= 0.28.0 gee-1.0 >= 0.6.1 gio-2.0 >= 2.28.0 gconf-2.0 >= 2.1.2"
VIDE_PACKAGES="--pkg gtk+-2.0 --pkg vte --pkg gee-1.0 --pkg gio-2.0 --pkg posix --pkg gconf-2.0"
pkg_modules="gtk+-2.0 >= 2.14.0 vte >= 0.28.0 gee-0.8 >= 0.6.1 gio-2.0 >= 2.28.0 gconf-2.0 >= 2.1.2"
VIDE_PACKAGES="--pkg gtk+-2.0 --pkg vte --pkg gee-0.8 --pkg gio-2.0 --pkg posix --pkg gconf-2.0"
PKG_CHECK_MODULES(VIDE, [$pkg_modules])
AC_SUBST(VIDE_CFLAGS)
AC_SUBST(VIDE_LIBS)
Expand Down
2 changes: 1 addition & 1 deletion src/keybinding.vala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class KeyBindingManager : GLib.Object
/**
* list of binded keybindings
*/
private Gee.List<KeyBinding> bindings = new Gee.ArrayList<KeyBinding>();
private Gee.List<KeyBinding> bindings = new Gee.ArrayList<KeyBinding>(null);

/**
* Helper class to store keybinding
Expand Down
10 changes: 5 additions & 5 deletions src/main_window.vala
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class Vide.VideTerminal {
public string work_dir {get;set;}
public Terminal term {get;set;}
public int tab_number {get;set;}
public MenuItem menu {get;set;}
public Gtk.MenuItem menu {get;set;}
public bool run_on_startup {get;set;}
}

Expand All @@ -39,7 +39,7 @@ public class Vide.MainWindow: Window {

private Notebook notebook;

private Menu menu;
private Gtk.Menu menu;

private MenuToolButton execute_button;

Expand Down Expand Up @@ -80,7 +80,7 @@ public class Vide.MainWindow: Window {
this.config = new VideConfig();
notebook = new Notebook();
set_default(notebook);
menu = new Menu();
menu = new Gtk.Menu();

var toolbar = new Toolbar ();
execute_button = new MenuToolButton.from_stock(Stock.MEDIA_PLAY);
Expand Down Expand Up @@ -144,7 +144,7 @@ public class Vide.MainWindow: Window {
private void add_term(VideTerminal vterm) {
// create menu if there is not any
if (vterm.menu == null) {
vterm.menu = new MenuItem.with_label(vterm.name);
vterm.menu = new Gtk.MenuItem.with_label(vterm.name);
vterm.menu.activate.connect( (term) => {
select_term(vterm);
});
Expand Down Expand Up @@ -243,7 +243,7 @@ public class Vide.MainWindow: Window {
VideTerminal vterm = create_tab(tab_name,command,work_dir,run_on_startup);
// execute command
string wd = vterm.work_dir ?? Environment.get_variable("HOME");
vterm.pid = vterm.term.fork_command( (string) 0, (string[]) 0, new string[]{}, wd, true, true, true);
vterm.pid = vterm.term.fork_command("/bin/bash", {"-l"}, new string[]{}, wd, true, true, true);
if (vterm.pid != -1)
vterm.term.feed_child(vterm.command + "\n", vterm.command.length + 1);

Expand Down
5 changes: 1 addition & 4 deletions vide.spec
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ Requires: dbus gtk2 vte libgee glib2 GConf2

BuildRequires: intltool gettext desktop-file-utils
BuildRequires: vala-devel >= 0.12
BuildRequires: gtk2-devel vte-devel glib2-devel GConf2-devel

# https://bugzilla.redhat.com/show_bug.cgi?id=736674
BuildRequires: pkgconfig(gee-1.0)
BuildRequires: gtk2-devel vte-devel libgee-devel glib2-devel GConf2-devel


%description
Expand Down

0 comments on commit 8207b7e

Please sign in to comment.