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
```
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
|
|
--- a/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200
|
|
+++ b/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200
|
|
@@ -15,7 +15,10 @@
|
|
* limitations under the License.
|
|
*/
|
|
|
|
-#include <stdlib.h>
|
|
+#include <cstdio>
|
|
+#include <cstdlib>
|
|
+#include <cstring>
|
|
+#include <stdint.h>
|
|
#include <log4cxx/logger.h>
|
|
#include <log4cxx/consoleappender.h>
|
|
#include <log4cxx/simplelayout.h>
|
|
diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
|
|
--- a/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200
|
|
+++ b/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200
|
|
@@ -21,6 +21,8 @@
|
|
#include <log4cxx/helpers/pool.h>
|
|
#include <log4cxx/helpers/bytebuffer.h>
|
|
|
|
+#include <cstring>
|
|
+
|
|
using namespace log4cxx;
|
|
using namespace log4cxx::helpers;
|
|
|
|
diff -Naur src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
|
|
--- a/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200
|
|
+++ b/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200
|
|
@@ -20,6 +20,8 @@
|
|
#include <log4cxx/helpers/socket.h>
|
|
#include <log4cxx/helpers/bytebuffer.h>
|
|
|
|
+#include <cstring>
|
|
+
|
|
using namespace log4cxx;
|
|
using namespace log4cxx::helpers;
|