summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO19
-rw-r--r--70-wooting.rules4
-rw-r--r--PKGBUILD61
-rw-r--r--wootility-appimage.install9
-rw-r--r--wooting.install13
5 files changed, 50 insertions, 56 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bd5c6866e9c9..fd9ad1068f2e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
-pkgbase = wootility-lekker-appimage
+pkgbase = wootility-appimage
pkgdesc = Utility for configuring Wooting keyboards (binary AppImage version)
- pkgver = 4.6.14
- pkgrel = 1
+ pkgver = 3.6.16
+ pkgrel = 5
url = https://wooting.io/wootility
- install = wooting.install
+ install = wootility-appimage.install
arch = x86_64
+ arch = x86_64_v3
license = unknown
depends = fuse2
- optdepends = xboxdrv: Analog gamepad support (input group required)
provides = wootility
- provides = wootility-lekker
conflicts = wootility
options = !strip
- source = https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-lekker-linux-latest/wootility-lekker-4.6.14.AppImage
+ source = https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-linux-latest/wootility-3.6.16.AppImage
source = 70-wooting.rules
- sha512sums = c20c1f180c91cbd7c7a32decee544abafde36d3104e64e07d641013467579bed7eda1ad7957db61aa0be7712729aabb7881b2c3adcf910fc60c7448cf43c8c52
- sha512sums = 552d3211d99a83b4e59fee5cb1ad70c41846ca7e8306a4065a3c410baeb5befc417c0833add136820f0694150aeba29e9380c5e7bc9ab6a257b686e66baeea29
+ b2sums = 79a32462cb3f375344ace2a4785c950854b8a7dd027d9c1e7c24696135f641d1d88f56ccbc2dfadc53d278e291bf11735d81d860e57b83cb981366d4930bf641
+ b2sums = 80b4a516f8aafb6eada36cdde59295f2358b22e6cc28b1a21b0b5f22a59bcfabc63bba956d23544faca5fd76a1c4b4c1ff98ada41e7c9ad015d48c7c436dbac1
-pkgname = wootility-lekker-appimage
+pkgname = wootility-appimage
diff --git a/70-wooting.rules b/70-wooting.rules
index a311ebe6ba14..2ea36da2b730 100644
--- a/70-wooting.rules
+++ b/70-wooting.rules
@@ -1,13 +1,13 @@
# Wooting One Legacy
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess"
-# Wooting One update mode
+# Wooting One update mode
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="uaccess"
# Wooting Two Legacy
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess"
-# Wooting Two update mode
+# Wooting Two update mode
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", TAG+="uaccess"
# Generic Wootings
diff --git a/PKGBUILD b/PKGBUILD
index 633e2c368210..cd489d762b19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,49 @@
-# Maintainer: Shayne Hartford <shayneehartford@gmail.com>
+# Maintainer: Frederik “Freso” S. Olesen <archlinux@freso.dk>
+# Contributor: Shayne Hartford <shayneehartford@gmail.com>
-_pkgname=wootility-lekker
+_pkgname=wootility
pkgname=${_pkgname}-appimage
-pkgver=4.6.14
-pkgrel=1
-pkgdesc="Utility for configuring Wooting keyboards (binary AppImage version)"
-arch=('x86_64')
-url="https://wooting.io/wootility"
+pkgver=3.6.16
+pkgrel=5
+pkgdesc='Utility for configuring Wooting keyboards (binary AppImage version)'
+arch=('x86_64' 'x86_64_v3')
+url='https://wooting.io/wootility'
license=('unknown')
depends=('fuse2')
-optdepends=('xboxdrv: Analog gamepad support (input group required)')
-provides=('wootility' 'wootility-lekker')
-conflicts=('wootility')
+provides=("${_pkgname}")
+conflicts=("${_pkgname}")
options=(!strip)
-install=wooting.install
_appimage="${_pkgname}-${pkgver}.AppImage"
-source=(
- "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-lekker-linux-latest/${_appimage}"
- "70-wooting.rules"
-)
-sha512sums=(
- "c20c1f180c91cbd7c7a32decee544abafde36d3104e64e07d641013467579bed7eda1ad7957db61aa0be7712729aabb7881b2c3adcf910fc60c7448cf43c8c52"
- "552d3211d99a83b4e59fee5cb1ad70c41846ca7e8306a4065a3c410baeb5befc417c0833add136820f0694150aeba29e9380c5e7bc9ab6a257b686e66baeea29"
-)
+install=$pkgname.install
+source=("https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-linux-latest/${_appimage}"
+ '70-wooting.rules')
+b2sums=('79a32462cb3f375344ace2a4785c950854b8a7dd027d9c1e7c24696135f641d1d88f56ccbc2dfadc53d278e291bf11735d81d860e57b83cb981366d4930bf641'
+ '80b4a516f8aafb6eada36cdde59295f2358b22e6cc28b1a21b0b5f22a59bcfabc63bba956d23544faca5fd76a1c4b4c1ff98ada41e7c9ad015d48c7c436dbac1')
prepare() {
- chmod +x ${_appimage}
- ./${_appimage} --appimage-extract ${_pkgname}.desktop
- ./${_appimage} --appimage-extract ${_pkgname}.png
- ./${_appimage} --appimage-extract usr/share/icons
+ # Copying AppImage in case $SRCDEST is mounted with noexec
+ cp ${_appimage} ${_appimage}.copy
+ chmod +x ${_appimage}.copy
+ ./${_appimage}.copy --appimage-extract ${_pkgname}.desktop
+ ./${_appimage}.copy --appimage-extract ${_pkgname}.png
+ ./${_appimage}.copy --appimage-extract usr/share/icons
+ rm ${_appimage}.copy
}
build() {
- sed -i -E "s|Exec=AppRun|Exec=${_pkgname}|" squashfs-root/${_pkgname}.desktop # Modify Exec to $_pkgname
- sed -i -E "s|Name=${_pkgname}|Name=Wootility|" squashfs-root/${_pkgname}.desktop # Modify Name to Wootility
+ sed -i -E "s|Exec=AppRun|Exec=${_pkgname}|" squashfs-root/${_pkgname}.desktop
+ sed -i -E "s|Name=.*$|Name=Wootility|" squashfs-root/${_pkgname}.desktop
}
package() {
- install -Dpm755 "${_appimage}" "${pkgdir}/opt/${_pkgname}/${_appimage}" # Install $_appimage to /opt/$_pkgname/$_appimage
- install -d "${pkgdir}/usr/bin" # Install /usr/bin
- ln -s "/opt/${_pkgname}/${_appimage}" "${pkgdir}/usr/bin/${_pkgname}" # Link /opt/$_pkgname/$_appimage to /usr/bin/$_pkgname
-
+ install -Dpm755 "${_appimage}" "${pkgdir}/opt/${_pkgname}/${_appimage}"
+ install -d "${pkgdir}/usr/bin"
+ ln -s "../../opt/${_pkgname}/${_appimage}" "${pkgdir}/usr/bin/${_pkgname}"
+
# Install desktop entry and icon
install -Dpm644 "squashfs-root/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
install -Dpm644 "squashfs-root/${_pkgname}.png" "${pkgdir}/usr/share/icons/hicolor/512x512/apps/${_pkgname}.png"
-
- # Install udev rules and systemd services
+
+ # Install udev rules
install -Dpm644 "70-wooting.rules" "${pkgdir}/usr/lib/udev/rules.d/70-wooting.rules"
}
diff --git a/wootility-appimage.install b/wootility-appimage.install
new file mode 100644
index 000000000000..baffe52bc48a
--- /dev/null
+++ b/wootility-appimage.install
@@ -0,0 +1,9 @@
+post_install() {
+ echo 'To turn off the “Would you like to integrate ….AppImage with your system?”'
+ echo 'notifications on every launch of Wootility, see:'
+ echo 'https://github.com/AppImage/AppImageSpec/blob/master/draft.md#desktop-integration'
+}
+
+post_upgrade() {
+ post_install
+}
diff --git a/wooting.install b/wooting.install
deleted file mode 100644
index d659dc930f3f..000000000000
--- a/wooting.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post() {
- echo "You must add yourself to the 'input' group for wootility to work correctly, 'sudo usermod -aG input <username>'"
- echo "You must restart your login session to apply group changes (logout or reboot)"
- echo "You can optionally install 'xboxdrv' for gamepad support"
-}
-
-post_install() {
- post
-}
-
-post_upgrade() {
- post
-}