861ac185a6
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
17 lines
722 B
Diff
17 lines
722 B
Diff
#! /bin/sh /usr/share/dpatch/dpatch-run
|
|
## 100-bugfix-LOGCXX-284.dpatch by <matthew@localhost>
|
|
##
|
|
## All lines beginning with `## DP:' are a description of the patch.
|
|
## DP: Fixes build error on AIX with xlc_r
|
|
|
|
--- a/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700
|
|
+++ b/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700
|
|
@@ -181,7 +181,7 @@
|
|
// output the using STL
|
|
//
|
|
std::basic_ostringstream<logchar> buffer;
|
|
-#if defined(_USEFAC)
|
|
+#if defined(_MSC_VER) && _MSC_VER < 1300
|
|
_USEFAC(locale, std::time_put<logchar>)
|
|
.put(buffer, buffer, &date, fmt.c_str(), fmt.c_str() + fmt.length());
|
|
#else
|