various improvements for emacs

[buildscripts] / emacs

diff --git a/emacs b/emacs
index 19bcc0bf96483dee867224c48706029b9ef07ee6..53a212a040bc3e6f27c60e311bd1e673aa6ea55a 100755 (executable)
--- a/emacs
+++ b/emacs
@@ -47,6 +47,8 @@ for x in {35..24}; do
 done
 
 pkgs=(gawk attr autoconf-archive git)
+##### 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
@@ -143,7 +145,16 @@ s 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
+  git checkout flidas
+else
+  # newer version than build-dep installs for buster
+  sudo apt-get -y install --purge --auto-remove libgmime-3.0-dev
+  git checkout upmaster
+fi
+git clean -xfffd
 ./autogen.sh
 make
 s make install
@@ -158,11 +169,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.
@@ -175,3 +187,5 @@ fi
 # fi
 # logq ./configure
 # logq make
+
+my-update-info-dir