635e9da391
* par is kept at -Np0
```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
931 B
Diff
23 lines
931 B
Diff
Source: @Johnnynator
|
|
Upsteam: No
|
|
Subject: Musl always returns /lib/libQt5Core.so.5 for Dl_info.dli_fname.
|
|
On GLIBC this seems to only happen with programs that load qt5-webengine(?)
|
|
|
|
---
|
|
diff --git qtbasesrc/corelib/global/qlibraryinfo.cpp qtbasesrc/corelib/global/qlibraryinfo.cpp
|
|
index 8bcf67e73d..28d7355310 100644
|
|
--- a/qtbase/src/corelib/global/qlibraryinfo.cpp
|
|
+++ b/qtbase/src/corelib/global/qlibraryinfo.cpp
|
|
@@ -558,6 +558,12 @@ static QString getRelocatablePrefix()
|
|
int result = dladdr(reinterpret_cast<void *>(&QLibraryInfo::isDebugBuild), &info);
|
|
if (result > 0 && info.dli_fname)
|
|
prefixPath = prefixFromQtCoreLibraryHelper(QString::fromLocal8Bit(info.dli_fname));
|
|
+#if 1
|
|
+ QDir preDir(prefixPath);
|
|
+ if (preDir.isRoot()) {
|
|
+ prefixPath = QStringLiteral("/usr");
|
|
+ }
|
|
+#endif
|
|
#elif defined(Q_OS_WIN)
|
|
HMODULE hModule = getWindowsModuleHandle();
|
|
const int kBufferSize = 4096;
|