chore(release): 0.6.32

Fixes #69

Brewfile

@@ -3,6 +3,7 @@
 brew 'autoconf'
 brew 'coreutils'
 brew 'curl'
+brew 'dbus'
 brew 'expat'
 brew 'gcc'
 brew 'gmp'
@@ -22,5 +23,6 @@ brew 'make'
 brew 'ncurses'
 brew 'nettle'
 brew 'pkg-config'
+brew 'sqlite'
 brew 'texinfo'
 brew 'zlib'

CHANGELOG.md

@@ -2,6 +2,47 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.6.32](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.31...v0.6.32) (2022-04-30)
+
+
+### Features
+
+* **dbus:** add flag to explicitly disable dbus support ([8ad3ff4](https://github.com/jimeh/build-emacs-for-macos/commit/8ad3ff4f53505408aa097527177032a1fd6008e0)), closes [#69](https://github.com/jimeh/build-emacs-for-macos/issues/69)
+* **deps:** add sqlite brew dependency for Emacs 29.x ([a20a845](https://github.com/jimeh/build-emacs-for-macos/commit/a20a8456ab1e8de6357d5d121b9565ba65a6dd71))
+
+
+### Bug Fixes
+
+* **native-comp:** support libgccjit 11.3.0 ([e31f5aa](https://github.com/jimeh/build-emacs-for-macos/commit/e31f5aaf9355b674c2a86b8eda35f6513f344b72)), closes [#71](https://github.com/jimeh/build-emacs-for-macos/issues/71)
+
+### [0.6.31](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.30...v0.6.31) (2022-02-25)
+
+
+### Bug Fixes
+
+* set source-directory correctly ([07e0e3d](https://github.com/jimeh/build-emacs-for-macos/commit/07e0e3dacddfbdb7a59aceaa2dc9cdf503ac2bcc)), closes [#68](https://github.com/jimeh/build-emacs-for-macos/issues/68)
+
+### [0.6.30](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.29...v0.6.30) (2022-02-08)
+
+
+### Bug Fixes
+
+* **site-lisp:** add Homebrew's site-lisp directory to locallisppath ([cbd8cb2](https://github.com/jimeh/build-emacs-for-macos/commit/cbd8cb27b6ceff2e128c38cd1cc8f8380b9b4bfb))
+
+### [0.6.29](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.28...v0.6.29) (2022-02-07)
+
+
+### Features
+
+* **cask:** add support for pretest builds ([084776d](https://github.com/jimeh/build-emacs-for-macos/commit/084776db6b7e61958088d7b2a2588e9889e60c21))
+
+### [0.6.28](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.27...v0.6.28) (2022-01-15)
+
+
+### Features
+
+* **build:** add dbus dependency to enable support in Emacs builds ([68ef4c0](https://github.com/jimeh/build-emacs-for-macos/commit/68ef4c066c3fd1a7337198e8f773866088b4f481))
+
 ### [0.6.27](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.26...v0.6.27) (2021-12-05)
 
 

build-emacs-for-macos

@@ -359,13 +359,15 @@ class Build
         '--with-modules',
         '--enable-locallisppath=' \
         '/Library/Application Support/Emacs/${version}/site-lisp:' \
-        '/Library/Application Support/Emacs/site-lisp'
+        '/Library/Application Support/Emacs/site-lisp:' \
+        '/usr/local/share/emacs/site-lisp'
       ]
       if options[:xwidgets] && supports_xwidgets?
         configure_flags << '--with-xwidgets'
       end
       configure_flags << native_comp_configure_flag if options[:native_comp]
       configure_flags << '--without-rsvg' if options[:rsvg] == false
+      configure_flags << '--without-dbus' if options[:dbus] == false
 
       run_cmd './configure', *configure_flags
 
@@ -811,7 +813,8 @@ end
 class CSourcesEmbedder < AbstractEmbedder
   PATH_PATCH = <<~ELISP
     ;; Allow Emacs to find bundled C sources.
-    (setq source-directory (expand-file-name ".."))
+    (setq source-directory
+      (expand-file-name ".." (file-name-directory load-file-name)))
   ELISP
 
   attr_reader :source_dir
@@ -1124,7 +1127,8 @@ class GccInfo
 
   def libgccjit_lib_dir
     @libgccjit_lib_dir ||= Dir[
-      File.join(libgccjit_root_dir, 'lib/gcc/*/libgccjit.so*')
+      File.join(libgccjit_root_dir, 'lib/gcc/*/libgccjit*.dylib'),
+      File.join(libgccjit_root_dir, 'lib/gcc/*/libgccjit.so*'),
     ]
                            .map { |path| File.dirname(path) }
                            .select { |path| File.basename(path).match(/^\d+$/) }
@@ -1174,6 +1178,7 @@ if __FILE__ == $PROGRAM_NAME
     native_march: false,
     parallel: Etc.nprocessors,
     rsvg: true,
+    dbus: true,
     xwidgets: true,
     github_auth: true,
     dist_include: ['COPYING'],
@@ -1240,6 +1245,11 @@ if __FILE__ == $PROGRAM_NAME
         cli_options[:rsvg] = v
       end
 
+      opts.on('--[no-]dbus',
+              'Enable/disable dbus support (default: enabled)') do |v|
+        cli_options[:dbus] = v
+      end
+
       opts.on('--no-titlebar', 'Apply no-titlebar patch (default: disabled)') do
         cli_options[:no_titlebar] = true
       end

helper/emacs-cli.bash

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 resolve_link() {
-  "$(type -p greadlink readlink | head -1)" "$1"
+  "$(command -v greadlink || command -v readlink)" "$1"
 }
 
 abs_dirname() {

pkg/release/version.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"regexp"
+	"strings"
 )
 
 // Errors
@@ -26,7 +27,8 @@ func VersionToName(version string) (string, error) {
 		return "", ErrEmptyVersion
 	}
 
-	if stableVersion.MatchString(version) {
+	if stableVersion.MatchString(version) ||
+		strings.HasSuffix(version, "-pretest") {
 		return "Emacs-" + version, nil
 	}