support building with valac < 0.40 (xenial)

bkw777 · Aug 13, 2021 · c28d891 · c28d891
1 parent e831a9b
commit c28d891
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: mainline
 Section: utils
 Priority: extra
 Maintainer: Brian K. White <b.kenyon.w@gmail.com>
-Build-Depends: debhelper, valac (>= 0.40), libgtk-3-dev, libgee-0.8-dev, libjson-glib-dev, libvte-2.91-dev, lsb-release
+Build-Depends: debhelper, valac, libgtk-3-dev, libgee-0.8-dev, libjson-glib-dev, libvte-2.91-dev, lsb-release
 Standards-Version: 4.3.0
 Homepage: https://github.com/bkw777/mainline
 

diff --git a/debian/control.src b/debian/control.src
@@ -2,7 +2,7 @@ Source: BRANDING_SHORTNAME
 Section: utils
 Priority: extra
 Maintainer: BRANDING_AUTHORNAME <BRANDING_AUTHOREMAIL>
-Build-Depends: debhelper, valac (>= 0.40), libgtk-3-dev, libgee-0.8-dev, libjson-glib-dev, libvte-2.91-dev, lsb-release
+Build-Depends: debhelper, valac, libgtk-3-dev, libgee-0.8-dev, libjson-glib-dev, libvte-2.91-dev, lsb-release
 Standards-Version: 4.3.0
 Homepage: BRANDING_WEBSITE
 

diff --git a/po/messages.pot b/po/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mainline 1.0.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-12 21:13-0400\n"
+"POT-Creation-Date: 2021-08-13 15:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/src/Gtk/TerminalWindow.vala b/src/Gtk/TerminalWindow.vala
@@ -190,7 +190,7 @@ public class TerminalWindow : Gtk.Window {
 				d, //working_directory
 				argv, //argv
 				env, //env
-				GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD, //spawn_flags
+				GLib.SpawnFlags.SEARCH_PATH, //spawn_flags
 				null, //child_setup
 				out child_pid,
 				null

diff --git a/src/Utility/TeeJee.ProcessHelper.vala b/src/Utility/TeeJee.ProcessHelper.vala
@@ -146,7 +146,12 @@ namespace TeeJee.ProcessHelper{
 		 * */
 
 		int[] child_pids = get_process_children (process_pid);
+
+#if VALA_0_40
 		Posix.kill (process_pid, Posix.Signal.TERM);
+#else
+		Posix.kill (process_pid, Posix.SIGTERM);
+#endif
 
 		if (killChildren){
 			Pid childPid;