From b2317a0dc6ecf44488e4f44bbf29cdf038ef0f0d Mon Sep 17 00:00:00 2001
From: Jonathon Fernyhough <jonathon@m2x.dev>
Date: Sat, 18 Dec 2021 23:58:15 +0000
Subject: [PATCH] Remove 30-nvidia-ignoreabi.conf

---
 .SRCINFO                 | 2 --
 30-nvidia-ignoreabi.conf | 3 ---
 PKGBUILD                 | 5 -----
 3 files changed, 10 deletions(-)
 delete mode 100644 30-nvidia-ignoreabi.conf

diff --git a/.SRCINFO b/.SRCINFO
index 44030e4fee746..248d140b33457 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,13 +8,11 @@ pkgbase = nvidia-390xx-utils
 	source = nvidia-drm-outputclass.conf
 	source = nvidia-390xx-utils.sysusers
 	source = nvidia-390xx.rules
-	source = 30-nvidia-ignoreabi.conf
 	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/390.147/NVIDIA-Linux-x86_64-390.147.run
 	source = kernel-4.16.patch
 	b2sums = 8e24aea70b139185bd682b080d32aeda673e6e92b45a90e6f6e0d736674180400bc8bd1aa5c66b8d033fc9d5e0cfffed456a87298bd93a3afbbc30b8dc48c4e9
 	b2sums = c1da4ce5784e43385465913a95053a3e54f800aac6f1b49f33e2a77504d76da5e6db6ec7074fbe7ba5f52dcef9e1ebaa620942c33ff825a56caba5c9c8b0d1be
 	b2sums = 67e32932eeddda8fef667d25c34faf7b3a02f01cf9c15a97e5613bd44a0e8dcf7396e25399a52701f55dd18054c689720f237bb07d5bd580394d8dc8c9d05534
-	b2sums = 9fde74e26f7e249e9492cbae1c9932ef472625ccf14110130317872c41bb5149be6fe167c7bcccc51f6b1afbbd0b3c6afddd49fbc5f2278968a77d62b351d16f
 	b2sums = a8085c9abc1c31251788a8f5abdc2090c9085b3028e364184244bbf24d822dc3266877c88b30f403507fa2dd511c68ec67e1f188d6b0f1f4d7d792881d5253fc
 	b2sums = a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05
 
diff --git a/30-nvidia-ignoreabi.conf b/30-nvidia-ignoreabi.conf
deleted file mode 100644
index c384b4750aba5..0000000000000
--- a/30-nvidia-ignoreabi.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-Section "ServerFlags"
-	Option "IgnoreABI" "true"
-EndSection
diff --git a/PKGBUILD b/PKGBUILD
index bcc2818fd2d94..230fb302928cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,13 +16,11 @@ _pkg="NVIDIA-Linux-x86_64-${pkgver}"
 source=('nvidia-drm-outputclass.conf'
         'nvidia-390xx-utils.sysusers'
         'nvidia-390xx.rules'
-        '30-nvidia-ignoreabi.conf'
         "https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
         kernel-4.16.patch)
 b2sums=('8e24aea70b139185bd682b080d32aeda673e6e92b45a90e6f6e0d736674180400bc8bd1aa5c66b8d033fc9d5e0cfffed456a87298bd93a3afbbc30b8dc48c4e9'
         'c1da4ce5784e43385465913a95053a3e54f800aac6f1b49f33e2a77504d76da5e6db6ec7074fbe7ba5f52dcef9e1ebaa620942c33ff825a56caba5c9c8b0d1be'
         '67e32932eeddda8fef667d25c34faf7b3a02f01cf9c15a97e5613bd44a0e8dcf7396e25399a52701f55dd18054c689720f237bb07d5bd580394d8dc8c9d05534'
-        '9fde74e26f7e249e9492cbae1c9932ef472625ccf14110130317872c41bb5149be6fe167c7bcccc51f6b1afbbd0b3c6afddd49fbc5f2278968a77d62b351d16f'
         'a8085c9abc1c31251788a8f5abdc2090c9085b3028e364184244bbf24d822dc3266877c88b30f403507fa2dd511c68ec67e1f188d6b0f1f4d7d792881d5253fc'
         'a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05')
 
@@ -107,9 +105,6 @@ package_nvidia-390xx-utils() {
     replaces=('nvidia-390xx-libgl')
     install="${pkgname}.install"
 
-    # Exceedingly hacky workaround for Xorg 1.21 until Nvidia updates the driver
-    install -D -m644 30-nvidia-ignoreabi.conf "${pkgdir}/etc/X11/xorg.conf.d/30-nvidia-ignoreabi.conf"
-
     cd "${_pkg}"
 
     # Check http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/README/installedcomponents.html