7:54 a.m.
commit bb46d00e26e6554be0ad6a6fa914b85910c546a5
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Fri Aug 29 16:54:48 2014 +0400
Ver. 1.5.3
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
.gitignore | 1 +
sources | 2 +-
...vert-Fix-new-type-specs-requires-OTP-17.0.patch | 102 ++++++++++++++++++++
wings.spec | 13 ++-
4 files changed, 115 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f66ee83..4f22c16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ wings-1.2.tar.bz2
/dgud-wings-9a2473e.tar.gz
/wings-1.5.1.tar.gz
/wings-1.5.2.tar.gz
+/wings-1.5.3.tar.gz
diff --git a/sources b/sources
index f29ff19..79fdc80 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-abf84d377fc3bbe193436766bdb45584 wings-1.5.2.tar.gz
+5ad9b0a3ca9d1ec69a7baac2a80467f6 wings-1.5.3.tar.gz
c01d19b4be79b647b8605dd32753da3a wings3d_manual1.6.1.pdf
diff --git a/wings-0003-Revert-Fix-new-type-specs-requires-OTP-17.0.patch
b/wings-0003-Revert-Fix-new-type-specs-requires-OTP-17.0.patch
new file mode 100644
index 0000000..9e67f58
--- /dev/null
+++ b/wings-0003-Revert-Fix-new-type-specs-requires-OTP-17.0.patch
@@ -0,0 +1,102 @@
+From: Peter Lemenkov <lemenkov(a)gmail.com>
+Date: Fri, 29 Aug 2014 16:38:06 +0400
+Subject: [PATCH] Revert "Fix new type specs requires OTP-17.0"
+
+This reverts commit 0e64eba1de0214edcaa7abda6ea635e8f0c6f1e7.
+
+diff --git a/src/wings.hrl b/src/wings.hrl
+index c7fa9e2..003a0d6 100644
+--- a/src/wings.hrl
++++ b/src/wings.hrl
+@@ -133,16 +133,16 @@
+ %% State and records
+ %% Main state record containing all objects and other important state.
+ -record(st,
+- {shapes=gb_trees:empty() :: gb_trees:tree(),%All visible objects
++ {shapes=gb_trees:empty() :: gb_tree(), %All visible objects
+ selmode=face :: sel_mode(), %Selection mode.
+ sh=false :: boolean(), %Smart highlighting active.
+ sel=[], %Current sel: [{Id,GbSet}]
+- ssels=gb_trees:empty() :: gb_trees:tree(), %Saved selections:
++ ssels=gb_trees:empty() :: gb_tree(), %Saved selections:
+
+ %% Selection only temporary?
+ temp_sel=none :: 'none' | {sel_mode(),boolean()},
+
+- mat=gb_trees:empty() :: gb_trees:tree(),%Defined materials (GbTree).
++ mat=gb_trees:empty() :: gb_tree(), %Defined materials (GbTree).
+ pal=[], %Palette
+ file, %Current filename.
+ saved=false :: 'false' | 'true' | 'auto' | integer(),
+@@ -154,7 +154,7 @@
+
+ edge_loop=none, %Previous edge loop.
+ views={0,{}}, %{Current,TupleOfViews}
+- pst=gb_trees:empty() :: gb_trees:tree(), %Plugin State Info
++ pst=gb_trees:empty() :: gb_tree(), %Plugin State Info
+ % gb_tree where key is plugin module
+
+ %% Previous commands.
+@@ -168,7 +168,7 @@
+
+ %% Undo information.
+ last_cmd=empty_scene, %Last command.
+- undo=queue:new() :: queue:queue(), %Undo (de)queue.
++ undo=queue:new() :: queue(), %Undo (de)queue.
+ next_is_undo=true :: boolean(), %State of undo/redo toggle.
+ undone=[] :: list() %States that were undone.
+ }).
+@@ -185,14 +185,14 @@
+ % The GbSet contains the
+ % object's selection.
+ name="" :: string() | tuple(), %Name. (AutoUV stores other things here.)
+- es=array:new() :: array:array(), %array containing edges
+- lv=none :: 'none' | array:array(), %Left vertex attributes
+- rv=none :: 'none' | array:array(), %Right vertex attributes,
+- fs :: gb_trees:tree(), %Faces
+- he=gb_sets:empty() :: gb_sets:set(), %Hard edges
+- vc :: array:array(), %Connection info (=incident edge)
++ es=array:new() :: array(), %array containing edges
++ lv=none :: 'none' | array(), %Left vertex attributes
++ rv=none :: 'none' | array(), %Right vertex attributes,
++ fs :: gb_tree(), %Faces
++ he=gb_sets:empty() :: gb_set(), %Hard edges
++ vc :: array(), %Connection info (=incident edge)
+ % for vertices.
+- vp=array:new() :: array:array(), %Vertex positions.
++ vp=array:new() :: array(), %Vertex positions.
+ pst=gb_trees:empty(), %Plugin State Info,
+ % gb_tree where key is plugin module
+ mat=default, %Materials.
+diff --git a/src/wings_sel.erl b/src/wings_sel.erl
+index 0038d9e..1fb46de 100644
+--- a/src/wings_sel.erl
++++ b/src/wings_sel.erl
+@@ -122,7 +122,7 @@ mapfold_1(_F, Acc, [], Shs, _St, ShsAcc) ->
+ -type filter_fun() :: fun((visible_face_num() | edge_num() | vertex_num() | 0,
+ #we{}) -> boolean()).
+ -spec make(filter_fun(), sel_mode(), #st{}) ->
+- #st{sel::[{non_neg_integer(),gb_sets:set()}]}.
++ #st{sel::[{non_neg_integer(),gb_set()}]}.
+
+ make(Filter, Mode, #st{shapes=Shapes}=St) when is_function(Filter, 2) ->
+ Sel0 = gb_trees:values(Shapes),
+diff --git a/src/wings_undo.erl b/src/wings_undo.erl
+index 58df968..b6a8d4a 100644
+--- a/src/wings_undo.erl
++++ b/src/wings_undo.erl
+@@ -30,12 +30,12 @@
+
+ %% The essential part of the state record.
+ -record(est,
+- {shapes=[] :: list(#we{}) | gb_trees:tree(),
++ {shapes=[] :: list(#we{}) | gb_tree(),
+ selmode=face :: sel_mode(),
+ sel=[] :: list(),
+ onext=1 :: elem_num(),
+ mat=wings_material:default(),
+- pst=gb_trees:empty() :: gb_trees:tree(),
++ pst=gb_trees:empty() :: gb_tree(),
+
+ %% For the Develop menu.
+ cmd,
diff --git a/wings.spec b/wings.spec
index 6ac36e1..dddb5cd 100644
--- a/wings.spec
+++ b/wings.spec
@@ -11,8 +11,8 @@
Name: wings
-Version: 1.5.2
-Release: 4%{?dist}
+Version: 1.5.3
+Release: 1%{?dist}
Summary: 3D Subdivision Modeler
Group: Applications/Multimedia
@@ -29,6 +29,8 @@ Source4: wings.desktop
Patch1: wings-0001-Don-t-try-to-build-installer.patch
# Fedora/EPEL specific patch
Patch2: wings-0002-Respect-CFLAGS.patch
+# Revert fix for Erlang 17.x.x
+Patch3: wings-0003-Revert-Fix-new-type-specs-requires-OTP-17.0.patch
BuildRequires: erlang
BuildRequires: erlang-cl
BuildRequires: erlang-esdl
@@ -74,6 +76,9 @@ cp %{SOURCE4} .
sed -i -e "s,%LIBDIR%,%{_libdir},g" wings.sh
%patch1 -p1 -b .no_installer
%patch2 -p1 -b .respect_cflags
+%if 0%{?fc19}%{?fc20}
+%patch3 -p1 -b .revert_r17
+%endif
# Add version info
echo %{version} > ./version
@@ -131,6 +136,10 @@ desktop-file-install \
%changelog
+* Fri Aug 29 2014 Peter Lemenkov <lemenkov(a)gmail.com> - 1.5.3-1
+- Ver. 1.5.3
+- Fix building with Erlang 17.x.x
+
* Thu Aug 28 2014 Peter Lemenkov <lemenkov(a)gmail.com> - 1.5.2-4
- Rebuild with Erlang 17.2.1