diff options
author | Killswitch | 2022-05-29 00:24:55 +0200 |
---|---|---|
committer | Killswitch | 2022-05-29 00:24:55 +0200 |
commit | 5b1a6c3606fb3cdfab33f7b4edd63bbca9f3f691 (patch) | |
tree | c8d17e8e8d58405c9404e25e2d63e36efaced0dc | |
parent | 038ee36e68f75ad0770669c880c8598080899581 (diff) | |
download | aur-powercord-git.tar.gz |
Incorporated changes made by Marie Ramlow
-rw-r--r-- | .SRCINFO | 26 | ||||
-rw-r--r-- | PKGBUILD | 28 | ||||
-rw-r--r-- | browserWindow.js.patch | 16 | ||||
-rw-r--r-- | index.js.patch | 14 | ||||
-rw-r--r-- | injector_index.js.patch | 12 |
5 files changed, 55 insertions, 41 deletions
@@ -1,14 +1,15 @@ pkgbase = powercord-git - pkgdesc = A lightweight discord client mod focused on simplicity and performance. - pkgver = r1280.61c8dae5 + pkgdesc = A lightweight discord client mod focused on simplicity and performance. Includes a patch to fix mouse thumb buttons. + pkgver = r1390.8a471180 pkgrel = 1 url = https://github.com/powercord-org/powercord arch = any - license = Porkord + license = MIT makedepends = jq depends = nodejs depends = git depends = npm + depends = discord-canary options = !strip source = git+https://github.com/powercord-org/powercord#branch=v2 source = injector_index.js.patch @@ -17,15 +18,16 @@ pkgbase = powercord-git source = pc-settings_index.js.patch source = pc-updater_index.js.patch source = pc-updater_settings.jsx.patch + source = browserWindow.js.patch source = powercord.8 - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP - md5sums = SKIP + sha256sums = SKIP + sha256sums = 4636c2b0db9e25ee2a70d75352e8f5ae5d03d512b70e1a4b300048396d98b661 + sha256sums = a3543f74cbe07752f81fd0b5a2b29647e7138acd11ae76a6b723e28928504fb0 + sha256sums = d8174069f7f4180d770a942030bd1d90275e2a000088d9caa94aa44b79f7d7ee + sha256sums = 59356c741dea8192e340f009c5d148e526c1f723be91a8224489ed66d6b3a070 + sha256sums = b9e17f6091ea5eaee58d625aa9921f14b579f068eb7b4bd7a70068413b614bc3 + sha256sums = 1f3b303f5ddfb04badb1c909f3da2cee49ffa6a13e4a8ebb255aef715d381c6f + sha256sums = d554cc48d14e4085bf3976a5b3439abb6fbea94c7593240b717d9883ee923b8d + sha256sums = 0f06f85a3d80b00cf577d8d3a38589e8230bb7480871eca4c7ee6b04f28b61da pkgname = powercord-git - @@ -1,13 +1,14 @@ # Maintainer: Szentesi Botond +# Patches By: Marie Ramlow pkgname=powercord-git _pkgname=powercord -pkgver=r1280.61c8dae5 +pkgver=r1390.8a471180 pkgrel=1 -pkgdesc="A lightweight discord client mod focused on simplicity and performance." +pkgdesc="A lightweight discord client mod focused on simplicity and performance. Includes a patch to fix mouse thumb buttons." arch=("any") url="https://github.com/powercord-org/$_pkgname" -license=('Porkord') -depends=('nodejs' 'git' 'npm') +license=('MIT') +depends=('nodejs' 'git' 'npm' 'discord-canary') makedepends=('jq') source=( "git+https://github.com/powercord-org/powercord#branch=v2" @@ -17,17 +18,19 @@ source=( "pc-settings_index.js.patch" "pc-updater_index.js.patch" "pc-updater_settings.jsx.patch" + "browserWindow.js.patch" "powercord.8" ) -md5sums=( - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' +sha256sums=( 'SKIP' + '4636c2b0db9e25ee2a70d75352e8f5ae5d03d512b70e1a4b300048396d98b661' + 'a3543f74cbe07752f81fd0b5a2b29647e7138acd11ae76a6b723e28928504fb0' + 'd8174069f7f4180d770a942030bd1d90275e2a000088d9caa94aa44b79f7d7ee' + '59356c741dea8192e340f009c5d148e526c1f723be91a8224489ed66d6b3a070' + 'b9e17f6091ea5eaee58d625aa9921f14b579f068eb7b4bd7a70068413b614bc3' + '1f3b303f5ddfb04badb1c909f3da2cee49ffa6a13e4a8ebb255aef715d381c6f' + 'd554cc48d14e4085bf3976a5b3439abb6fbea94c7593240b717d9883ee923b8d' + '0f06f85a3d80b00cf577d8d3a38589e8230bb7480871eca4c7ee6b04f28b61da' ) options=('!strip') @@ -38,6 +41,7 @@ prepare() { patch -u ${srcdir}/${_pkgname}/src/Powercord/plugins/pc-settings/index.js -i ${srcdir}/pc-settings_index.js.patch patch -u ${srcdir}/${_pkgname}/src/Powercord/plugins/pc-updater/index.js -i ${srcdir}/pc-updater_index.js.patch patch -u ${srcdir}/${_pkgname}/src/Powercord/plugins/pc-updater/components/Settings.jsx -i ${srcdir}/pc-updater_settings.jsx.patch + patch -u ${srcdir}/${_pkgname}/src/browserWindow.js -i ${srcdir}/browserWindow.js.patch cd "${srcdir}/${_pkgname}" local _revision="$(git rev-list HEAD | head -n 1)" diff --git a/browserWindow.js.patch b/browserWindow.js.patch new file mode 100644 index 000000000000..40e421408ec0 --- /dev/null +++ b/browserWindow.js.patch @@ -0,0 +1,16 @@ +diff --git a/src/browserWindow.js b/src/browserWindow.js +index 27e87cbb..4f575775 100644 +--- a/src/browserWindow.js ++++ b/src/browserWindow.js +@@ -56,6 +56,11 @@ class PatchedBrowserWindow extends BrowserWindow { + win.on('unmaximize', () => void win.webContents.send('POWERCORD_WINDOW_UNMAXIMIZE')); + + win.webContents._powercordPreload = originalPreload; ++ const oldOn = win.on; ++ win.on = (event, listener, args) => { ++ if (event === 'app-command') return; ++ oldOn.apply(win, [event, listener, args]); ++ }; + return win; + } + diff --git a/index.js.patch b/index.js.patch index efccef5b5250..6aa62570f122 100644 --- a/index.js.patch +++ b/index.js.patch @@ -1,6 +1,6 @@ ---- /opt/powercord/src/Powercord/index.js 2020-08-15 18:33:09.000000000 +0200 -+++ ./index.js 2020-08-15 22:14:22.762386298 +0200 -@@ -54,9 +54,9 @@ +--- ./powercord/src/Powercord/index.js 2022-05-29 00:03:57.291394709 +0200 ++++ ./index.js.patched 2022-05-29 00:11:14.281641878 +0200 +@@ -53,9 +53,9 @@ this.api = {}; this.gitInfos = { @@ -13,11 +13,3 @@ }; this.initialized = false; this.styleManager = new StyleManager(); -@@ -89,7 +89,6 @@ - // Start - await this.startup(); - this.fetchAccount(); -- this.gitInfos = await this.pluginManager.get('pc-updater').getGitInfos(); - - // Token manipulation stuff - if (this.settings.get('hideToken', true)) { diff --git a/injector_index.js.patch b/injector_index.js.patch index 7e0ca1691b55..3f0676bf63a6 100644 --- a/injector_index.js.patch +++ b/injector_index.js.patch @@ -1,13 +1,13 @@ ---- ./powercord/injectors/index.js 2020-09-14 22:56:56.712657163 +0200 -+++ ./index.js.patched 2020-09-14 23:13:59.510168597 +0200 +--- ./powercord/injectors/index.js 2022-05-28 23:52:39.121011129 +0200 ++++ ./index.js.patched 2022-05-28 23:51:44.530980252 +0200 @@ -1,3 +1,10 @@ +#!/usr/bin/env node + -+if(process.env.USER != "root") { ++if (process.env.USER != "root") { + console.log("You need to run powercord as root."); + process.exit(1); +} + - /** - * Copyright (c) 2018-2020 aetheryx & Bowser65 - * All Rights Reserved. Licensed under the Porkord License + require('./elevate'); + require('./env_check')(); // Perform checks + require('../polyfills'); // And then do stuff |