Skip to content
This repository has been archived by the owner on Jul 21, 2019. It is now read-only.

Commit

Permalink
Fixed build issue with newer version of libvte291
Browse files Browse the repository at this point in the history
  • Loading branch information
teejee2008 committed Jun 30, 2018
1 parent f9fa8b2 commit 189130a
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 1 deletion.
2 changes: 2 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ aptik-gtk (18.6) xenial; urgency=medium
* Fixed scrolling issue with terminal

* Mounts: Prompt user for listing crypttab entries on Arch Linux

* Fixed build issue with newer version of libvte291

* UI improvements

Expand Down
8 changes: 8 additions & 0 deletions src/Gtk/TermBox.vala
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,17 @@ public class TermBox : Gtk.Box {
if (newline){
cmd = "%s\n".printf(cmd);
}

#if VTE_291_OLD

term.feed_child(cmd, -1);

#else

term.feed_child(cmd.to_utf8());

#endif

if (signal_child_exit){

Timeout.add(1000, ()=>{
Expand Down
17 changes: 16 additions & 1 deletion src/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,24 @@ man1dir=$(mandir)/man1
app_name=aptik-gtk
app_fullname='Aptik NG GTK'

# vte -----------------------------

vte_symbol = -D VTE_291
vte_version=$(shell { (pkg-config --modversion vte-2.91 | cut -d. -f2); } )

ifeq ($(shell { test ${vte_version} -lt 52 ; echo $$? ; } ), 0)
vte_symbol=$(shell echo '-D VTE_291_OLD')
else
vte_symbol=$(shell echo '-D VTE_291')
endif

# symbols --------------------------

symbols=$(shell echo "${vte_symbol}")

all:
# aptik-gtk
valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" --thread \
valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" ${symbols} --thread \
*.vala Gtk/*.vala Utility/Console/*.vala Utility/Gtk/*.vala Utility/*.vala \
-o ${app_name} \
--pkg glib-2.0 \
Expand Down

0 comments on commit 189130a

Please sign in to comment.