Skip to content

Commit ac8cd90

Browse files
committed
bump(x11/libqtxdg): 4.4.0
1 parent fe1c0b2 commit ac8cd90

3 files changed

Lines changed: 19 additions & 20 deletions

File tree

x11-packages/libqtxdg/build.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://lxqt.github.io
22
TERMUX_PKG_DESCRIPTION="Qt implementation of freedesktop.org XDG specifications"
33
TERMUX_PKG_LICENSE="LGPL-2.1"
44
TERMUX_PKG_MAINTAINER="@termux"
5-
TERMUX_PKG_VERSION="4.3.0"
6-
TERMUX_PKG_REVISION=3
5+
TERMUX_PKG_VERSION="4.4.0"
76
TERMUX_PKG_SRCURL="https://github.com/lxqt/libqtxdg/releases/download/${TERMUX_PKG_VERSION}/libqtxdg-${TERMUX_PKG_VERSION}.tar.xz"
8-
TERMUX_PKG_SHA256=846cb8a35ab55ea3d513a860b6bb5fdf45e2de95a037afb73538b316908efa55
7+
TERMUX_PKG_SHA256=34d25949ae7b6275fb54da46187dd8ba41771600353405b15e53bdc90b9e287a
98
TERMUX_PKG_DEPENDS="libc++, qt6-qtbase, qt6-qtsvg, glib"
109
TERMUX_PKG_BUILD_DEPENDS="lxqt-build-tools, qt6-qttools"
1110
TERMUX_PKG_AUTO_UPDATE=true
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
--- a/src/qtxdg/xdgdirs.cpp
22
+++ b/src/qtxdg/xdgdirs.cpp
3-
@@ -108,7 +108,7 @@
3+
@@ -125,7 +125,7 @@
44
const QString home = QFile::decodeName(qgetenv("HOME"));
55

66
if (home.isEmpty())
7-
- return QString::fromLatin1("/tmp");
8-
+ return QString::fromLatin1("@TERMUX_PREFIX@/tmp");
7+
- return "/tmp"_L1;
8+
+ return "@TERMUX_PREFIX@/tmp"_L1;
99
else if (dir == XdgDirs::Desktop)
10-
fallback = QString::fromLatin1("%1/%2").arg(home, QLatin1String("Desktop"));
10+
fallback = "%1/%2"_L1.arg(home, "Desktop"_L1);
1111
else
12-
@@ -266,8 +266,8 @@
13-
QStringList dirs = d.split(QLatin1Char(':'), Qt::SkipEmptyParts);
12+
@@ -284,8 +284,8 @@
13+
QStringList dirs = d.split(u':', Qt::SkipEmptyParts);
1414

1515
if (dirs.isEmpty()) {
16-
- dirs.append(QString::fromLatin1("/usr/local/share"));
17-
- dirs.append(QString::fromLatin1("/usr/share"));
18-
+ dirs.append(QString::fromLatin1("@TERMUX_PREFIX@/local/share"));
19-
+ dirs.append(QString::fromLatin1("@TERMUX_PREFIX@/share"));
16+
- dirs.append("/usr/local/share"_L1);
17+
- dirs.append("/usr/share"_L1);
18+
+ dirs.append("@TERMUX_PREFIX@/local/share"_L1);
19+
+ dirs.append("@TERMUX_PREFIX@/share"_L1);
2020
} else {
2121
QMutableListIterator<QString> it(dirs);
2222
while (it.hasNext()) {
23-
@@ -289,7 +289,7 @@
23+
@@ -307,7 +307,7 @@
2424
QStringList dirs;
2525
const QString env = QFile::decodeName(qgetenv("XDG_CONFIG_DIRS"));
2626
if (env.isEmpty())
27-
- dirs.append(QString::fromLatin1("/etc/xdg"));
28-
+ dirs.append(QString::fromLatin1("@TERMUX_PREFIX@/etc/xdg"));
27+
- dirs.append("/etc/xdg"_L1);
28+
+ dirs.append("@TERMUX_PREFIX@/etc/xdg"_L1);
2929
else
30-
dirs = env.split(QLatin1Char(':'), Qt::SkipEmptyParts);
30+
dirs = env.split(u':', Qt::SkipEmptyParts);
3131

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
--- a/src/xdgiconloader/xdgiconloader.cpp
22
+++ b/src/xdgiconloader/xdgiconloader.cpp
3-
@@ -564,7 +564,7 @@
3+
@@ -572,7 +572,7 @@
44
auto unthemedInfo = unthemedFallback(name, QIcon::themeSearchPaths());
55
if (unthemedInfo.entries.empty()) {
66
/* Freedesktop standard says to look in /usr/share/pixmaps last */
7-
- const QStringList pixmapPath = (QStringList() << QString::fromLatin1("/usr/share/pixmaps"));
8-
+ const QStringList pixmapPath = (QStringList() << QString::fromLatin1("@TERMUX_PREFIX@/share/pixmaps"));
7+
- const QStringList pixmapPath = (QStringList() << "/usr/share/pixmaps"_L1);
8+
+ const QStringList pixmapPath = (QStringList() << "@TERMUX_PREFIX@/share/pixmaps"_L1);
99
auto pixmapInfo = unthemedFallback(name, pixmapPath);
1010
if (pixmapInfo.entries.empty()) {
1111
return QThemeIconInfo();

0 commit comments

Comments
 (0)