summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislav N. aka pztrn2020-12-21 15:41:09 +0500
committerStanislav N. aka pztrn2020-12-21 15:41:09 +0500
commit6bf342729bbd082c98a7803350873d6b716cb15f (patch)
tree88d6803252b3b052d4f9699788b462bc0c0ae267
parent5bc3fa5a68b82984114d7339ba58d3cf270f8bb9 (diff)
downloadaur-6bf342729bbd082c98a7803350873d6b716cb15f.tar.gz
Fix inability to access some menu items in KDE.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
-rw-r--r--nxmc.desktop2
-rwxr-xr-xnxmc.sh10
4 files changed, 23 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d180cbcc9a88..3ea602e6aebf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = nxmc
pkgdesc = Graphical console for NetXMS NMS based on Eclipse.
pkgver = 3.6.300
- pkgrel = 1
+ pkgrel = 2
url = https://www.netxms.org/
arch = x86_64
license = custom
@@ -13,9 +13,11 @@ pkgbase = nxmc
source = https://netxms.org/download/releases/3.6/nxmc-3.6.300-linux-gtk-x64.tar.gz
source = nxmc.desktop
source = https://raw.githubusercontent.com/netxms/netxms/master/COPYING
+ source = nxmc.sh
sha256sums = d7e0e216534862257a4bd3d3361be9e4ba9171318f18adca4a6b813952f11d40
- sha256sums = a8fd91020c07d78163bcc4988ab94ca192240bb01566138cc6ed531e3d183e9c
+ sha256sums = 5fa1476cf864854db813597aac7d52d140218254cbfe4cc44b6ef3858a751675
sha256sums = 9ac6daa129fb98672b5bc6bd6d2283a7b419b1186d298c5aeb3156bf317228ab
+ sha256sums = 132b00293931b62bb99990991a817b72d3110a64f3142e3c2e453ef112c9d9d4
pkgname = nxmc
diff --git a/PKGBUILD b/PKGBUILD
index 67bde0dc6150..06b670867d7a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=nxmc
pkgver=3.6.300
-pkgrel=1
+pkgrel=2
pkgdesc="Graphical console for NetXMS NMS based on Eclipse."
arch=('x86_64')
url="https://www.netxms.org/"
@@ -13,10 +13,13 @@ makedepends=(imagemagick)
source=(https://netxms.org/download/releases/3.6/${pkgname}-${pkgver}-linux-gtk-x64.tar.gz
${pkgname}.desktop
https://raw.githubusercontent.com/netxms/netxms/master/COPYING
+ ${pkgname}.sh
)
sha256sums=('d7e0e216534862257a4bd3d3361be9e4ba9171318f18adca4a6b813952f11d40'
- 'a8fd91020c07d78163bcc4988ab94ca192240bb01566138cc6ed531e3d183e9c'
- '9ac6daa129fb98672b5bc6bd6d2283a7b419b1186d298c5aeb3156bf317228ab')
+ '5fa1476cf864854db813597aac7d52d140218254cbfe4cc44b6ef3858a751675'
+ '9ac6daa129fb98672b5bc6bd6d2283a7b419b1186d298c5aeb3156bf317228ab'
+ '132b00293931b62bb99990991a817b72d3110a64f3142e3c2e453ef112c9d9d4')
+
package() {
install -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -d "${pkgdir}/opt/${pkgname}"
@@ -26,10 +29,10 @@ package() {
install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
install -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-
+
/usr/bin/convert "${srcdir}/${pkgname}/icon.xpm" "${srcdir}/${pkgname}/icon.png"
install -m644 "${srcdir}/${pkgname}/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
cp -r "${srcdir}/${pkgname}/"* "${pkgdir}/opt/${pkgname}" -R
- ln -s /opt/${_pkgname}/bin/nxmc "${pkgdir}"/usr/bin/nxmc
+ install -m755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/nxmc"
}
diff --git a/nxmc.desktop b/nxmc.desktop
index baae26fdc2af..39dbb33425fe 100644
--- a/nxmc.desktop
+++ b/nxmc.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=/opt/nxmc/nxmc
+Exec=/usr/bin/nxmc
Icon=nxmc
Terminal=false
Type=Application
diff --git a/nxmc.sh b/nxmc.sh
new file mode 100755
index 000000000000..eda67a84cde2
--- /dev/null
+++ b/nxmc.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+# We should disable UBUNTU_MENUPROXY for KDE because KDE's global menu lagging
+# with nxmc's menu.
+
+if [ "${XDG_CURRENT_DESKTOP/KDE//}" != "${XDG_CURRENT_DESKTOP}" ]; then
+ export UBUNTU_MENUPROXY=
+fi
+
+/opt/nxmc/nxmc $@