summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD4
-rw-r--r--sphinx-workaround.patch19
3 files changed, 27 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 05160636170..142ed214285 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = linux-froidzen
pkgdesc = Linux ZEN with Patches and Modifications
- pkgver = 5.11.zen2
+ pkgver = 5.11.1.zen1
pkgrel = 1
- url = https://github.com/zen-kernel/zen-kernel/commits/v5.11-zen2
+ url = https://github.com/zen-kernel/zen-kernel/commits/v5.11.1-zen1
arch = x86_64
license = GPL2
makedepends = bc
@@ -20,14 +20,16 @@ pkgbase = linux-froidzen
makedepends = imagemagick
makedepends = git
options = !strip
- source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v5.11-zen2
+ source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v5.11.1-zen1
source = config
+ source = sphinx-workaround.patch
source = https://raw.githubusercontent.com/dolohow/uksm/master/v5.x/uksm-5.11.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30
sha256sums = SKIP
sha256sums = ee3627d42ebdcb8208ef906319adaab8f86eb59fc16641026d9bcc8753b2ab8f
+ sha256sums = 52fc0fcd806f34e774e36570b2a739dbdf337f7ff679b1c1139bee54d03301eb
sha256sums = 34f4ae617a2407fed2ba347b663d31f39c1ec9b390e1ea5ea636c91a4cc6f875
pkgname = linux-froidzen
diff --git a/PKGBUILD b/PKGBUILD
index 96365d104fa..34627772c47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: OriginCode <self@origincode.me>
pkgbase=linux-froidzen
-pkgver=5.11.zen2
+pkgver=5.11.1.zen1
pkgrel=1
pkgdesc='Linux ZEN with Patches and Modifications'
_srctag=v${pkgver%.*}-${pkgver##*.}
@@ -18,6 +18,7 @@ _srcname=zen-kernel
source=(
"$_srcname::git+https://github.com/zen-kernel/zen-kernel?signed#tag=$_srctag"
config # the main kernel config file
+ sphinx-workaround.patch # Sphinx 3.5 broke the build again
'https://raw.githubusercontent.com/dolohow/uksm/master/v5.x/uksm-5.11.patch' # UKSM Patch
)
validpgpkeys=(
@@ -27,6 +28,7 @@ validpgpkeys=(
)
sha256sums=('SKIP'
'ee3627d42ebdcb8208ef906319adaab8f86eb59fc16641026d9bcc8753b2ab8f'
+ '52fc0fcd806f34e774e36570b2a739dbdf337f7ff679b1c1139bee54d03301eb'
'34f4ae617a2407fed2ba347b663d31f39c1ec9b390e1ea5ea636c91a4cc6f875')
export KBUILD_BUILD_HOST=archlinux
diff --git a/sphinx-workaround.patch b/sphinx-workaround.patch
new file mode 100644
index 00000000000..a6e2c490029
--- /dev/null
+++ b/sphinx-workaround.patch
@@ -0,0 +1,19 @@
+diff --git i/Documentation/conf.py w/Documentation/conf.py
+index 6a767294887e..d1d145759fed 100644
+--- i/Documentation/conf.py
++++ w/Documentation/conf.py
+@@ -267,11 +267,9 @@ except ImportError:
+
+ html_static_path = ['sphinx-static']
+
+-html_context = {
+- 'css_files': [
+- '_static/theme_overrides.css',
+- ],
+-}
++html_css_files = [
++ '_static/theme_overrides.css',
++]
+
+ # Add any extra paths that contain custom files (such as robots.txt or
+ # .htaccess) here, relative to this directory. These files are copied