summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wagie2021-05-12 15:57:41 -0600
committerMark Wagie2021-05-12 15:57:41 -0600
commitdc347f4135c515c8da1f174305daffe545d2b7ce (patch)
tree0fcf3815c81c7934704cfdd96d66f169d39781a7
parentb495b0d402e325ee171a22990b4696428c252747 (diff)
downloadaur-dc347f4135c515c8da1f174305daffe545d2b7ce.tar.gz
remove deprecated patch
-rw-r--r--.SRCINFO4
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD7
-rw-r--r--galu1.patch20
4 files changed, 2 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 22440922adf6..61a012a9849f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = system76-driver
pkgdesc = Universal driver for System76 computers
pkgver = 20.04.32
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/pop-os/system76-driver
install = system76-driver.install
arch = any
@@ -37,12 +37,10 @@ pkgbase = system76-driver
optdepends = xorg-xhost: To enable GUI applications on Wayland
optdepends = xorg-xbacklight: To use the backlight service
source = system76-driver-20.04.32.tar.gz::https://github.com/pop-os/system76-driver/archive/20.04.32.tar.gz
- source = galu1.patch
source = cli.patch
source = wayland.patch
source = actions.patch
sha256sums = 4274764bf78836ea07decd82783fc9010fcbc92ff65b35560cdadae34926ba2f
- sha256sums = 2ccf53ec0ffdeea00930d218253f5b3db2bdc7d3405e8353caabc36107f3ab26
sha256sums = ef027346c439561dc01f906ae7bd961100aedf9125fd86bb0eb89a87b683fdc3
sha256sums = 2ffbd813744c0b99416947a2755767767af434758aa20dcfafefb49fb367d5d3
sha256sums = 3ade740c1681f8f33ef78e1e6c087e4002d14c888d7a5bf6bfbeb2aa70111119
diff --git a/.gitignore b/.gitignore
index 335313337756..8ee8e4f88e24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,5 @@
!.SRCINFO
!actions.patch
!cli.patch
-!galu1.patch
!wayland.patch
!system76-driver.install
diff --git a/PKGBUILD b/PKGBUILD
index 813cc7a776cf..ba9d5bb0d2d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Corey Hinshaw <corey(at)electrickite(dot)org>
pkgname=system76-driver
pkgver=20.04.32
-pkgrel=1
+pkgrel=2
pkgdesc="Universal driver for System76 computers"
arch=('any')
url="https://github.com/pop-os/system76-driver"
@@ -45,12 +45,10 @@ optdepends=(
install="$pkgname.install"
source=(
"$pkgname-$pkgver.tar.gz::https://github.com/pop-os/system76-driver/archive/$pkgver.tar.gz"
- 'galu1.patch'
'cli.patch'
'wayland.patch'
'actions.patch')
sha256sums=('4274764bf78836ea07decd82783fc9010fcbc92ff65b35560cdadae34926ba2f'
- '2ccf53ec0ffdeea00930d218253f5b3db2bdc7d3405e8353caabc36107f3ab26'
'ef027346c439561dc01f906ae7bd961100aedf9125fd86bb0eb89a87b683fdc3'
'2ffbd813744c0b99416947a2755767767af434758aa20dcfafefb49fb367d5d3'
'3ade740c1681f8f33ef78e1e6c087e4002d14c888d7a5bf6bfbeb2aa70111119')
@@ -62,9 +60,6 @@ prepare() {
# patch for cli version - enable override vendor/model via /etc/system76-daemon.json
patch --no-backup-if-mismatch -Np1 -i $srcdir/cli.patch
- # galu1 model-specific patch
- patch --no-backup-if-mismatch -Np1 -i $srcdir/galu1.patch
-
# Use xhost for GUI apps on Wayland
patch --no-backup-if-mismatch -Np1 -i $srcdir/wayland.patch
diff --git a/galu1.patch b/galu1.patch
deleted file mode 100644
index 6e82a01bd705..000000000000
--- a/galu1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/system76driver/daemon.py 2014-12-21 15:51:54.899761693 -0500
-+++ b/system76driver/daemon.py 2014-12-21 15:52:43.496397059 -0500
-@@ -58,7 +58,6 @@
- 'bonx7',
- 'bonx8',
- 'daru4',
-- 'galu1',
- 'gazp9',
- 'gazp9b',
- 'kudp1',
---- a/system76driver/model.py 2014-04-21 12:43:25.000000000 -0400
-+++ b/system76driver/model.py 2014-05-03 23:20:20.837535955 -0400
-@@ -85,6 +85,7 @@
- 'K8N-DL': 'wilp2',
- 'KFN5-D SLI': 'wilp3',
- 'DP35DP': 'wilp5',
-+ 'W740SU': 'galu1',
- },
- 'system-product-name': {
- 'MS-1012': 'gazv1',