summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-devtools/quilt/quilt-0.60.inc4
-rw-r--r--meta/recipes-devtools/quilt/quilt-native.inc1
-rw-r--r--meta/recipes-devtools/quilt/quilt/non-gnu.patch225
3 files changed, 4 insertions, 226 deletions
diff --git a/meta/recipes-devtools/quilt/quilt-0.60.inc b/meta/recipes-devtools/quilt/quilt-0.60.inc
index 1e240a0aad..e0a2e515d2 100644
--- a/meta/recipes-devtools/quilt/quilt-0.60.inc
+++ b/meta/recipes-devtools/quilt/quilt-0.60.inc
@@ -12,6 +12,10 @@ SRC_URI[sha256sum] = "3d72a292e432beb9a73f9d0acfe3a77c9b4d7e42209919bb244e9958c7
12 12
13inherit autotools 13inherit autotools
14 14
15EXTRA_OECONF_darwin += "--without-date \
16 --without-getopt \
17 "
18
15PACKAGES += "guards guards-doc" 19PACKAGES += "guards guards-doc"
16FILES_${PN} = "${sysconfdir} ${datadir}/quilt \ 20FILES_${PN} = "${sysconfdir} ${datadir}/quilt \
17 ${bindir}/quilt ${libdir}/quilt" 21 ${bindir}/quilt ${libdir}/quilt"
diff --git a/meta/recipes-devtools/quilt/quilt-native.inc b/meta/recipes-devtools/quilt/quilt-native.inc
index 9345d88273..5c4b0a217e 100644
--- a/meta/recipes-devtools/quilt/quilt-native.inc
+++ b/meta/recipes-devtools/quilt/quilt-native.inc
@@ -1,4 +1,3 @@
1SRC_URI_append_build-darwin = "? file://non-gnu.patch "
2RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-native" 1RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-native"
3 2
4INHIBIT_AUTOTOOLS_DEPS = "1" 3INHIBIT_AUTOTOOLS_DEPS = "1"
diff --git a/meta/recipes-devtools/quilt/quilt/non-gnu.patch b/meta/recipes-devtools/quilt/quilt/non-gnu.patch
deleted file mode 100644
index 520bf52ff2..0000000000
--- a/meta/recipes-devtools/quilt/quilt/non-gnu.patch
+++ /dev/null
@@ -1,225 +0,0 @@
1Upstream-Status: Pending
2
3Patch is from the Fink projetc (http://fink.sf.net)
4
5diff -r 7b51c215fc54 Makefile.in
6--- a/Makefile.in Sat Mar 4 17:16:21 2006 -0800
7+++ b/Makefile.in Sat Mar 4 17:59:09 2006 -0800
8@@ -256,7 +256,7 @@ bin/guards.1 : bin/guards
9 -e 's:@VERSION''@:$(VERSION):g' \
10 -e 's:@RELEASE''@:$(RELEASE):g' \
11 -e 's:@LOCALEDIR''@:$(localedir):g' \
12- -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \
13+ -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE):g' \
14 $< > $@
15 @$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@)
16
17@@ -320,11 +320,11 @@ endif
18 $(INSTALL) -d $(BUILD_ROOT)$(libdir)/$(PACKAGE)
19 $(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(libdir)/$(PACKAGE)/
20
21- $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
22+ $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
23 $(INSTALL) -m 644 doc/README \
24- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
25+ $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
26 $(INSTALL) -m 644 doc/quilt.pdf doc/README.MAIL \
27- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
28+ $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
29
30 $(INSTALL) -d $(BUILD_ROOT)$(mandir)/man1
31 $(INSTALL) -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/
32@@ -367,7 +367,7 @@ uninstall ::
33 $(notdir $(MAN1))) \
34 $(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt \
35 $(BUILD_ROOT)$(etcdir)/quilt.quiltrc \
36- $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
37+ $(BUILD_ROOT)$(docdir)/$(PACKAGE)/
38
39 check: $(TESTS:test/%.test=test/.%.ok)
40 check-all: $(TESTS:test/%.test=check-%)
41diff -r 7b51c215fc54 configure
42--- a/configure Sat Mar 4 17:16:21 2006 -0800
43+++ b/configure Sat Mar 4 17:59:09 2006 -0800
44@@ -3882,29 +3882,6 @@ echo "$as_me: error: Please specify the
45 fi
46
47
48-echo "$as_me:$LINENO: checking whether $CP -l works" >&5
49-echo $ECHO_N "checking whether $CP -l works... $ECHO_C" >&6
50-touch conftest.1
51-if $CP -l conftest.1 conftest.2 2>/dev/null; then
52- echo "$as_me:$LINENO: result: yes" >&5
53-echo "${ECHO_T}yes" >&6
54-else
55- { { echo "$as_me:$LINENO: error: no
56-
57-You appear to have a \`cp' that does not support hard links.
58-You can download GNU fileutils from ftp.gnu.org
59-" >&5
60-echo "$as_me: error: no
61-
62-You appear to have a \`cp' that does not support hard links.
63-You can download GNU fileutils from ftp.gnu.org
64-" >&2;}
65- { (exit 1); exit 1; }; }
66-fi
67-
68-
69-
70-
71
72 # Check whether --with-date or --without-date was given.
73 if test "${with_date+set}" = set; then
74@@ -3999,32 +3976,6 @@ echo "$as_me: WARNING: Using internal da
75 INTERNAL_DATE=1
76
77 fi
78-
79-
80-
81-if test -z "$INTERNAL_DATE"; then
82- echo "$as_me:$LINENO: checking whether $DATE --rfc-822 works" >&5
83-echo $ECHO_N "checking whether $DATE --rfc-822 works... $ECHO_C" >&6
84- if $DATE --rfc-822 >/dev/null 2>/dev/null; then
85- echo "$as_me:$LINENO: result: yes" >&5
86-echo "${ECHO_T}yes" >&6
87- else
88- { { echo "$as_me:$LINENO: error: no
89-
90-If you don't have a version of \`date' that supports --rfc-822, you
91-can specify '--without-date' and $PACKAGE_NAME will use its own
92-internal date.
93-" >&5
94-echo "$as_me: error: no
95-
96-If you don't have a version of \`date' that supports --rfc-822, you
97-can specify '--without-date' and $PACKAGE_NAME will use its own
98-internal date.
99-" >&2;}
100- { (exit 1); exit 1; }; }
101- fi
102-fi
103-
104
105
106
107diff -r 7b51c215fc54 quilt/diff.in
108--- a/quilt/diff.in Sat Mar 4 17:16:21 2006 -0800
109+++ b/quilt/diff.in Sat Mar 4 17:59:09 2006 -0800
110@@ -303,7 +303,7 @@ then
111
112 if [ ${#files[@]} -gt 0 ] \
113 && ! ( cd $QUILT_PC/$last_patch &&
114- cp -l --parents "${files[@]}" $workdir/ )
115+ mycpl $workdir/ "${files[@]}" )
116 then
117 printf $"Failed to copy files to temporary directory\n" >&2
118 die 1
119diff -r 7b51c215fc54 quilt/mail.in
120--- a/quilt/mail.in Sat Mar 4 17:16:21 2006 -0800
121+++ b/quilt/mail.in Sat Mar 4 17:59:09 2006 -0800
122@@ -64,7 +64,7 @@ with a template for the introduction. Pl
123
124 msgid()
125 {
126- local timestamp=$(date --utc "+%Y%m%d%H%M%S.%N")
127+ local timestamp=$(date -u "+%Y%m%d%H%M%S.000000000")
128 echo "$timestamp@${opt_sender#*@}"
129 }
130
131@@ -334,7 +334,7 @@ introduction="$(gen_tempfile)"
132 cat <<-EOF
133 Message-Id: <$(msgid)>
134 User-Agent: quilt/@VERSION@-@RELEASE@
135- Date: $(date --rfc-822)
136+ Date: $(date '+%a, %d %b %Y %H:%M:%S %z')
137 From: ${opt_from:-$opt_sender}
138 To: $(IFS=,; echo "${opt_to[*]}")
139 Cc: $(IFS=,; echo "${opt_cc[*]}")
140@@ -401,7 +401,11 @@ fi
141 # increment the timestamp by one second and wait with sending until
142 # that time has arrived. This allows MUAs to show the messages in the
143 # correct order.
144-last_ts=$(date '+%s' -d "$(sed -ne $'s/^Date:[ \t]*//p' $introduction)")
145+#last_ts=$(date '+%s' -d "$(sed -ne $'s/^Date:[ \t]*//p' $introduction)")
146+# fink has no date available that does -d, so we fudge with the time now.
147+# If the user edits the date field in the message patch 0 could end up
148+# out of order wrt the actual patches. just a minor cosmetic nit.
149+last_ts=$(date '+%s')
150
151 num=1
152 for patch in "${patches[@]}"; do
153@@ -412,7 +416,7 @@ for patch in "${patches[@]}"; do
154 # sleep 1
155 #done
156 ((last_ts++))
157- new_date="$(date --rfc-822 -d "1970/01/01 UTC $last_ts seconds")"
158+ new_date="$(date -r $last_ts '+%a, %d %b %Y %H:%M:%S %z')"
159
160 modify="$(awk '
161 sub(/^Recipient-/, "") { r = $0
162diff -r 7b51c215fc54 quilt/pop.in
163--- a/quilt/pop.in Sat Mar 4 17:16:21 2006 -0800
164+++ b/quilt/pop.in Sat Mar 4 17:59:09 2006 -0800
165@@ -93,7 +93,7 @@ check_for_pending_changes()
166 if [ -d $QUILT_PC/$patch ]
167 then
168 if ! rmdir $workdir || # note that this is racey...
169- ! cp -rl $QUILT_PC/$patch $workdir
170+ ! (for i in "$(find "$QUILT_PC/$patch" -type f)"; do mycpl $workdir $i; done)
171 then
172 printf $"Failed to copy files to temporary directory\n" >&2
173 rm -rf $workdir
174diff -r 7b51c215fc54 quilt/scripts/patchfns.in
175--- a/quilt/scripts/patchfns.in Sat Mar 4 17:16:21 2006 -0800
176+++ b/quilt/scripts/patchfns.in Sat Mar 4 17:59:09 2006 -0800
177@@ -45,6 +45,28 @@ fi
178 fi
179
180 # ========================================================
181+
182+dater()
183+{
184+ ts=$(perl -e '@st = stat($ARGV[0]); print $st[9];' "$1")
185+ fmt=$(date -r $ts "$2")
186+
187+ echo $fmt
188+}
189+
190+mycpl ()
191+{
192+ target=$1
193+ shift;
194+
195+ for src in "$@"
196+ do
197+ srcdir="${src%/*}"
198+ test -n "$srcdir" && mkdir -p "$target/$srcdir"
199+ ln $src "$target/$src"
200+ done
201+}
202+
203
204 #declare -a exit_handlers
205 #
206@@ -669,8 +691,7 @@ diff_file()
207 || old_date=$'\t'"1970-01-01 00:00:00.000000000 +0000"
208 else
209 [ -n "$QUILT_NO_DIFF_TIMESTAMPS" ] \
210- || old_date=$'\t'$(date +'%Y-%m-%d %H:%M:%S.%N %z' \
211- -r "$old_file")
212+ || old_date=$'\t'$(dater "$old_file" +'%Y-%m-%d %H:%M:%S.000000000 %z')
213 fi
214 if ! [ -s "$new_file" ]
215 then
216@@ -682,8 +703,7 @@ diff_file()
217 || new_date=$'\t'"1970-01-01 00:00:00.000000000 +0000"
218 else
219 [ -n "$QUILT_NO_DIFF_TIMESTAMPS" ] \
220- || new_date=$'\t'$(date +'%Y-%m-%d %H:%M:%S.%N %z' \
221- -r "$new_file")
222+ || new_date=$'\t'$(dater "$new_file" +'%Y-%m-%d %H:%M:%S.000000000 %z')
223 fi
224
225 diff $QUILT_DIFF_OPTS $old_file $new_file \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 14:41:23 +0000