diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 8 | ||||
-rw-r--r-- | sphinx-workaround.patch | 13 |
3 files changed, 8 insertions, 19 deletions
@@ -1,7 +1,7 @@ pkgbase = linux-lqx pkgdesc = Linux Liquorix pkgver = 5.8.11.lqx1 - pkgrel = 1 + pkgrel = 2 url = https://liquorix.net/ arch = x86_64 license = GPL2 @@ -13,13 +13,13 @@ pkgbase = linux-lqx source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.sign source = https://github.com/damentz/liquorix-package/archive/5.8-9.tar.gz - source = sphinx-workaround.patch + source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.8/docs-patches/0001-Documentation-Fix-sphinx-3.0-causes-compilation-erro.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha512sums = 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556 sha512sums = SKIP sha512sums = 060665aba92200da13f0a185f3d0c141a1888c7a3351e1ee64f64a879d772a07220a209b59fc241a6bc35d926eb422fe64671eb785cde8769b335cee556f5cf7 - sha512sums = 98e97155f86bbe837d43f27ec1018b5b6fdc6c372d6f7f2a0fe29da117d53979d9f9c262f886850d92002898682781029b80d4ee923633fc068f979e6c8254be + sha512sums = 711ecce2ce54c81e8b60b9b347cb88db054bf697396ee15e9b425671f88d22a14dae17c1c451aa10bd1d7a71c145b2fa588863205ec94e1439ed9b2769ee2e4c pkgname = linux-lqx pkgdesc = The Linux Liquorix kernel and modules @@ -59,7 +59,7 @@ _lqxpatchrel=9 _lqxpatchver=${_lqxpatchname}-${_major}-${_lqxpatchrel} pkgbase=linux-lqx pkgver=5.8.11.lqx1 -pkgrel=1 +pkgrel=2 pkgdesc='Linux Liquorix' url='https://liquorix.net/' arch=(x86_64) @@ -69,11 +69,13 @@ if [ -n "$_htmldocs_enable" ]; then makedepends+=(xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick) fi options=('!strip') +#_lucjanpath="https://raw.githubusercontent.com/sirlucjan/kernel-patches/master/${_major}" +_lucjanpath="https://gitlab.com/sirlucjan/kernel-patches/raw/master/${_major}" source=("https://cdn.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" "https://cdn.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.sign" "https://github.com/damentz/${_lqxpatchname}/archive/${_major}-${_lqxpatchrel}.tar.gz" - 'sphinx-workaround.patch') + "${_lucjanpath}/docs-patches/0001-Documentation-Fix-sphinx-3.0-causes-compilation-erro.patch") validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman @@ -81,7 +83,7 @@ validpgpkeys=( sha512sums=('45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556' 'SKIP' '060665aba92200da13f0a185f3d0c141a1888c7a3351e1ee64f64a879d772a07220a209b59fc241a6bc35d926eb422fe64671eb785cde8769b335cee556f5cf7' - '98e97155f86bbe837d43f27ec1018b5b6fdc6c372d6f7f2a0fe29da117d53979d9f9c262f886850d92002898682781029b80d4ee923633fc068f979e6c8254be') + '711ecce2ce54c81e8b60b9b347cb88db054bf697396ee15e9b425671f88d22a14dae17c1c451aa10bd1d7a71c145b2fa588863205ec94e1439ed9b2769ee2e4c') diff --git a/sphinx-workaround.patch b/sphinx-workaround.patch deleted file mode 100644 index 1aa3f1c8f66e..000000000000 --- a/sphinx-workaround.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/Documentation/conf.py w/Documentation/conf.py -index 3c7bdf4cd31f..9a0ced58a3e9 100644 ---- i/Documentation/conf.py -+++ w/Documentation/conf.py -@@ -36,7 +36,7 @@ needs_sphinx = '1.3' - # Add any Sphinx extension module names here, as strings. They can be - # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom - # ones. --extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', -+extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', - 'kfigure', 'sphinx.ext.ifconfig', 'automarkup', - 'maintainers_include'] - |