diff --git a/x11-packages/libqtxdg/build.sh b/x11-packages/libqtxdg/build.sh index eb38d4fa44f..71868c1c405 100644 --- a/x11-packages/libqtxdg/build.sh +++ b/x11-packages/libqtxdg/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://lxqt.github.io TERMUX_PKG_DESCRIPTION="Qt implementation of freedesktop.org XDG specifications" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="4.3.0" -TERMUX_PKG_REVISION=3 +TERMUX_PKG_VERSION="4.4.0" TERMUX_PKG_SRCURL="https://github.com/lxqt/libqtxdg/releases/download/${TERMUX_PKG_VERSION}/libqtxdg-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=846cb8a35ab55ea3d513a860b6bb5fdf45e2de95a037afb73538b316908efa55 +TERMUX_PKG_SHA256=34d25949ae7b6275fb54da46187dd8ba41771600353405b15e53bdc90b9e287a TERMUX_PKG_DEPENDS="libc++, qt6-qtbase, qt6-qtsvg, glib" TERMUX_PKG_BUILD_DEPENDS="lxqt-build-tools, qt6-qttools" TERMUX_PKG_AUTO_UPDATE=true diff --git a/x11-packages/libqtxdg/src-qtxdg-xdgdirs.cpp.patch b/x11-packages/libqtxdg/src-qtxdg-xdgdirs.cpp.patch index 8b834fd9729..9ac03e912b6 100644 --- a/x11-packages/libqtxdg/src-qtxdg-xdgdirs.cpp.patch +++ b/x11-packages/libqtxdg/src-qtxdg-xdgdirs.cpp.patch @@ -1,31 +1,31 @@ --- a/src/qtxdg/xdgdirs.cpp +++ b/src/qtxdg/xdgdirs.cpp -@@ -108,7 +108,7 @@ +@@ -125,7 +125,7 @@ const QString home = QFile::decodeName(qgetenv("HOME")); if (home.isEmpty()) -- return QString::fromLatin1("/tmp"); -+ return QString::fromLatin1("@TERMUX_PREFIX@/tmp"); +- return "/tmp"_L1; ++ return "@TERMUX_PREFIX@/tmp"_L1; else if (dir == XdgDirs::Desktop) - fallback = QString::fromLatin1("%1/%2").arg(home, QLatin1String("Desktop")); + fallback = "%1/%2"_L1.arg(home, "Desktop"_L1); else -@@ -266,8 +266,8 @@ - QStringList dirs = d.split(QLatin1Char(':'), Qt::SkipEmptyParts); +@@ -284,8 +284,8 @@ + QStringList dirs = d.split(u':', Qt::SkipEmptyParts); if (dirs.isEmpty()) { -- dirs.append(QString::fromLatin1("/usr/local/share")); -- dirs.append(QString::fromLatin1("/usr/share")); -+ dirs.append(QString::fromLatin1("@TERMUX_PREFIX@/local/share")); -+ dirs.append(QString::fromLatin1("@TERMUX_PREFIX@/share")); +- dirs.append("/usr/local/share"_L1); +- dirs.append("/usr/share"_L1); ++ dirs.append("@TERMUX_PREFIX@/local/share"_L1); ++ dirs.append("@TERMUX_PREFIX@/share"_L1); } else { QMutableListIterator it(dirs); while (it.hasNext()) { -@@ -289,7 +289,7 @@ +@@ -307,7 +307,7 @@ QStringList dirs; const QString env = QFile::decodeName(qgetenv("XDG_CONFIG_DIRS")); if (env.isEmpty()) -- dirs.append(QString::fromLatin1("/etc/xdg")); -+ dirs.append(QString::fromLatin1("@TERMUX_PREFIX@/etc/xdg")); +- dirs.append("/etc/xdg"_L1); ++ dirs.append("@TERMUX_PREFIX@/etc/xdg"_L1); else - dirs = env.split(QLatin1Char(':'), Qt::SkipEmptyParts); + dirs = env.split(u':', Qt::SkipEmptyParts); diff --git a/x11-packages/libqtxdg/src-xdgiconloader-xdgiconloader.cpp.patch b/x11-packages/libqtxdg/src-xdgiconloader-xdgiconloader.cpp.patch index 5e9f4f14669..d0165bd6d11 100644 --- a/x11-packages/libqtxdg/src-xdgiconloader-xdgiconloader.cpp.patch +++ b/x11-packages/libqtxdg/src-xdgiconloader-xdgiconloader.cpp.patch @@ -1,11 +1,11 @@ --- a/src/xdgiconloader/xdgiconloader.cpp +++ b/src/xdgiconloader/xdgiconloader.cpp -@@ -564,7 +564,7 @@ +@@ -572,7 +572,7 @@ auto unthemedInfo = unthemedFallback(name, QIcon::themeSearchPaths()); if (unthemedInfo.entries.empty()) { /* Freedesktop standard says to look in /usr/share/pixmaps last */ -- const QStringList pixmapPath = (QStringList() << QString::fromLatin1("/usr/share/pixmaps")); -+ const QStringList pixmapPath = (QStringList() << QString::fromLatin1("@TERMUX_PREFIX@/share/pixmaps")); +- const QStringList pixmapPath = (QStringList() << "/usr/share/pixmaps"_L1); ++ const QStringList pixmapPath = (QStringList() << "@TERMUX_PREFIX@/share/pixmaps"_L1); auto pixmapInfo = unthemedFallback(name, pixmapPath); if (pixmapInfo.entries.empty()) { return QThemeIconInfo();