4f75cf25fd
```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
```
20 lines
455 B
Diff
20 lines
455 B
Diff
--- a/src/libtomahawk/accounts/ResolverAccount.cpp
|
|
+++ b/src/libtomahawk/accounts/ResolverAccount.cpp
|
|
@@ -44,6 +44,17 @@
|
|
#include <QFileInfo>
|
|
#include <QDir>
|
|
|
|
+#include <limits.h>
|
|
+
|
|
+#ifndef __WORDSIZE
|
|
+# if ULONG_MAX == 0xffffffffffffffff
|
|
+# define __WORDSIZE 64
|
|
+# elif ULONG_MAX == 0xffffffff
|
|
+# define __WORDSIZE 32
|
|
+# endif /* ULONG_MAX */
|
|
+#endif /* __WORDSIZE */
|
|
+
|
|
+
|
|
#define MANUALRESOLVERS_DIR "manualresolvers"
|
|
|
|
using namespace Tomahawk;
|