| 1 |
robbat2 10/05/01 08:53:10 |
| 2 |
|
| 3 |
Added: git-1.7.1-always-install-js.patch |
| 4 |
Log: |
| 5 |
Bug #317953: Version bump. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-vcs/git/files/git-1.7.1-always-install-js.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-vcs/git/files/git-1.7.1-always-install-js.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-vcs/git/files/git-1.7.1-always-install-js.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: git-1.7.1-always-install-js.patch |
| 15 |
=================================================================== |
| 16 |
JS install cleanup fixes |
| 17 |
|
| 18 |
- Also ensure the minified JS is built before instaweb as it is referenced in |
| 19 |
the sed expression. |
| 20 |
|
| 21 |
Signed-off-by: Robin H. Johnson <robbat2@g.o> |
| 22 |
|
| 23 |
diff -Nuar git-1.7.1.orig/Makefile git-1.7.1/Makefile |
| 24 |
--- git-1.7.1.orig/Makefile 2010-04-24 02:38:35.000000000 +0000 |
| 25 |
+++ git-1.7.1/Makefile 2010-05-01 08:47:04.491916479 +0000 |
| 26 |
@@ -1561,17 +1561,16 @@ |
| 27 |
$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all |
| 28 |
|
| 29 |
ifdef JSMIN |
| 30 |
-GITWEB_PROGRAMS += gitweb/gitweb.min.js |
| 31 |
GITWEB_JS = gitweb/gitweb.min.js |
| 32 |
else |
| 33 |
GITWEB_JS = gitweb/gitweb.js |
| 34 |
endif |
| 35 |
ifdef CSSMIN |
| 36 |
-GITWEB_PROGRAMS += gitweb/gitweb.min.css |
| 37 |
GITWEB_CSS = gitweb/gitweb.min.css |
| 38 |
else |
| 39 |
GITWEB_CSS = gitweb/gitweb.css |
| 40 |
endif |
| 41 |
+GITWEB_PROGRAMS += $(GITWEB_JS) $(GITWEB_CSS) |
| 42 |
OTHER_PROGRAMS += gitweb/gitweb.cgi $(GITWEB_PROGRAMS) |
| 43 |
gitweb/gitweb.cgi: gitweb/gitweb.perl $(GITWEB_PROGRAMS) |
| 44 |
$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@) |
| 45 |
@@ -1586,7 +1585,7 @@ |
| 46 |
endif # CSSMIN |
| 47 |
|
| 48 |
|
| 49 |
-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/gitweb.js |
| 50 |
+git-instaweb: git-instaweb.sh gitweb/gitweb.cgi $(GITWEB_CSS) $(GITWEB_JS) |
| 51 |
$(QUIET_GEN)$(RM) $@ $@+ && \ |
| 52 |
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ |
| 53 |
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ |
Archives