Taylor Venable avatar Taylor Venable committed 09c1d5b

Update from upstream

Comments (0)

Files changed (1)

emacs-bzr/PKGBUILD

 # Maintainer: Neil Santos <nsantos16+aur@gmail.com>
 
-# Don't compile against Gtk+ 3.x by default; stick with Gtk+ 2.x
-_opt_use_gtk3="n"
+# Compile against Gtk+ 2.x, instead of the default 3.x
+_opt_use_gtk2="n"
+# Emacs is leaking like a sieve on my box with the default values;
+# this should be the number of bytes Emacs should allocate for pure
+# storage (see Elisp manual).  Default as of writing this is 1.62 megs
+# (not the final value; there are still calculations done on it).
+_opt_puresize="2000000"
 
 pkgname=emacs-bzr
-pkgver=108236
+pkgver=110380
 pkgrel=1
 pkgdesc='The extensible, customizable, self-documenting real-time display editor from its official Bzr repository'
 arch=('i686' 'x86_64')
 url='http://www.gnu.org/software/emacs/'
 license=('GPL3')
-if [[ $_opt_use_gtk3 = "y" ]]; then
+if [[ $_opt_use_gtk2 = "y" ]]; then
+  depends=('dbus-core' 'desktop-file-utils' 'libpng' 'libtiff' 'librsvg' 'giflib' 'gtk2' 'libxpm' 'libjpeg>=7' 'hicolor-icon-theme')
+else
   depends=('dbus-core' 'desktop-file-utils' 'libpng' 'libtiff' 'librsvg' 'giflib' 'gtk3' 'libxpm' 'libjpeg>=7' 'hicolor-icon-theme')
-else
-  depends=('dbus-core' 'desktop-file-utils' 'libpng' 'libtiff' 'librsvg' 'giflib' 'gtk2' 'libxpm' 'libjpeg>=7' 'hicolor-icon-theme')
 fi
 
 makedepends=('bzr' 'pkgconfig' 'texinfo')
 
   cp -urT $_bzrmod/ ${_bzrmod}-build
   cd ${_bzrmod}-build
+  msg "Adjusting BASE_PURESIZE to avoid possible leaks"
+  sed -i -e "s/\(define BASE_PURESIZE\s*(*\)[0-9]*/\1${_opt_puresize}/" src/puresize.h
+
+  msg "Bootstrapping Emacs Lisp files..."
+  make bootstrap
 
   mandir=/usr/share/man
   msg "Starting make..."
-  if [[ $_opt_use_gtk3 = "y" ]]; then
+  if [[ $_opt_use_gtk2 = "y" ]]; then
+    ./autogen.sh && ./configure --prefix=/usr \
+      --sysconfdir=/etc \
+      --localstatedir=/var \
+      --libexecdir=/usr/lib \
+      --mandir=${mandir} \
+      --without-sound \
+      --with-xft \
+      --with-x-toolkit=gtk2
+  else
     ./autogen.sh && ./configure --prefix=/usr \
       --sysconfdir=/etc \
       --localstatedir=/var \
       --without-sound \
       --with-xft \
       --with-x-toolkit=gtk3
-  else
-    ./autogen.sh && ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib \
-      --mandir=${mandir} \
-      --without-sound \
-      --with-xft \
-      --with-x-toolkit=gtk
   fi
+  make
   make DESTDIR=${pkgdir} install
 
   msg "Cleaning up..."
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.