diff options
Diffstat (limited to 'dev-vcs/git/files/git-1.7.0-always-install-js.patch')
| -rw-r--r-- | dev-vcs/git/files/git-1.7.0-always-install-js.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/dev-vcs/git/files/git-1.7.0-always-install-js.patch b/dev-vcs/git/files/git-1.7.0-always-install-js.patch new file mode 100644 index 0000000..56f455e --- /dev/null +++ b/dev-vcs/git/files/git-1.7.0-always-install-js.patch @@ -0,0 +1,36 @@ +JS install cleanup fixes + +- Always install the JS for GitWeb, even if it is not being minified. +- Also ensure the minified JS is built before instaweb as it is referenced in + the sed expression. + +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> + +diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.0.orig/Makefile git-1.7.0/Makefile +--- git-1.7.0.orig/Makefile 2010-02-13 00:44:43.000000000 +0000 ++++ git-1.7.0/Makefile 2010-02-13 18:11:52.923807675 +0000 +@@ -1500,13 +1500,8 @@ + gitweb: + $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all + +-ifdef JSMIN +-OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/gitweb.min.js +-gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/gitweb.min.js +-else +-OTHER_PROGRAMS += gitweb/gitweb.cgi +-gitweb/gitweb.cgi: gitweb/gitweb.perl +-endif ++OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/$(GITWEB_JS) ++gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/$(GITWEB_JS) + $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@) + + ifdef JSMIN +@@ -1515,7 +1510,7 @@ + endif # JSMIN + + +-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/gitweb.js ++git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/$(GITWEB_JS) + $(QUIET_GEN)$(RM) $@ $@+ && \ + sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ + -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ |