fix(x11/lxqt-config): Add TERMUX_PREFIX with hardcoded paths

This commit is contained in:
termux-pacman-bot
2024-07-11 06:39:34 +00:00
parent ae3dc96fa6
commit f080ee7c0f
5 changed files with 56 additions and 0 deletions

View File

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Tools to configure LXQt and the underlying operating sys
TERMUX_PKG_LICENSE="LGPL-2.1"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="2.0.0"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL="https://github.com/lxqt/lxqt-config/releases/download/${TERMUX_PKG_VERSION}/lxqt-config-${TERMUX_PKG_VERSION}.tar.xz"
TERMUX_PKG_SHA256=091d4a1e177f732f6d6e9e66b2e117e0272272eaa73595290ad2ea05f0c4ac73
TERMUX_PKG_DEPENDS="libc++, liblxqt, libqtxdg, libxcb, libxcursor, libxfixes, lxqt-menu-data, qt6-qtbase, shared-mime-info, zlib"

View File

@@ -0,0 +1,11 @@
--- a/liblxqt-config-cursor/crtheme.cpp
+++ b/liblxqt-config-cursor/crtheme.cpp
@@ -309,7 +309,7 @@
QString name, inherits;
QString path = QDir::home().absolutePath() + QStringLiteral("/.icons/default/index.theme");
if(! QFile::exists(path))
- path = QStringLiteral("/usr/share/icons/default/index.theme");
+ path = QStringLiteral("@TERMUX_PREFIX@/share/icons/default/index.theme");
if(! QFile::exists(path))
return QString();
QSettings cursorTheme(path, QSettings::IniFormat);

View File

@@ -0,0 +1,11 @@
--- a/liblxqt-config-cursor/xcr/xcrimg.cpp
+++ b/liblxqt-config-cursor/xcr/xcrimg.cpp
@@ -274,7 +274,7 @@
// Wayland: get default cursor size
QString path = QDir::home().absolutePath() + QStringLiteral("/.icons/default/index.theme");
if(! QFile::exists(path))
- path = QStringLiteral("/usr/share/icons/default/index.theme");
+ path = QStringLiteral("@TERMUX_PREFIX@/share/icons/default/index.theme");
if(! QFile::exists(path))
return size;
QSettings cursorTheme(path, QSettings::IniFormat);

View File

@@ -0,0 +1,13 @@
--- a/liblxqt-config-cursor/xcr/xcrthemexp.cpp
+++ b/liblxqt-config-cursor/xcr/xcrthemexp.cpp
@@ -203,8 +203,8 @@
static QString unzipFile (const QString &zipFile) {
QStringList args;
- char tmpDirName[18];
- strcpy(tmpDirName, "/tmp/unzXXXXXX");
+ char tmpDirName[46];
+ strcpy(tmpDirName, "@TERMUX_PREFIX@/tmp/unzXXXXXX");
char *td = mkdtemp(tmpDirName);
if (!td) return QString();

View File

@@ -0,0 +1,20 @@
--- a/lxqt-config-input/keyboardlayoutconfig.h
+++ b/lxqt-config-input/keyboardlayoutconfig.h
@@ -23,13 +23,13 @@
#include <QtCore/QtGlobal>
#ifdef Q_OS_LINUX
-#define XKBD_BASELIST_PATH "/usr/share/X11/xkb/rules/base.lst"
+#define XKBD_BASELIST_PATH "@TERMUX_PREFIX@/share/X11/xkb/rules/base.lst"
#elif defined(Q_OS_FREEBSD)
-#define XKBD_BASELIST_PATH "/usr/local/share/X11/xkb/rules/base.lst"
+#define XKBD_BASELIST_PATH "@TERMUX_PREFIX@/local/share/X11/xkb/rules/base.lst"
#elif defined(Q_OS_OPENBSD)
-#define XKBD_BASELIST_PATH "/usr/X11R6/share/X11/xkb/rules/base.lst"
+#define XKBD_BASELIST_PATH "@TERMUX_PREFIX@/X11R6/share/X11/xkb/rules/base.lst"
#else
-#define XKBD_BASELIST_PATH "/usr/local/share/X11/xkb/rules/base.lst"
+#define XKBD_BASELIST_PATH "@TERMUX_PREFIX@/local/share/X11/xkb/rules/base.lst"
#endif
#include <QWidget>