diff options
Diffstat (limited to 'app-emacs/cask/files')
| -rw-r--r-- | app-emacs/cask/files/cask-bin-launcher-fix.patch | 24 | ||||
| -rw-r--r-- | app-emacs/cask/files/cask-no-bootstrap.patch | 43 |
2 files changed, 67 insertions, 0 deletions
diff --git a/app-emacs/cask/files/cask-bin-launcher-fix.patch b/app-emacs/cask/files/cask-bin-launcher-fix.patch new file mode 100644 index 000000000000..704d284a13dc --- /dev/null +++ b/app-emacs/cask/files/cask-bin-launcher-fix.patch @@ -0,0 +1,24 @@ +diff --git a/bin/cask b/bin/cask +index 55d4d86..37a5c9c 100755 +--- a/bin/cask ++++ b/bin/cask +@@ -39,17 +39,7 @@ case $subcommand in + *) + WHICH=${WHICH:-which} + READLINK=$($WHICH readlink || true) +- if [ "$(uname || true)" == "Darwin" ] ; then +- READLINK= +- fi +- READLINK=${READLINK:-$($WHICH greadlink || true)} +- if [ ! -z "$READLINK" ] ; then +- SRCDIR__=$($READLINK -f "$CASK") +- else +- SRCDIR__=$(python -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$CASK") +- fi +- SRCDIR_=$(dirname "$SRCDIR__") +- SRCDIR=$(dirname "$SRCDIR_") +- "$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@" ++ SRCDIR="@SITELISP@" ++ "$EMACS" -q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@" + ;; + esac diff --git a/app-emacs/cask/files/cask-no-bootstrap.patch b/app-emacs/cask/files/cask-no-bootstrap.patch new file mode 100644 index 000000000000..c0d691a98b4e --- /dev/null +++ b/app-emacs/cask/files/cask-no-bootstrap.patch @@ -0,0 +1,43 @@ +diff --git a/cask-cli.el b/cask-cli.el +index f97a28a..eda6d8f 100644 +--- a/cask-cli.el ++++ b/cask-cli.el +@@ -34,8 +34,7 @@ + (or load-file-name byte-compile-current-file buffer-file-name))) + "Path to Cask root.")) + +-(require 'cask-bootstrap (expand-file-name "cask-bootstrap" cask-directory)) +-(require 'cask (expand-file-name "cask" cask-directory)) ++(require 'cask) + + (when noninteractive + (shut-up-silence-emacs)) +diff --git a/cask.el b/cask.el +index 7828f49..0bfc7ab 100644 +--- a/cask.el ++++ b/cask.el +@@ -1,4 +1,4 @@ +-;;; cask.el --- Cask: Project management for package development -*- lexical-binding: t; no-byte-compile: t -*- ++;;; cask.el --- Cask: Project management for package development -*- lexical-binding: t -*- + + ;; Copyright (C) 2012-2022 Johan Andersson + ;; Copyright (C) 2013 Sebastian Wiesner <swiesner@lunaryorn.com> +@@ -45,7 +45,17 @@ + (:else (buffer-file-name)))) + "Path to Cask root.")) + +-(require 'cask-bootstrap (expand-file-name "cask-bootstrap" cask-directory)) ++(require 'ansi) ++(require 'cl-generic) ++(require 'cl-lib) ++(require 'commander) ++(require 'eieio) ++(require 'epl) ++(require 'f) ++(require 'package-build) ++(require 'package-recipe) ++(require 's) ++(require 'shut-up) + + (setq package-build-verbose nil) ; Make package-build quiet by + ; not allowing it to print any |