Compare commits
No commits in common. "20605b3001597ac307551b2e7e03d8bdec8e3cb0" and "4dbda26af7eff44e984bc51034b19d80186f3bed" have entirely different histories.
20605b3001
...
4dbda26af7
6 changed files with 20 additions and 24 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
pkgbase = discord-electron-openasar
|
pkgbase = discord-electron-openasar
|
||||||
pkgdesc = Discord packaged with OpenAsar using system provided electron (v30) for increased security and performance
|
pkgdesc = Discord packaged with OpenAsar using system provided electron (v30) for increased security and performance
|
||||||
pkgver = 0.0.55+827
|
pkgver = 0.0.55+827
|
||||||
pkgrel = 3
|
pkgrel = 2
|
||||||
url = https://discord.com
|
url = https://discord.com
|
||||||
install = discord-electron-openasar.install
|
install = discord-electron-openasar.install
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
|
|
@ -14,6 +14,7 @@ pkgbase = discord-electron-openasar
|
||||||
depends = electron30
|
depends = electron30
|
||||||
depends = libxss
|
depends = libxss
|
||||||
depends = unzip
|
depends = unzip
|
||||||
|
depends = python
|
||||||
optdepends = libpulse: Pulseaudio support
|
optdepends = libpulse: Pulseaudio support
|
||||||
optdepends = libappindicator-gtk3: Systray indicator support
|
optdepends = libappindicator-gtk3: Systray indicator support
|
||||||
optdepends = xdg-utils: Open files
|
optdepends = xdg-utils: Open files
|
||||||
|
|
@ -27,7 +28,7 @@ pkgbase = discord-electron-openasar
|
||||||
source = krisp-patcher.py
|
source = krisp-patcher.py
|
||||||
source = git+https://github.com/goosemod/openasar.git#commit=4f264d860a5a6a32e1862ce26178b9cf6402335d
|
source = git+https://github.com/goosemod/openasar.git#commit=4f264d860a5a6a32e1862ce26178b9cf6402335d
|
||||||
sha512sums = c12365109cb4db94033fda101073d2a3d6af7bdc9728e025494ee8d44ebf5f27623861879ec38bb7dd88d40de7cddede268e0f5e44bfeb586fc12713a3758c5b
|
sha512sums = c12365109cb4db94033fda101073d2a3d6af7bdc9728e025494ee8d44ebf5f27623861879ec38bb7dd88d40de7cddede268e0f5e44bfeb586fc12713a3758c5b
|
||||||
sha512sums = 4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666
|
sha512sums = 100fd089bd17dce7cbb05d4dd757cfa438e713edac02814d127a944814017e3e55afa28331826a420211544b1cd796255fe8bd92b9e07c9d17b12528a8099b8c
|
||||||
sha512sums = 3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f
|
sha512sums = 3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f
|
||||||
sha512sums = 055bbe5fbc63a715ab8357db8aabacad282e3d176b48e322d7133a5887291577687456bbfaf7b832d19f13b1a5a373e2c0f6f82664887509feb3c193ee4f1849
|
sha512sums = 055bbe5fbc63a715ab8357db8aabacad282e3d176b48e322d7133a5887291577687456bbfaf7b832d19f13b1a5a373e2c0f6f82664887509feb3c193ee4f1849
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ pkgname=discord-electron-openasar
|
||||||
_pkgname=discord
|
_pkgname=discord
|
||||||
pkgver=0.0.55+827
|
pkgver=0.0.55+827
|
||||||
_pkgver=${pkgver%%+*}
|
_pkgver=${pkgver%%+*}
|
||||||
pkgrel=3
|
pkgrel=2
|
||||||
_electronver=30
|
_electronver=30
|
||||||
_electronname="electron${_electronver}"
|
_electronname="electron${_electronver}"
|
||||||
pkgdesc="Discord packaged with OpenAsar using system provided electron (v${_electronver}) for increased security and performance"
|
pkgdesc="Discord packaged with OpenAsar using system provided electron (v${_electronver}) for increased security and performance"
|
||||||
|
|
@ -15,7 +15,7 @@ url='https://discord.com'
|
||||||
license=('custom')
|
license=('custom')
|
||||||
options=('!strip')
|
options=('!strip')
|
||||||
install="$pkgname.install"
|
install="$pkgname.install"
|
||||||
depends=("${_electronname}" 'libxss' 'unzip')
|
depends=("${_electronname}" 'libxss' 'unzip' 'python')
|
||||||
makedepends=('git' 'asar' 'nodejs' 'curl' 'python-html2text')
|
makedepends=('git' 'asar' 'nodejs' 'curl' 'python-html2text')
|
||||||
optdepends=(
|
optdepends=(
|
||||||
'libpulse: Pulseaudio support'
|
'libpulse: Pulseaudio support'
|
||||||
|
|
@ -29,7 +29,7 @@ source=("https://dl.discordapp.net/apps/linux/${_pkgver}/${_pkgname}-${_pkgver}.
|
||||||
'krisp-patcher.py' # original: https://github.com/sersorrel/sys/blob/main/hm/discord/krisp-patcher.py
|
'krisp-patcher.py' # original: https://github.com/sersorrel/sys/blob/main/hm/discord/krisp-patcher.py
|
||||||
"git+https://github.com/goosemod/openasar.git#commit=4f264d860a5a6a32e1862ce26178b9cf6402335d")
|
"git+https://github.com/goosemod/openasar.git#commit=4f264d860a5a6a32e1862ce26178b9cf6402335d")
|
||||||
sha512sums=('c12365109cb4db94033fda101073d2a3d6af7bdc9728e025494ee8d44ebf5f27623861879ec38bb7dd88d40de7cddede268e0f5e44bfeb586fc12713a3758c5b'
|
sha512sums=('c12365109cb4db94033fda101073d2a3d6af7bdc9728e025494ee8d44ebf5f27623861879ec38bb7dd88d40de7cddede268e0f5e44bfeb586fc12713a3758c5b'
|
||||||
'4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666'
|
'100fd089bd17dce7cbb05d4dd757cfa438e713edac02814d127a944814017e3e55afa28331826a420211544b1cd796255fe8bd92b9e07c9d17b12528a8099b8c'
|
||||||
'3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f'
|
'3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f'
|
||||||
'055bbe5fbc63a715ab8357db8aabacad282e3d176b48e322d7133a5887291577687456bbfaf7b832d19f13b1a5a373e2c0f6f82664887509feb3c193ee4f1849')
|
'055bbe5fbc63a715ab8357db8aabacad282e3d176b48e322d7133a5887291577687456bbfaf7b832d19f13b1a5a373e2c0f6f82664887509feb3c193ee4f1849')
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,18 +10,15 @@ declare -l PATCH_KRISP
|
||||||
flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@-flags.conf"
|
flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@-flags.conf"
|
||||||
krisp_bin="${DISCORD_USER_DATA_DIR:-${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@}/@PKGVER@/modules/@PKGNAME@_krisp/@PKGNAME@_krisp.node"
|
krisp_bin="${DISCORD_USER_DATA_DIR:-${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@}/@PKGVER@/modules/@PKGNAME@_krisp/@PKGNAME@_krisp.node"
|
||||||
|
|
||||||
if [[ "${PATCH_KRISP:-}" == true ]] && [[ -w "${krisp_bin}" ]]; then
|
if [[ "${PATCH_KRISP:-}" == true ]] && [[ -w "${krisp_bin}" ]] && python -c "import capstone; import elftools" &> /dev/null; then
|
||||||
if hash python &> /dev/null && python -c 'import capstone; import elftools' &> /dev/null; then
|
|
||||||
# Patch Krisp binary to ignore signature check
|
# Patch Krisp binary to ignore signature check
|
||||||
echo -n 'Running Krisp patcher... '
|
|
||||||
python /usr/lib/@PKGNAME@/krisp-patcher.py "${krisp_bin}"
|
python /usr/lib/@PKGNAME@/krisp-patcher.py "${krisp_bin}"
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -r "${flags_file}" ]]; then
|
if [[ -r "${flags_file}" ]]; then
|
||||||
# Replacing because old flag does not work
|
# Replacing because old flag does not work
|
||||||
if [[ -w "${flags_file}" ]] && grep -q '\--ignore-gpu-blacklist' "${flags_file}"; then
|
if [[ -w "${flags_file}" ]] && grep -q '\--ignore-gpu-blacklist' "${flags_file}"; then
|
||||||
sed -i 's|--ignore-gpu-blacklist|--ignore-gpu-blocklist|' "${flags_file}"
|
sed -i "s|--ignore-gpu-blacklist|--ignore-gpu-blocklist|" "${flags_file}"
|
||||||
fi
|
fi
|
||||||
mapfile -t < "${flags_file}"
|
mapfile -t < "${flags_file}"
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
pkgbase = discord-electron
|
pkgbase = discord-electron
|
||||||
pkgdesc = Discord using system provided electron (v30) for increased security and performance
|
pkgdesc = Discord using system provided electron (v30) for increased security and performance
|
||||||
pkgver = 0.0.55
|
pkgver = 0.0.55
|
||||||
pkgrel = 3
|
pkgrel = 2
|
||||||
url = https://discord.com
|
url = https://discord.com
|
||||||
install = discord-electron.install
|
install = discord-electron.install
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
|
|
@ -11,6 +11,7 @@ pkgbase = discord-electron
|
||||||
makedepends = python-html2text
|
makedepends = python-html2text
|
||||||
depends = electron30
|
depends = electron30
|
||||||
depends = libxss
|
depends = libxss
|
||||||
|
depends = python
|
||||||
optdepends = libpulse: Pulseaudio support
|
optdepends = libpulse: Pulseaudio support
|
||||||
optdepends = libappindicator-gtk3: Systray indicator support
|
optdepends = libappindicator-gtk3: Systray indicator support
|
||||||
optdepends = xdg-utils: Open files
|
optdepends = xdg-utils: Open files
|
||||||
|
|
@ -23,7 +24,7 @@ pkgbase = discord-electron
|
||||||
source = discord-launcher.sh
|
source = discord-launcher.sh
|
||||||
source = krisp-patcher.py
|
source = krisp-patcher.py
|
||||||
sha512sums = c12365109cb4db94033fda101073d2a3d6af7bdc9728e025494ee8d44ebf5f27623861879ec38bb7dd88d40de7cddede268e0f5e44bfeb586fc12713a3758c5b
|
sha512sums = c12365109cb4db94033fda101073d2a3d6af7bdc9728e025494ee8d44ebf5f27623861879ec38bb7dd88d40de7cddede268e0f5e44bfeb586fc12713a3758c5b
|
||||||
sha512sums = 4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666
|
sha512sums = 100fd089bd17dce7cbb05d4dd757cfa438e713edac02814d127a944814017e3e55afa28331826a420211544b1cd796255fe8bd92b9e07c9d17b12528a8099b8c
|
||||||
sha512sums = 3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f
|
sha512sums = 3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f
|
||||||
|
|
||||||
pkgname = discord-electron
|
pkgname = discord-electron
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
pkgname=discord-electron
|
pkgname=discord-electron
|
||||||
_pkgname=discord
|
_pkgname=discord
|
||||||
pkgver=0.0.55
|
pkgver=0.0.55
|
||||||
pkgrel=3
|
pkgrel=2
|
||||||
_electronver=30
|
_electronver=30
|
||||||
_electronname="electron${_electronver}"
|
_electronname="electron${_electronver}"
|
||||||
pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance"
|
pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance"
|
||||||
|
|
@ -12,7 +12,7 @@ url='https://discord.com'
|
||||||
license=('custom')
|
license=('custom')
|
||||||
options=('!strip')
|
options=('!strip')
|
||||||
install="$pkgname.install"
|
install="$pkgname.install"
|
||||||
depends=("${_electronname}" 'libxss')
|
depends=("${_electronname}" 'libxss' 'python')
|
||||||
makedepends=('asar' 'curl' 'python-html2text')
|
makedepends=('asar' 'curl' 'python-html2text')
|
||||||
optdepends=(
|
optdepends=(
|
||||||
'libpulse: Pulseaudio support'
|
'libpulse: Pulseaudio support'
|
||||||
|
|
@ -25,7 +25,7 @@ source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.ta
|
||||||
'discord-launcher.sh'
|
'discord-launcher.sh'
|
||||||
'krisp-patcher.py') # original: https://github.com/sersorrel/sys/blob/main/hm/discord/krisp-patcher.py
|
'krisp-patcher.py') # original: https://github.com/sersorrel/sys/blob/main/hm/discord/krisp-patcher.py
|
||||||
sha512sums=('c12365109cb4db94033fda101073d2a3d6af7bdc9728e025494ee8d44ebf5f27623861879ec38bb7dd88d40de7cddede268e0f5e44bfeb586fc12713a3758c5b'
|
sha512sums=('c12365109cb4db94033fda101073d2a3d6af7bdc9728e025494ee8d44ebf5f27623861879ec38bb7dd88d40de7cddede268e0f5e44bfeb586fc12713a3758c5b'
|
||||||
'4497ff3df7e2c1e72eea09d6f36a80cabeabfd43bb03b0966795d45e10a02ea6b4c10407661092d057435e0d69d75e958a3dbb1dc5971a215ce09547ec56f666'
|
'100fd089bd17dce7cbb05d4dd757cfa438e713edac02814d127a944814017e3e55afa28331826a420211544b1cd796255fe8bd92b9e07c9d17b12528a8099b8c'
|
||||||
'3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f')
|
'3c1021592fa856f3561072c76b5ee0b5a34a53bc230336e6d36827efb4866c9d801ef7abb24650d3a7210c61dd57f35e2812ae89226fc157cc8d9ffce032155f')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
|
|
|
||||||
|
|
@ -10,18 +10,15 @@ declare -l PATCH_KRISP
|
||||||
flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@-flags.conf"
|
flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@-flags.conf"
|
||||||
krisp_bin="${DISCORD_USER_DATA_DIR:-${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@}/@PKGVER@/modules/@PKGNAME@_krisp/@PKGNAME@_krisp.node"
|
krisp_bin="${DISCORD_USER_DATA_DIR:-${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@}/@PKGVER@/modules/@PKGNAME@_krisp/@PKGNAME@_krisp.node"
|
||||||
|
|
||||||
if [[ "${PATCH_KRISP:-}" == true ]] && [[ -w "${krisp_bin}" ]]; then
|
if [[ "${PATCH_KRISP:-}" == true ]] && [[ -w "${krisp_bin}" ]] && python -c "import capstone; import elftools" &> /dev/null; then
|
||||||
if hash python &> /dev/null && python -c 'import capstone; import elftools' &> /dev/null; then
|
|
||||||
# Patch Krisp binary to ignore signature check
|
# Patch Krisp binary to ignore signature check
|
||||||
echo -n 'Running Krisp patcher... '
|
|
||||||
python /usr/lib/@PKGNAME@/krisp-patcher.py "${krisp_bin}"
|
python /usr/lib/@PKGNAME@/krisp-patcher.py "${krisp_bin}"
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -r "${flags_file}" ]]; then
|
if [[ -r "${flags_file}" ]]; then
|
||||||
# Replacing because old flag does not work
|
# Replacing because old flag does not work
|
||||||
if [[ -w "${flags_file}" ]] && grep -q '\--ignore-gpu-blacklist' "${flags_file}"; then
|
if [[ -w "${flags_file}" ]] && grep -q '\--ignore-gpu-blacklist' "${flags_file}"; then
|
||||||
sed -i 's|--ignore-gpu-blacklist|--ignore-gpu-blocklist|' "${flags_file}"
|
sed -i "s|--ignore-gpu-blacklist|--ignore-gpu-blocklist|" "${flags_file}"
|
||||||
fi
|
fi
|
||||||
mapfile -t < "${flags_file}"
|
mapfile -t < "${flags_file}"
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue