diff options
| author | bartus | 2021-07-04 13:18:21 +0200 |
|---|---|---|
| committer | bartus | 2021-07-04 13:18:21 +0200 |
| commit | 527e6cc6c96a10ab70b795e7aeefc745a3c1986c (patch) | |
| tree | 5d4cc471e8d337cc77884409e30eee97c3b4b5e9 | |
| parent | ba148765b0437ca695e1913b173d29746e55421b (diff) | |
| download | aur-527e6cc6c96a10ab70b795e7aeefc745a3c1986c.tar.gz | |
Drop upstream applied patch
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | sphinx_351.patch | 20 |
3 files changed, 2 insertions, 30 deletions
@@ -34,7 +34,6 @@ pkgbase = mitsuba2-git source = git+https://github.com/mitsuba-renderer/tinyformat.git source = git+https://github.com/mitsuba-renderer/mitsuba-data.git source = git+https://github.com/mitsuba-renderer/openexr.git - source = sphinx_351.patch md5sums = e40fe4bf313d60b1eb7c3da60fb6d434 md5sums = 617bd32eecbebd8c7036f738b8275e5f md5sums = 3d896789646b5de546668d9f158697d1 @@ -45,7 +44,5 @@ pkgbase = mitsuba2-git md5sums = SKIP md5sums = SKIP md5sums = SKIP - md5sums = 24fbc6bf556cfc5a67a759abfec3c8c7 pkgname = mitsuba2-git - @@ -21,8 +21,7 @@ source=('swap_pybind.patch' 'git+https://github.com/mitsuba-renderer/enoki.git' 'git+https://github.com/mitsuba-renderer/tinyformat.git' 'git+https://github.com/mitsuba-renderer/mitsuba-data.git' - 'git+https://github.com/mitsuba-renderer/openexr.git' - 'sphinx_351.patch') + 'git+https://github.com/mitsuba-renderer/openexr.git') md5sums=('e40fe4bf313d60b1eb7c3da60fb6d434' '617bd32eecbebd8c7036f738b8275e5f' '3d896789646b5de546668d9f158697d1' @@ -32,8 +31,7 @@ md5sums=('e40fe4bf313d60b1eb7c3da60fb6d434' 'SKIP' 'SKIP' 'SKIP' - 'SKIP' - '24fbc6bf556cfc5a67a759abfec3c8c7') + 'SKIP') pkgver() { git -C "$srcdir/${pkgname%-git}" describe --long --tags --always | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' @@ -70,9 +68,6 @@ prepare() { | jq '.["enabled"] = ["scalar_rgb"]' \ | jq '.["default"] = "scalar_rgb"' \ > "$srcdir/${pkgname%-git}"/mitsuba.conf - - # fix sphinx:3.5.1 build - git apply -v "$srcdir"/sphinx_351.patch } build() { diff --git a/sphinx_351.patch b/sphinx_351.patch deleted file mode 100644 index 547808a9ae6b..000000000000 --- a/sphinx_351.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/docs/conf.py b/docs/conf.py -index d55711a2..fe409f71 100644 ---- a/docs/conf.py -+++ b/docs/conf.py -@@ -164,6 +164,9 @@ todo_include_todos = True - - extensions.append('sphinxcontrib.bibtex') - -+# Add bibfile -+bibtex_bibfiles = ['references.bib'] -+ - # Touch the bibliography file to force a rebuild of it - Path('zz_bibliography.rst').touch() - -@@ -370,4 +373,4 @@ def custom_step(app): - def setup(app): - # Texinfo - app.connect("builder-inited", custom_step) -- app.add_stylesheet('theme_overrides.css') -+ app.add_css_file('theme_overrides.css') |