1 |
robbat2 08/04/24 08:08:02 |
2 |
|
3 |
Modified: 20080423-git-1.5.5.1-noperl.patch |
4 |
Log: |
5 |
No absolute paths in patches! Bug #219099. |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 dev-util/git/files/20080423-git-1.5.5.1-noperl.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/files/20080423-git-1.5.5.1-noperl.patch?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/files/20080423-git-1.5.5.1-noperl.patch?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/files/20080423-git-1.5.5.1-noperl.patch?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: 20080423-git-1.5.5.1-noperl.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/git/files/20080423-git-1.5.5.1-noperl.patch,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -p -w -b -B -u -u -r1.1 -r1.2 |
21 |
--- 20080423-git-1.5.5.1-noperl.patch 24 Apr 2008 00:20:54 -0000 1.1 |
22 |
+++ 20080423-git-1.5.5.1-noperl.patch 24 Apr 2008 08:08:01 -0000 1.2 |
23 |
@@ -1,6 +1,19 @@ |
24 |
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/builtin-add.c /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/builtin-add.c |
25 |
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/builtin-add.c 2008-04-20 15:17:13.000000000 -0700 |
26 |
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/builtin-add.c 2008-04-23 16:58:51.708575899 -0700 |
27 |
+Implement 95% of the NO_PERL functionality, to build Git without any Perl |
28 |
+support, because some Gentoo users want a Git without any Perl whatesoever |
29 |
+(Gentoo bug #214168). |
30 |
+ |
31 |
+Remaining bits are doing configure.ac as well as git-remote usage in: |
32 |
+t5502-quickfetch.sh |
33 |
+t5512-ls-remote.sh |
34 |
+t5520-pull.sh |
35 |
+ |
36 |
+Signed-off-by: Robin H. Johnson <robbat2@g.o> |
37 |
+Bugzilla-URL: http://bugs.gentoo.org/show_bug.cgi?id=214168 |
38 |
+Notes: Ported from 20080322-git-1.5.4.5-noperl.patch |
39 |
+ |
40 |
+diff -Nuar git-1.5.5.1.orig/builtin-add.c git-1.5.5.1/builtin-add.c |
41 |
+--- git-1.5.5.1.orig/builtin-add.c 2008-04-20 15:17:13.000000000 -0700 |
42 |
++++ git-1.5.5.1/builtin-add.c 2008-04-23 16:58:51.708575899 -0700 |
43 |
@@ -135,6 +135,7 @@ |
44 |
free(seen); |
45 |
} |
46 |
@@ -41,9 +54,9 @@ diff -Nuar /dev/shm/portage/dev-util/git |
47 |
|
48 |
git_config(git_default_config); |
49 |
|
50 |
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/builtin-commit.c /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/builtin-commit.c |
51 |
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/builtin-commit.c 2008-04-20 15:17:13.000000000 -0700 |
52 |
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/builtin-commit.c 2008-04-23 17:00:04.672207334 -0700 |
53 |
+diff -Nuar git-1.5.5.1.orig/builtin-commit.c git-1.5.5.1/builtin-commit.c |
54 |
+--- git-1.5.5.1.orig/builtin-commit.c 2008-04-20 15:17:13.000000000 -0700 |
55 |
++++ git-1.5.5.1/builtin-commit.c 2008-04-23 17:00:04.672207334 -0700 |
56 |
@@ -97,7 +97,9 @@ |
57 |
OPT_GROUP("Commit contents options"), |
58 |
OPT_BOOLEAN('a', "all", &all, "commit all changed files"), |
59 |
@@ -68,9 +81,9 @@ diff -Nuar /dev/shm/portage/dev-util/git |
60 |
|
61 |
if (read_cache() < 0) |
62 |
die("index file corrupt"); |
63 |
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/Makefile /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/Makefile |
64 |
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/Makefile 2008-04-23 16:58:19.622327000 -0700 |
65 |
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/Makefile 2008-04-23 16:58:51.712091375 -0700 |
66 |
+diff -Nuar git-1.5.5.1.orig/Makefile git-1.5.5.1/Makefile |
67 |
+--- git-1.5.5.1.orig/Makefile 2008-04-23 16:58:19.622327000 -0700 |
68 |
++++ git-1.5.5.1/Makefile 2008-04-23 16:58:51.712091375 -0700 |
69 |
@@ -130,6 +130,8 @@ |
70 |
# |
71 |
# Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's |
72 |
@@ -189,9 +202,9 @@ diff -Nuar /dev/shm/portage/dev-util/git |
73 |
$(MAKE) -C templates/ clean |
74 |
$(MAKE) -C t/ clean |
75 |
ifndef NO_TCLTK |
76 |
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/lib-git-svn.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/lib-git-svn.sh |
77 |
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/lib-git-svn.sh 2008-04-20 15:17:13.000000000 -0700 |
78 |
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/lib-git-svn.sh 2008-04-23 16:58:51.712091375 -0700 |
79 |
+diff -Nuar git-1.5.5.1.orig/t/lib-git-svn.sh git-1.5.5.1/t/lib-git-svn.sh |
80 |
+--- git-1.5.5.1.orig/t/lib-git-svn.sh 2008-04-20 15:17:13.000000000 -0700 |
81 |
++++ git-1.5.5.1/t/lib-git-svn.sh 2008-04-23 16:58:51.712091375 -0700 |
82 |
@@ -6,6 +6,12 @@ |
83 |
test_done |
84 |
exit |
85 |
@@ -205,9 +218,9 @@ diff -Nuar /dev/shm/portage/dev-util/git |
86 |
|
87 |
GIT_DIR=$PWD/.git |
88 |
GIT_SVN_DIR=$GIT_DIR/svn/git-svn |
89 |
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t5505-remote.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t5505-remote.sh |
90 |
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t5505-remote.sh 2008-04-20 15:17:13.000000000 -0700 |
91 |
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t5505-remote.sh 2008-04-23 16:58:51.712091375 -0700 |
92 |
+diff -Nuar git-1.5.5.1.orig/t/t5505-remote.sh git-1.5.5.1/t/t5505-remote.sh |
93 |
+--- git-1.5.5.1.orig/t/t5505-remote.sh 2008-04-20 15:17:13.000000000 -0700 |
94 |
++++ git-1.5.5.1/t/t5505-remote.sh 2008-04-23 16:58:51.712091375 -0700 |
95 |
@@ -3,6 +3,12 @@ |
96 |
test_description='git remote porcelain-ish' |
97 |
|
98 |
@@ -221,9 +234,9 @@ diff -Nuar /dev/shm/portage/dev-util/git |
99 |
|
100 |
setup_repository () { |
101 |
mkdir "$1" && ( |
102 |
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t7501-commit.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t7501-commit.sh |
103 |
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t7501-commit.sh 2008-04-20 15:17:13.000000000 -0700 |
104 |
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t7501-commit.sh 2008-04-23 16:58:51.712091375 -0700 |
105 |
+diff -Nuar git-1.5.5.1.orig/t/t7501-commit.sh git-1.5.5.1/t/t7501-commit.sh |
106 |
+--- git-1.5.5.1.orig/t/t7501-commit.sh 2008-04-20 15:17:13.000000000 -0700 |
107 |
++++ git-1.5.5.1/t/t7501-commit.sh 2008-04-23 16:58:51.712091375 -0700 |
108 |
@@ -38,7 +38,7 @@ |
109 |
"echo King of the bongo >file && |
110 |
! git-commit -m foo -a file" |
111 |
@@ -242,9 +255,9 @@ diff -Nuar /dev/shm/portage/dev-util/git |
112 |
"interactive add" \ |
113 |
"echo 7 | git-commit --interactive | grep 'What now'" |
114 |
|
115 |
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9001-send-email.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9001-send-email.sh |
116 |
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9001-send-email.sh 2008-04-20 15:17:13.000000000 -0700 |
117 |
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9001-send-email.sh 2008-04-23 16:58:51.712091375 -0700 |
118 |
+diff -Nuar git-1.5.5.1.orig/t/t9001-send-email.sh git-1.5.5.1/t/t9001-send-email.sh |
119 |
+--- git-1.5.5.1.orig/t/t9001-send-email.sh 2008-04-20 15:17:13.000000000 -0700 |
120 |
++++ git-1.5.5.1/t/t9001-send-email.sh 2008-04-23 16:58:51.712091375 -0700 |
121 |
@@ -2,6 +2,12 @@ |
122 |
|
123 |
test_description='git-send-email' |
124 |
@@ -258,9 +271,9 @@ diff -Nuar /dev/shm/portage/dev-util/git |
125 |
|
126 |
PROG='git send-email' |
127 |
test_expect_success \ |
128 |
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9200-git-cvsexportcommit.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9200-git-cvsexportcommit.sh |
129 |
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9200-git-cvsexportcommit.sh 2008-04-20 15:17:13.000000000 -0700 |
130 |
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9200-git-cvsexportcommit.sh 2008-04-23 16:58:51.715484206 -0700 |
131 |
+diff -Nuar git-1.5.5.1.orig/t/t9200-git-cvsexportcommit.sh git-1.5.5.1/t/t9200-git-cvsexportcommit.sh |
132 |
+--- git-1.5.5.1.orig/t/t9200-git-cvsexportcommit.sh 2008-04-20 15:17:13.000000000 -0700 |
133 |
++++ git-1.5.5.1/t/t9200-git-cvsexportcommit.sh 2008-04-23 16:58:51.715484206 -0700 |
134 |
@@ -13,6 +13,12 @@ |
135 |
test_done |
136 |
exit |
137 |
@@ -274,9 +287,9 @@ diff -Nuar /dev/shm/portage/dev-util/git |
138 |
|
139 |
CVSROOT=$(pwd)/cvsroot |
140 |
CVSWORK=$(pwd)/cvswork |
141 |
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9400-git-cvsserver-server.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9400-git-cvsserver-server.sh |
142 |
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9400-git-cvsserver-server.sh 2008-04-20 15:17:13.000000000 -0700 |
143 |
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9400-git-cvsserver-server.sh 2008-04-23 16:58:51.715484206 -0700 |
144 |
+diff -Nuar git-1.5.5.1.orig/t/t9400-git-cvsserver-server.sh git-1.5.5.1/t/t9400-git-cvsserver-server.sh |
145 |
+--- git-1.5.5.1.orig/t/t9400-git-cvsserver-server.sh 2008-04-20 15:17:13.000000000 -0700 |
146 |
++++ git-1.5.5.1/t/t9400-git-cvsserver-server.sh 2008-04-23 16:58:51.715484206 -0700 |
147 |
@@ -17,6 +17,12 @@ |
148 |
test_done |
149 |
exit |
150 |
@@ -290,9 +303,9 @@ diff -Nuar /dev/shm/portage/dev-util/git |
151 |
perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { |
152 |
test_expect_success 'skipping git-cvsserver tests, Perl SQLite interface unavailable' : |
153 |
test_done |
154 |
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9500-gitweb-standalone-no-errors.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9500-gitweb-standalone-no-errors.sh |
155 |
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9500-gitweb-standalone-no-errors.sh 2008-04-20 15:17:13.000000000 -0700 |
156 |
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9500-gitweb-standalone-no-errors.sh 2008-04-23 16:58:51.715484206 -0700 |
157 |
+diff -Nuar git-1.5.5.1.orig/t/t9500-gitweb-standalone-no-errors.sh git-1.5.5.1/t/t9500-gitweb-standalone-no-errors.sh |
158 |
+--- git-1.5.5.1.orig/t/t9500-gitweb-standalone-no-errors.sh 2008-04-20 15:17:13.000000000 -0700 |
159 |
++++ git-1.5.5.1/t/t9500-gitweb-standalone-no-errors.sh 2008-04-23 16:58:51.715484206 -0700 |
160 |
@@ -67,6 +67,13 @@ |
161 |
} |
162 |
|
163 |
@@ -307,9 +320,9 @@ diff -Nuar /dev/shm/portage/dev-util/git |
164 |
|
165 |
perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || { |
166 |
test_expect_success 'skipping gitweb tests, perl version is too old' : |
167 |
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9600-cvsimport.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9600-cvsimport.sh |
168 |
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9600-cvsimport.sh 2008-04-20 15:17:13.000000000 -0700 |
169 |
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9600-cvsimport.sh 2008-04-23 16:58:51.715484206 -0700 |
170 |
+diff -Nuar git-1.5.5.1.orig/t/t9600-cvsimport.sh git-1.5.5.1/t/t9600-cvsimport.sh |
171 |
+--- git-1.5.5.1.orig/t/t9600-cvsimport.sh 2008-04-20 15:17:13.000000000 -0700 |
172 |
++++ git-1.5.5.1/t/t9600-cvsimport.sh 2008-04-23 16:58:51.715484206 -0700 |
173 |
@@ -15,6 +15,12 @@ |
174 |
test_done |
175 |
exit |
176 |
|
177 |
|
178 |
|
179 |
-- |
180 |
gentoo-commits@l.g.o mailing list |