Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(x11/qt6-qtbase): Relocate hardcoded paths #20785

Merged
merged 1 commit into from
Jul 7, 2024

Conversation

Biswa96
Copy link
Member

@Biswa96 Biswa96 commented Jul 6, 2024

No description provided.

@Biswa96 Biswa96 requested review from truboxl and removed request for Grimler91 and finagolfin July 6, 2024 17:40
@Biswa96
Copy link
Member Author

Biswa96 commented Jul 6, 2024

  • Minimal example code to reproduce the hard coded issue 👇
#include <QStandardPaths>
#include <QDir>
#include <QDebug>

int main(void)
{
    for (int i = 0; i < 23; ++i)
        qDebug() << i << " " << QStandardPaths::standardLocations((QStandardPaths::StandardLocation)i);
}
Click here to see the output before applying the patches
0   QList("/data/data/com.termux/files/home/Desktop")
1   QList("/data/data/com.termux/files/home/Documents")
2   QList("/data/data/com.termux/files/home/.local/share/fonts", "/data/data/com.termux/files/home/.fonts", "/usr/local/share/fonts", "/usr/share/fonts")
3   QList("/data/data/com.termux/files/home/.local/share/applications", "/usr/local/share/applications", "/usr/share/applications")
4   QList("/data/data/com.termux/files/home/Music")
5   QList("/data/data/com.termux/files/home/Videos")
6   QList("/data/data/com.termux/files/home/Pictures")
7   QList("/data/data/com.termux/files/usr/tmp")
8   QList("/data/data/com.termux/files/home")
9   QList("/data/data/com.termux/files/home/.local/share", "/usr/local/share", "/usr/share")
10   QList("/data/data/com.termux/files/home/.cache")
11   QList("/data/data/com.termux/files/home/.local/share", "/usr/local/share", "/usr/share")
QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/data/data/com.termux/files/usr/tmp/runtime-u0_a204'
12   QList("/data/data/com.termux/files/usr/tmp/runtime-u0_a204")
13   QList("/data/data/com.termux/files/home/.config", "/etc/xdg")
14   QList("/data/data/com.termux/files/home/Downloads")
15   QList("/data/data/com.termux/files/home/.cache")
16   QList("/data/data/com.termux/files/home/.config", "/etc/xdg")
17   QList("/data/data/com.termux/files/home/.local/share", "/usr/local/share", "/usr/share")
18   QList("/data/data/com.termux/files/home/.config", "/etc/xdg")
19   QList("/data/data/com.termux/files/home/Public")
20   QList("/data/data/com.termux/files/home/Templates")
21   QList("/data/data/com.termux/files/home/.local/state")
22   QList("/data/data/com.termux/files/home/.local/state")
Click here to see the output after applying the patches
0   QList("/data/data/com.termux/files/home/Desktop")
1   QList("/data/data/com.termux/files/home/Documents")
2   QList("/data/data/com.termux/files/home/.local/share/fonts", "/data/data/com.termux/files/home/.fonts", "/data/data/com.termux/files/usr/local/share/fonts", "/data/data/com.termux/files/usr/share/fonts")
3   QList("/data/data/com.termux/files/home/.local/share/applications", "/data/data/com.termux/files/usr/local/share/applications", "/data/data/com.termux/files/usr/share/applications")
4   QList("/data/data/com.termux/files/home/Music")
5   QList("/data/data/com.termux/files/home/Videos")
6   QList("/data/data/com.termux/files/home/Pictures")
7   QList("/data/data/com.termux/files/usr/tmp")
8   QList("/data/data/com.termux/files/home")
9   QList("/data/data/com.termux/files/home/.local/share", "/data/data/com.termux/files/usr/local/share", "/data/data/com.termux/files/usr/share")
10   QList("/data/data/com.termux/files/home/.cache")
11   QList("/data/data/com.termux/files/home/.local/share", "/data/data/com.termux/files/usr/local/share", "/data/data/com.termux/files/usr/share")
QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/data/data/com.termux/files/usr/tmp/runtime-u0_a204'
12   QList("/data/data/com.termux/files/usr/tmp/runtime-u0_a204")
13   QList("/data/data/com.termux/files/home/.config", "/data/data/com.termux/files/usr/etc/xdg")
14   QList("/data/data/com.termux/files/home/Downloads")
15   QList("/data/data/com.termux/files/home/.cache")
16   QList("/data/data/com.termux/files/home/.config", "/data/data/com.termux/files/usr/etc/xdg")
17   QList("/data/data/com.termux/files/home/.local/share", "/data/data/com.termux/files/usr/local/share", "/data/data/com.termux/files/usr/share")
18   QList("/data/data/com.termux/files/home/.config", "/data/data/com.termux/files/usr/etc/xdg")
19   QList("/data/data/com.termux/files/home/Public")
20   QList("/data/data/com.termux/files/home/Templates")
21   QList("/data/data/com.termux/files/home/.local/state")
22   QList("/data/data/com.termux/files/home/.local/state")

@truboxl truboxl merged commit fff29a7 into termux:master Jul 7, 2024
5 checks passed
@Biswa96 Biswa96 deleted the qt6-qtbase branch July 7, 2024 03:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants