fix #351 build on jammy

bkw777 · Feb 20, 2025 · 8e7b1e1 · 8e7b1e1
1 parent 449a428
commit 8e7b1e1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/BRANDING.mak b/BRANDING.mak
@@ -3,7 +3,7 @@
 
 VERSION_MAJOR = 1
 VERSION_MINOR = 4
-VERSION_MICRO = 11
+VERSION_MICRO = 12
 BRANDING_SHORTNAME = mainline
 BRANDING_LONGNAME = Mainline Kernels
 BRANDING_COPYRIGHT = 2019

diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ json-glib := json-glib-1.0
 gee := gee-0.8
 
 #VALACFLAGS += $(shell pkg-config $(json-glib) --atleast-version=1.6 && echo " -D HAVE_GLIB_JSON_1_6")
-#VALACFLAGS += $(shell pkg-config $(vte) --atleast-version=0.72 && echo " -D VTE_0_72")
+VALACFLAGS += $(shell pkg-config $(vte) --atleast-version=0.72 && echo " -D VTE_0_72")
 VALACFLAGS += $(shell pkg-config $(glib) --atleast-version=2.56 || echo " --target-glib 2.32")
 
 include BRANDING.mak

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+mainline (1.4.12) unstable; urgency=medium
+
+  * fix build on jammy by detecting vte version with pkgkit
+
+ -- Brian K. White <b.kenyon.w@gmail.com>  Wed, 19 Feb 2025 22:52:04 -0500
+
 mainline (1.4.11) unstable; urgency=medium
 
   * no functional change, just keep up with vte changes so it builds with current vte

diff --git a/po/messages.pot b/po/messages.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: mainline 1.4.11\n"
+"Project-Id-Version: mainline 1.4.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-16 13:22-0500\n"
+"POT-Creation-Date: 2025-02-19 22:24-0500\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
@@ -131,7 +131,7 @@ public class TerminalWindow : Gtk.Window {
 		btn_copy.clicked.connect(()=>{
 			long output_end_col, output_end_row;
 			term.get_cursor_position(out output_end_col, out output_end_row);
-#if VALA_0_56 // vte 0.72
+#if VTE_0_72
 			string? buf = term.get_text_range_format(TEXT,0,0,output_end_row,-1,null);
 #else
 			string? buf = term.get_text_range(0, 0, output_end_row, -1, null, null);