X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=emacs;h=727dee86a596a6ce3f17f902bcbfb1b963acf032;hb=850dedd6b7a117c86c4e3e97a4ad1c948e9cd7a0;hp=4dc47efe795a6fcb0bc3acb1709802e265a31f8c;hpb=3aee84ebaf058d06a30440bec25eec32a3b4e5d7;p=buildscripts

diff --git a/emacs b/emacs
index 4dc47ef..727dee8 100755
--- a/emacs
+++ b/emacs
@@ -46,7 +46,9 @@ for x in {35..24}; do
   fi
 done
 
-pkgs=(gawk attr autoconf-archive git)
+pkgs=(gawk attr autoconf-archive git install-info)
+##### warning, apt-rdepends seems to look at the newest version of the package,
+##### not the one that build-dep would install.
 if $show_pkgs; then
   echo ${pkgs[*]}
   for x in $latest_emacs maildir-utils; do
@@ -56,7 +58,7 @@ if $show_pkgs; then
     if ! type -p apt-rdepends &>/dev/null; then
       sudo apt-get -y install --purge --auto-remove apt-rdepends
     fi
-    apt-rdepends --build-depends --follow=DEPENDS $x|sed -rn 's/^\s*Build-Depends: (\S+).*/\1/p'
+    apt-rdepends -p --build-depends --follow=DEPENDS $x|sed -rn 's/^\s*Build-Depends: (\S+).*/\1/p'
   done
   exit 0
 fi
@@ -137,15 +139,26 @@ logq make -j `nproc`
 logq sudo make install
 
 # make emacs always work for root
-s lnf /usr/local/bin/emacs /usr/bin
+s /a/exe/lnf /usr/local/bin/emacs /usr/bin
 
 
 #git clone https://github.com/djcb/mu
+# note: master failed, i moved back to the commit before a bug https://github.com/djcb/mu/issues/1400
 # from its HACKING file
+
 cd /a/opt/mu
+if [[ $(distro-name) == trisquel ]]; then
+  # use the flidas branch, stuck behind because
+  # needs newer crypt libraries that are too troublesome.
+  cd /a/opt/muflidas
+else
+  # newer version than build-dep installs for buster
+  sudo apt-get -y install --purge --auto-remove libgmime-3.0-dev
+fi
+git clean -xfffd
 ./autogen.sh
 make
-s make install
+sudo make install
 # note uninstall is implemented
 
 if $recompile; then
@@ -157,11 +170,12 @@ fi
 # org-edit-src-exit does not get bound, so using latest
 #/a/bin/buildscripts/org-mode
 
-if $update; then
-  logq pi bzr
-  cd ~/.emacs.d/src/mediawiki-el
-  bzr pull
-fi
+# disabled as i haven't used it in a while
+# if $update; then
+#   logq pi bzr
+#   cd ~/.emacs.d/src/mediawiki-el
+#   bzr pull
+# fi
 
 
 # not keeping up with the latest gnus development.
@@ -174,3 +188,5 @@ fi
 # fi
 # logq ./configure
 # logq make
+
+my-update-info-dir