2fd8d4df94
```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
```
23 lines
656 B
Diff
23 lines
656 B
Diff
From 7b4c3ce3407c47619cd4e79052d60db4ce937327 Mon Sep 17 00:00:00 2001
|
|
From: Dennis Schridde <devurandom@gmx.net>
|
|
Date: Thu, 12 Jul 2018 06:52:36 +0200
|
|
Subject: [PATCH] COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h:
|
|
Include pcre.h
|
|
|
|
This fixes a compilation error with libpcre-8.42:
|
|
```
|
|
error: conflicting declaration 'typedef struct real_pcre8_or_16 pcre'
|
|
```
|
|
|
|
--- a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
|
|
+++ b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
|
|
@@ -13,8 +13,7 @@
|
|
|
|
#include "COLLADABUPrerequisites.h"
|
|
|
|
-struct real_pcre;
|
|
-typedef struct real_pcre pcre;
|
|
+#include <pcre.h>
|
|
|
|
|
|
namespace COLLADABU
|