From f22fdf4a151ff0dcbbf1902977559eebe18613ea Mon Sep 17 00:00:00 2001
From: Ian Kelling <iank@fsf.org>
Date: Thu, 13 Jan 2022 14:31:26 -0500
Subject: [PATCH] minor fixes

---
 emacs       | 13 ++++++++++---
 tor-browser |  1 -
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/emacs b/emacs
index b1d3e6b..d6fd0c0 100755
--- a/emacs
+++ b/emacs
@@ -221,16 +221,23 @@ if [[ $(debian-codename) == flidas ]]; then
   # needs newer crypt libraries that are too troublesome.
   cd /a/opt/muflidas
 else
-  # newer version than build-dep installs for buster
-  m sudo apt-get -y install --purge --auto-remove libgmime-3.0-dev
+  # libgmime-3.0-dev is a newer version than build-dep installs for buster
+  m sudo apt-get -y install --purge --auto-remove libgmime-3.0-dev meson
 fi
 if $recompile || [[ $rev != "$head" ]]; then
   m git clean -xfffd
   m ./autogen.sh && make -j`nproc`
   # note uninstall is implemented
   m sudo make install
-  echo $head >~/.local/mu-build-git-revision
+  echo $head >$last_build
 else
+  # Workaround for some indecipherable build error
+  # that only happens after syncing the mu dir and not building from
+  # scratch. It seems there is some state somewhere, like ~/.local
+  # that doesn't get copied. Found the workaround by reading the Makefile,
+  # then doing a more verbose build with:
+  # ninja -C $PWD/build -v -d explain
+  sudo touch -d @$(($(stat -c%Y build/build.ninja) - 100)) /usr/local/bin/emacs
   m sudo make install
 fi
 
diff --git a/tor-browser b/tor-browser
index 3370981..df4dd8c 100755
--- a/tor-browser
+++ b/tor-browser
@@ -79,4 +79,3 @@ for x in tor-*.tar.xz; do
   [[ $x != $f ]] || continue
   command rm -f $x
 done
-sudo ln -sf /a/opt/tor-browser_en-US/Browser/start-tor-browser /usr/local/bin
-- 
2.30.2