[packages/blender] - rel 2; rna patch seems not needed

arekm arekm at pld-linux.org
Sat Oct 31 09:34:33 CET 2015


commit 974ce2a287b9ad44c2ee370ca44dadef37b52ed2
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Oct 31 09:34:28 2015 +0100

    - rel 2; rna patch seems not needed

 blender-2.67b-rna.patch | 23 -----------------------
 blender.spec            |  6 ++----
 2 files changed, 2 insertions(+), 27 deletions(-)
---
diff --git a/blender.spec b/blender.spec
index 74f28ea..9cc36bc 100644
--- a/blender.spec
+++ b/blender.spec
@@ -5,7 +5,7 @@ Summary:	3D modeling, rendering, animation and game creation package
 Summary(pl.UTF-8):	Pakiet do tworzenia animacji 3D oraz gier
 Name:		blender
 Version:	2.76
-Release:	1
+Release:	2
 License:	GPL
 Group:		X11/Applications/Graphics
 Source0:	http://download.blender.org/source/%{name}-%{version}.tar.gz
@@ -13,8 +13,7 @@ Source0:	http://download.blender.org/source/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}.manpage
-Patch0:		blender-2.67b-rna.patch
-Patch1:		blender-2.76-droid.patch
+Patch0:		blender-2.76-droid.patch
 URL:		http://www.blender.org/
 BuildRequires:	OpenAL-devel
 BuildRequires:	OpenEXR-devel
@@ -62,7 +61,6 @@ Blender to darmowy i w pełni funkcjonalny pakiet do tworzenia animacji
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 install -d build
diff --git a/blender-2.67b-rna.patch b/blender-2.67b-rna.patch
deleted file mode 100644
index 9915720..0000000
--- a/blender-2.67b-rna.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up blender-2.67b/source/blender/makesrna/intern/rna_access.c.rna blender-2.67b/source/blender/makesrna/intern/rna_access.c
---- blender-2.67b/source/blender/makesrna/intern/rna_access.c.rna	2013-05-16 12:43:18.000000000 +0200
-+++ blender-2.67b/source/blender/makesrna/intern/rna_access.c	2013-06-14 16:35:39.263926932 +0200
-@@ -1273,13 +1273,15 @@ void RNA_property_enum_items_gettexted(b
- 			int totitem = 0;
- 
- 			/* count */
--			for (i = 0; (*item)[i].identifier; i++)
--				totitem++;
-+			if (*item)
-+			  for (i = 0; (*item)[i].identifier; i++)
-+			    totitem++;
- 
- 			nitem = MEM_callocN(sizeof(EnumPropertyItem) * (totitem + 1), "enum_items_gettexted");
- 
--			for (i = 0; (*item)[i].identifier; i++)
--				nitem[i] = (*item)[i];
-+			if (*item)
-+			  for (i = 0; (*item)[i].identifier; i++)
-+			    nitem[i] = (*item)[i];
- 
- 			*free = TRUE;
- 		}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/blender.git/commitdiff/974ce2a287b9ad44c2ee370ca44dadef37b52ed2



More information about the pld-cvs-commit mailing list