c987560802
```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
```
30 lines
988 B
Diff
30 lines
988 B
Diff
--- a/3rdparty/solid-lite/backends/udisks2/udisksblock.h 2016-01-08 19:44:42.000000000 +0100
|
|
+++ b/3rdparty/solid-lite/backends/udisks2/udisksblock.h 2017-03-09 11:41:06.071250302 +0100
|
|
@@ -21,6 +21,7 @@
|
|
#ifndef UDISKS2BLOCK_H
|
|
#define UDISKS2BLOCK_H
|
|
|
|
+#include <sys/types.h>
|
|
#include <solid-lite/ifaces/block.h>
|
|
#include "udisksdeviceinterface.h"
|
|
|
|
--- a/gui/main.cpp 2018-06-16 10:09:13.072771604 +0200
|
|
+++ b/gui/main.cpp 2018-06-16 10:10:00.840162507 +0200
|
|
@@ -260,7 +260,7 @@
|
|
qInstallMessageHandler(cantataQtMsgHandler);
|
|
}
|
|
|
|
-#if defined Q_OS_LINUX && defined __GNUC__
|
|
+#if defined Q_OS_LINUX && defined __GNUC__ && defined __GLIBC__
|
|
#include <execinfo.h>
|
|
#include <unistd.h>
|
|
#include <signal.h>
|
|
@@ -340,7 +340,7 @@
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
- #if defined Q_OS_LINUX && defined __GNUC__
|
|
+ #if defined Q_OS_LINUX && defined __GNUC__ && defined __GLIBC__
|
|
signal(SIGSEGV, sigHandler);
|
|
#endif
|
|
QThread::currentThread()->setObjectName("GUI");
|