summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD17
-rw-r--r--node-lts-fermium-dep.patch22
3 files changed, 39 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a80ed07706b7..922fe30b019e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = kiibohd-configurator-git
pkgdesc = Client Side Configuration & Flashing Software for Kiibohd compatible keyboards
pkgver = r286.2e12869
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/kiibohd/configurator
arch = x86_64
license = GPL3
@@ -12,6 +12,8 @@ pkgbase = kiibohd-configurator-git
provides = kiibohd-configurator
conflicts = kiibohd-configurator
source = kiibohd-configurator-git::git+https://github.com/kiibohd/configurator.git
+ source = node-lts-fermium-dep.patch
sha256sums = SKIP
+ sha256sums = f85d77db6ba1f7e5b0fa32c4b933c187bbfb3cee70502ac2a4aed2ac5bfc8656
pkgname = kiibohd-configurator-git
diff --git a/PKGBUILD b/PKGBUILD
index a47b3a59c00a..e39f8181e816 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=kiibohd-configurator-git
_pkgname=kiibohd-configurator
pkgver=r286.2e12869
-pkgrel=2
+pkgrel=3
pkgdesc="Client Side Configuration & Flashing Software for Kiibohd compatible keyboards"
arch=('x86_64')
url="https://github.com/kiibohd/configurator"
@@ -13,8 +13,12 @@ depends=('dfu-util')
makedepends=('git' 'yarn' 'nodejs-lts-fermium')
conflicts=("${_pkgname}")
provides=("${_pkgname}")
-source=("${pkgname}::git+https://github.com/kiibohd/configurator.git")
-sha256sums=('SKIP')
+source=(
+ "${pkgname}::git+https://github.com/kiibohd/configurator.git"
+ node-lts-fermium-dep.patch
+)
+sha256sums=('SKIP'
+ 'f85d77db6ba1f7e5b0fa32c4b933c187bbfb3cee70502ac2a4aed2ac5bfc8656')
#_pkg="${srcdir}/${pkgname}"
#cd "${_pkg}"
@@ -25,6 +29,13 @@ pkgver() {
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
+
+prepare() {
+ cd "$srcdir/${pkgname}"
+ patch --forward --strip=1 --input=../../node-lts-fermium-dep.patch
+}
+
+
build() {
cd ${pkgname}
yarn
diff --git a/node-lts-fermium-dep.patch b/node-lts-fermium-dep.patch
new file mode 100644
index 000000000000..2cb52ca69812
--- /dev/null
+++ b/node-lts-fermium-dep.patch
@@ -0,0 +1,22 @@
+diff --git a/package.json b/package.json
+index 8cd005d..f689c1e 100644
+--- a/package.json
++++ b/package.json
+@@ -46,7 +46,7 @@
+ "react-dom": "^16.13.1",
+ "source-map-support": "^0.5.16",
+ "url-join": "^4.0.1",
+- "usb": "^1.6.2"
++ "usb": "^1.9.2"
+ },
+ "devDependencies": {
+ "@babel/preset-react": "^7.9.4",
+@@ -75,7 +75,7 @@
+ "eslint-config-prettier": "^6.10.1",
+ "eslint-plugin-prettier": "^3.1.2",
+ "eslint-plugin-react": "^7.19.0",
+- "node-sass": "^4.13.1",
++ "node-sass": "^8.0.0",
+ "prettier": "^2.0.2",
+ "sass-loader": "^8.0.2",
+ "tslint": "^6.1.0",