0.47.04-r2

.config

@@ -132,14 +132,14 @@ CT_EMBARK_VERSION="2014-v3"
 CT_KEYBINDS=y
 CT_KEYBINDS_REV="master"
 CT_DFHACK=y
-CT_DFHACK_VERSION="0.47.04-alpha0"
+CT_DFHACK_VERSION="0.47.04-r1"
 CT_TWBT=y
 CT_TWBT_VERSION="04704"
 CT_GRAPHICS=y
 CT_GRAPHICS_VERSION="47.03a"
 CT_THERAPIST=y
-CT_THERAPIST_VERSION="v41.1.4"
-CT_THERAPIST_EXPERIMENTAL_LAYOUT="https://raw.githubusercontent.com/Dwarf-Therapist/Dwarf-Therapist/f3bcf92bfb13155f4e4badb1829559d95eb8d418/share/memory_layouts/linux/v0.47.04_linux64.ini"
+CT_THERAPIST_VERSION="v41.1.6"
+CT_THERAPIST_EXPERIMENTAL_LAYOUT=""
 # CT_SOUNDSENSE is not set
 CT_LEGENDS=y
-CT_LEGENDS_VERSION="1.18.2"
+CT_LEGENDS_VERSION="1.19.0"

.gitignore

@@ -13,3 +13,5 @@ paths.*
 config/configure.in
 x-tools
 .config.*
+*.bz2
+

patches/lnp/default/200-fix-python3-terminal-handling.patch

@@ -0,0 +1,57 @@
+--- a/core/terminal.py	2020-03-30 20:15:28.557439627 +0200
++++ b/core/terminal.py	2020-03-30 19:50:32.360184958 +0200
+@@ -121,7 +121,7 @@
+     def get_command_line():
+         s = subprocess.check_output(
+             ['kreadconfig', '--file', 'kdeglobals', '--group', 'General',
+-             '--key', 'TerminalApplication', '--default', 'konsole']).replace(
++             '--key', 'TerminalApplication', '--default', 'konsole']).decode().replace(
+                  '\n', '')
+         return ['nohup', s, '-e']
+
+@@ -159,11 +159,11 @@
+             term = subprocess.check_output([
+                 'gsettings', 'get',
+                 'org.gnome.desktop.default-applications.terminal', 'exec'
+-            ]).replace('\n', '').replace("'", '')
++            ]).decode().replace('\n', '').replace("'", '')
+             term_arg = subprocess.check_output([
+                 'gsettings', 'get',
+                 'org.gnome.desktop.default-applications.terminal', 'exec-arg'
+-            ]).replace('\n', '').replace("'", '')
++            ]).decode().replace('\n', '').replace("'", '')
+             return ['nohup', term, term_arg]
+         except: #fallback to older gconf
+             pass
+@@ -171,11 +171,11 @@
+             term = subprocess.check_output([
+                 'gconftool-2', '--get',
+                 '/desktop/gnome/applications/terminal/exec'
+-            ]).replace('\n', '')
++            ]).decode().replace('\n', '')
+             term_arg = subprocess.check_output([
+                 'gconftool-2', '--get',
+                 '/desktop/gnome/applications/terminal/exec_arg'
+-            ]).replace('\n', '')
++            ]).decode().replace('\n', '')
+             return ['nohup', term, term_arg]
+         except:
+             raise Exception("Unable to determine terminal command.")
+@@ -188,7 +188,7 @@
+     def detect():
+         try:
+             s = subprocess.check_output(
+-                ['ps', '-eo', 'comm='], stderr=subprocess.STDOUT)
++                ['ps', '-eo', 'comm='], stderr=subprocess.STDOUT).decode()
+             return 'xfce' in s
+         except:
+             return False
+@@ -364,7 +364,7 @@
+     while True:
+         try:
+             with open(fn, 'w+b') as f:
+-                f.write(str(value))
++                f.write(str(value).encode())
+             return
+         except IOError:
+             pass

scripts/build/dfhack.sh

@@ -54,5 +54,6 @@ do_dfhack_build() {
 	echo "#define DFHACK_GIT_XML_MATCH" >> ../library/include/git-describe.h
 	CT_DoExecLog ALL ninja -j5 install
 	CT_DoExecLog ALL rm -f "${df_dir}/libs/libstdc++.so.6"
+	CT_DoExecLog ALL cp -f "${df_dir}/dfhack.init-example" "${df_dir}/dfhack.init"
  	CT_Popd
 }

scripts/build/lnp.sh

@@ -7,7 +7,7 @@ get_lnp_credits() {
 	echo "Michael Madsen"
 }
 get_lnp_url() {
-	echo "https://bitbucket.org/Pidgeot/python-lnp"
+	echo "https://github.com/Pidgeot/python-lnp"
 }
 
 get_lnp_dir() {
@@ -18,7 +18,7 @@ get_lnp_dir() {
 do_lnp_get() {
     # official python-LNP
 	# https://bitbucket.org/Pidgeot/python-lnp
-	CT_GetHG "lnp" "${CT_LNP_VERSION}" \
+	CT_GetGit "lnp" "${CT_LNP_VERSION}" \
 			 "$(get_lnp_url)"
 }