0001-remove-trailing-whitespace.patch

From 4f5f44ae06fc706f226e48882005a55e371f35de Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 23 Jan 2018 12:53:59 -0800
Subject: [PATCH 1/3] remove trailing whitespace

---
 PKGBUILD | 110 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index b8ce521..c8f9c90 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
 
 #######################################################################
 # CAVEAT LECTOR: This PKGBUILD is highly opinionated. I give you
-#                enough rope to hang yourself, but by default it 
+#                enough rope to hang yourself, but by default it
 #                only enables the features I use.
 #
 #        TLDR: yaourt users, cry me a river.
 #
-#        Everyone else: do not update blindly this PKGBUILD. At least 
+#        Everyone else: do not update blindly this PKGBUILD. At least
 #        make sure to compare and understand the changes.
 #
 #######################################################################
@@ -17,9 +17,9 @@
 #
 # Pick a branch from the output of "git branch" ran on your local copy
 # of the emacs repository.
-# 
-# E.g.: 
-# 
+#
+# E.g.:
+#
 # BRANCH=master
 # BRANCH=emacs-26
 #
@@ -45,7 +45,7 @@ NOTKIT=           # Use no toolkit widgets. Like B&W Twm (001d sk00l).
                   # Read https://wiki.archlinux.org/index.php/X_resources
                   # https://en.wikipedia.org/wiki/X_resources
                   # and https://www.emacswiki.org/emacs/XftGnuEmacs
-                  # for some tips on using outline fonts with 
+                  # for some tips on using outline fonts with
                   # Xft, if you choose no toolkit or Lucid.
                   #
 LUCID=            # Use the lucid, a.k.a athena, toolkit. Like XEmacs, sorta.
@@ -61,7 +61,7 @@ CAIRO=            # Highly experimental. Maintaner dissapeared.
 XWIDGETS=         # Use GTK+ widgets pulled from webkit2gtk. Usable.
 DOCS_HTML=        # Generate and install html documentation.
 DOCS_PDF=         # Generate and install pdf documentation.
-MAGICK=           # Imagemagick 6 libraries support. Imagemagick, 
+MAGICK=           # Imagemagick 6 libraries support. Imagemagick,
                   # like flash, is bug ridden and won't die; yet useful.
 NOGZ=             # Don't compress el files.
 #######################################################################
@@ -96,17 +96,17 @@ if [[ $LTO = "yes" ]]; then
   export tXXFLAGS+=" -flto"
 fi
 
-if [[ $NOTKIT = "YES" ]]; then  
+if [[ $NOTKIT = "YES" ]]; then
   depends+=( 'dbus high-color-icon-theme' 'libxinearama' 'libxrandr' 'lcms2' 'librsvg' );
-elif [[ $LUCID = "YES" ]]; then  
+elif [[ $LUCID = "YES" ]]; then
   depends+=( 'dbus high-color-icon-theme' 'libxinearama' 'libfixes' 'lcms2' 'librsvg' 'xaw3d' );
 elif [[ $GTK2 = "YES" ]]; then
   depends+=( 'gtk2' );
-else 
-  depends+=( 'gtk3' ); 
+else
+  depends+=( 'gtk3' );
 fi
 
-if [[ $GPM = "YES" ]]; then 
+if [[ $GPM = "YES" ]]; then
   depends+=( 'gpm');
 fi
 
@@ -118,7 +118,7 @@ if [[ $OTF = "YES" ]] && [[ ! $M17N = "YES" ]]; then
   depends+=( 'libotf' );
 fi
 
-if [[ $MAGICK = "YES" ]]; then 
+if [[ $MAGICK = "YES" ]]; then
   depends+=( 'libmagick6'  'libjpeg-turbo' 'giflib' );
 elif [[ ! $NOX = "YES" ]]; then
   depends+=( 'libjpeg-turbo' 'giflib' );
@@ -126,25 +126,25 @@ else
   depends+=();
 fi
 
-if [[ $CAIRO = "YES" ]]; then 
-  depends+=( 'cairo' ); 
+if [[ $CAIRO = "YES" ]]; then
+  depends+=( 'cairo' );
 fi
 
 if [[ $XWIDGETS = "YES" ]]; then
-  if [[ $GTK2 = "YES" ]] || [[ $LUCID = "YES" ]] || [[ $NOTKIT = "YES" ]] || [[ $CLI = "YES" ]]; then 
+  if [[ $GTK2 = "YES" ]] || [[ $LUCID = "YES" ]] || [[ $NOTKIT = "YES" ]] || [[ $CLI = "YES" ]]; then
     echo "";
     echo "";
     echo "Xwidgets support *requires* gtk+3!!!";
     echo "";
     echo "";
     exit 1;
-  else 
+  else
     depends+=( 'webkit2gtk' );
   fi
 fi
 
-if [[ $DOCS_PDF = "YES" ]]; then 
-  makedepends+=( 'texlive-core' ); 
+if [[ $DOCS_PDF = "YES" ]]; then
+  makedepends+=( 'texlive-core' );
 fi
 #######################################################################
 
@@ -179,13 +179,13 @@ build() {
   cd "$srcdir/emacs-git"
 
   local _conf=(
-    --prefix=/usr 
-    --sysconfdir=/etc 
-    --libexecdir=/usr/lib 
-    --localstatedir=/var 
-    --mandir=/usr/share/man 
-    --with-gameuser=:games 
-    --with-sound=alsa 
+    --prefix=/usr
+    --sysconfdir=/etc
+    --libexecdir=/usr/lib
+    --localstatedir=/var
+    --mandir=/usr/share/man
+    --with-gameuser=:games
+    --with-sound=alsa
     --with-modules
 # Beware https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25228
 # dconf and gconf break font settings you set in ~/.emacs.
@@ -205,36 +205,36 @@ if [[ $CLANG = "YES" ]]; then
  );
 fi
 
-if [[ $LTO = "YES" ]]; then 
-  _conf+=( 
-    '--enable-link-time-optimization' 
-  ); 
+if [[ $LTO = "YES" ]]; then
+  _conf+=(
+    '--enable-link-time-optimization'
+  );
 fi
 
 if [[ $CLI = "YES" ]]; then
-  _conf+=( '--without-x' '--with-x-toolkit=no' '--without-xft' --without-lcms2' '--without-rsvg' ); 
+  _conf+=( '--without-x' '--with-x-toolkit=no' '--without-xft' --without-lcms2' '--without-rsvg' );
 elif [[ $NOTKIT = "YES" ]]; then
-  _conf+=( '--with-x-toolkit=no' 'without-toolkit-scrollbars' '--with-xft' '--without-xaw3d' ); 
+  _conf+=( '--with-x-toolkit=no' 'without-toolkit-scrollbars' '--with-xft' '--without-xaw3d' );
 elif [[ $LUCID = "YES" ]]; then
-  _conf+=( '--with-x-toolkit=lucid' '--with-xft' '--with-xaw3d' ); 
-elif [[ $GTK2 = "YES" ]]; then 
+  _conf+=( '--with-x-toolkit=lucid' '--with-xft' '--with-xaw3d' );
+elif [[ $GTK2 = "YES" ]]; then
   _conf+=( '--with-x-toolkit=gtk2' '--without-gsettings' '--without-xaw3d' );
 else [[ GTK3 = "YES" ]]; then
-  _conf+=( '--with-x-toolkit=gtk3' --without-xaw3d' ); 
+  _conf+=( '--with-x-toolkit=gtk3' --without-xaw3d' );
 fi
 
-if [[ ! $GPM = "YES" ]]; then 
-  _conf+=( '--without-gpm' ); 
+if [[ ! $GPM = "YES" ]]; then
+  _conf+=( '--without-gpm' );
 fi
 
-if [[ ! $M17N = "YES" ]]; then 
-  _conf+=( '--without-m17n-flt' ); 
+if [[ ! $M17N = "YES" ]]; then
+  _conf+=( '--without-m17n-flt' );
 fi
 
-if [[ $MAGICK = "YES" ]]; then 
-  _conf+=( 
+if [[ $MAGICK = "YES" ]]; then
+  _conf+=(
     '--with-imagemagick'
- ); 
+ );
   export PKG_CONFIG_PATH=/usr/lib/imagemagick6/pkgconfig
 else
   _conf+=( '--without-imagemagick' );
@@ -250,12 +250,12 @@ else
   );
 fi
 
-if [[ $CAIRO = "YES" ]]; then 
-  _conf+=( '--with-cairo' ); 
+if [[ $CAIRO = "YES" ]]; then
+  _conf+=( '--with-cairo' );
 fi
 
-if [[ $XWIDGETS = "YES" ]]; then 
-  _conf+=( '--with-xwidgets' ); 
+if [[ $XWIDGETS = "YES" ]]; then
+  _conf+=( '--with-xwidgets' );
 fi
 
 if [[ $NOGZ = "YES" ]]; then
@@ -275,11 +275,11 @@ fi
   ./configure "${_conf[@]}"
 
   # Using "make" instead of "make bootstrap" enables incremental
-  # compiling. Less time recompiling. Yay! But you may 
-  # need to use bootstrap sometimes to unbreak the build. 
+  # compiling. Less time recompiling. Yay! But you may
+  # need to use bootstrap sometimes to unbreak the build.
   # Just add it to the command line.
   #
-  # Please note that incremental compilation implies that you 
+  # Please note that incremental compilation implies that you
   # are reusing your src directory!
   #
   make
@@ -290,11 +290,11 @@ fi
   #cd ../
 
   # Optional documentation formats.
-  if [[ $DOCS_HTML = "YES" ]]; then 
-    make html; 
+  if [[ $DOCS_HTML = "YES" ]]; then
+    make html;
   fi
-  if [[ $DOCS_PDF = "YES" ]]; then 
-    make pdf; 
+  if [[ $DOCS_PDF = "YES" ]]; then
+    make pdf;
   fi
   if [[ $CHECK = "YES" ]]; then
     make check;
@@ -328,9 +328,9 @@ package() {
   chmod 775 "$pkgdir"/var/games
   chmod 775 "$pkgdir"/var/games/emacs
   chown -R root:games "$pkgdir"/var/games
-  
+
   # The logic used to install systemd's user service is partially broken
-  # under Arch Linux model, because it adds $DESTDIR as prefix to the 
+  # under Arch Linux model, because it adds $DESTDIR as prefix to the
   # final Exec targets. The fix is to hack it with an axe.
   install -Dm644 etc/emacs.service \
     "$pkgdir"/usr/lib/systemd/user/emacs.service
-- 
2.16.1

0002-add-back-missing-dollar-sign.patch

From 5f01b75ea239272222b7ccf7535fd3cfbda103bb Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 23 Jan 2018 12:54:23 -0800
Subject: [PATCH 2/3] add back missing dollar sign

---
 PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PKGBUILD b/PKGBUILD
index c8f9c90..463b99f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -219,7 +219,7 @@ elif [[ $LUCID = "YES" ]]; then
   _conf+=( '--with-x-toolkit=lucid' '--with-xft' '--with-xaw3d' );
 elif [[ $GTK2 = "YES" ]]; then
   _conf+=( '--with-x-toolkit=gtk2' '--without-gsettings' '--without-xaw3d' );
-else [[ GTK3 = "YES" ]]; then
+else [[ $GTK3 = "YES" ]]; then
   _conf+=( '--with-x-toolkit=gtk3' --without-xaw3d' );
 fi
 
-- 
2.16.1

0003-fix-missing-quotes.patch

From 1c8ad2f5ef8fdd8a9db18c11024cb2d77a3d756f Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Tue, 23 Jan 2018 12:54:54 -0800
Subject: [PATCH 3/3] fix missing quotes

---
 PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 463b99f..956acfc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -212,7 +212,7 @@ if [[ $LTO = "YES" ]]; then
 fi
 
 if [[ $CLI = "YES" ]]; then
-  _conf+=( '--without-x' '--with-x-toolkit=no' '--without-xft' --without-lcms2' '--without-rsvg' );
+  _conf+=( '--without-x' '--with-x-toolkit=no' '--without-xft' '--without-lcms2' '--without-rsvg' );
 elif [[ $NOTKIT = "YES" ]]; then
   _conf+=( '--with-x-toolkit=no' 'without-toolkit-scrollbars' '--with-xft' '--without-xaw3d' );
 elif [[ $LUCID = "YES" ]]; then
@@ -220,7 +220,7 @@ elif [[ $LUCID = "YES" ]]; then
 elif [[ $GTK2 = "YES" ]]; then
   _conf+=( '--with-x-toolkit=gtk2' '--without-gsettings' '--without-xaw3d' );
 else [[ $GTK3 = "YES" ]]; then
-  _conf+=( '--with-x-toolkit=gtk3' --without-xaw3d' );
+  _conf+=( '--with-x-toolkit=gtk3' '--without-xaw3d' );
 fi
 
 if [[ ! $GPM = "YES" ]]; then
-- 
2.16.1