[Git][archlinux/packaging/packages/blender][main] upgpkg: 17:4.0.1-6: Re-add manpage

[Sven-Hendrik Haase (@svenstaro)]

Sven-Hendrik Haase pushed to branch main at Arch Linux / Packaging / Packages / 
blender


Commits:
7573a587 by Sven-Hendrik Haase at 2023-11-28T14:58:38+01:00
upgpkg: 17:4.0.1-6: Re-add manpage

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = blender
        pkgdesc = A fully integrated 3D graphics creation suite
        pkgver = 4.0.1
-       pkgrel = 5
+       pkgrel = 6
        epoch = 17
        url = https://www.blender.org
        arch = x86_64
@@ -74,14 +74,14 @@ pkgbase = blender
        source = 
git+https://projects.blender.org/blender/blender-addons.git#tag=v4.0.1
        source = 
git+https://projects.blender.org/blender/blender-addons-contrib#tag=v4.0.1
        source = 
https://developer.download.nvidia.com/redist/optix/v7.7/OptiX-7.7-Include.zip
-       source = https://projects.blender.org/blender/blender/pulls/115127.patch
+       source = 
https://projects.blender.org/blender/blender/commit/5486c70aae94196d715c07364292fc108ebf59a8.patch
        source = force-draco1.patch
        source = force-draco2.patch
        sha512sums = SKIP
        sha512sums = SKIP
        sha512sums = SKIP
        sha512sums = 
55caea5beccdc0adebdba8a825f3cfee083015311de5602cfcf215139ccbf9fed62f10ee1dcdf7e31a3557aabbc1fa872eeed67bc46f59fb4e5abd18331c0aca
-       sha512sums = 
ae4aa976f00184ccef735b58734ba13bebafa5ebb64b86d784528c60a4d910065246beca00b0fcf97aed4ce14eeefb29f7be53d76d65df9e122f11a8c1da6818
+       sha512sums = 
375508d1d010b4b043b293cb0c192cb2096aef7ddb0dd1be4a738b20aa720523494cf3054161f1ad116fddc6a9ce03159d6da0a3b3fdb1b57002a477c7c5920a
        sha512sums = 
e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0
        sha512sums = 
c162646eba42ea7112cfb615466c2cbaddac8d254d4a9e91cf887c5bffef1325a983701163223a1fdee091310ac5574a400347aab7f52321825b5fa3d5a9036f
 


=====================================
PKGBUILD
=====================================
@@ -9,7 +9,7 @@
 
 pkgname=blender
 pkgver=4.0.1
-pkgrel=5
+pkgrel=6
 epoch=17
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('x86_64')
@@ -35,14 +35,14 @@ 
source=("git+https://projects.blender.org/blender/blender.git#tag=v$pkgver";
         
"git+https://projects.blender.org/blender/blender-addons.git#tag=v$pkgver";
         
"git+https://projects.blender.org/blender/blender-addons-contrib#tag=v$pkgver";
         
https://developer.download.nvidia.com/redist/optix/v7.7/OptiX-7.7-Include.zip
-        https://projects.blender.org/blender/blender/pulls/115127.patch
+        
https://projects.blender.org/blender/blender/commit/5486c70aae94196d715c07364292fc108ebf59a8.patch
         force-draco1.patch
         force-draco2.patch)
 sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             
'55caea5beccdc0adebdba8a825f3cfee083015311de5602cfcf215139ccbf9fed62f10ee1dcdf7e31a3557aabbc1fa872eeed67bc46f59fb4e5abd18331c0aca'
-            
'ae4aa976f00184ccef735b58734ba13bebafa5ebb64b86d784528c60a4d910065246beca00b0fcf97aed4ce14eeefb29f7be53d76d65df9e122f11a8c1da6818'
+            
'375508d1d010b4b043b293cb0c192cb2096aef7ddb0dd1be4a738b20aa720523494cf3054161f1ad116fddc6a9ce03159d6da0a3b3fdb1b57002a477c7c5920a'
             
'e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0'
             
'c162646eba42ea7112cfb615466c2cbaddac8d254d4a9e91cf887c5bffef1325a983701163223a1fdee091310ac5574a400347aab7f52321825b5fa3d5a9036f')
 
@@ -59,7 +59,8 @@ prepare() {
   # To fix manpage installation
   # 
https://devtalk.blender.org/t/regression-cmake-install-error-for-man-page/32129
   # https://projects.blender.org/blender/blender/pulls/115127
-  patch -Np1 -i "$srcdir"/115127.patch
+  patch -Np1 -i "$srcdir"/5486c70aae94196d715c07364292fc108ebf59a8.patch || 
true
+  # We don't care about the first failed hunk.
 
   # Revert https://projects.blender.org/blender/blender/commit/4b891b4af which 
causes all
   # CMake custom commands to be run in serial instead of in parallel.
@@ -94,7 +95,6 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DWITH_INSTALL_PORTABLE=OFF \
     -DWITH_PYTHON_INSTALL=OFF \
-    -DWITH_DOC_MANPAGE=OFF \
     -DOCLOC_INSTALL_DIR=/usr \
     -DUSD_ROOT_DIR=/usr \
     -DSYCL_OFFLINE_COMPILER_PARALLEL_JOBS=8



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/commit/7573a587e0999783608a9a351794001d06e305ff

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/commit/7573a587e0999783608a9a351794001d06e305ff
You're receiving this email because of your account on gitlab.archlinux.org.