diff --git a/graphics/wings/Makefile b/graphics/wings/Makefile index 7b347bbae889..3fd4da3b7dce 100644 --- a/graphics/wings/Makefile +++ b/graphics/wings/Makefile @@ -1,6 +1,6 @@ PORTNAME= wings DISTVERSIONPREFIX= v -DISTVERSION= 2.2.9 +DISTVERSION= 2.3 PORTREVISION= 1 CATEGORIES= graphics DIST_SUBDIR= erlang diff --git a/graphics/wings/distinfo b/graphics/wings/distinfo index 12845c7c049f..6852098eca9a 100644 --- a/graphics/wings/distinfo +++ b/graphics/wings/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1645984710 -SHA256 (erlang/dgud-wings-v2.2.9_GH0.tar.gz) = 413449a6270cfbc24e241d9f44c55383d6bb8c7892dec73c9214527b874bf40b -SIZE (erlang/dgud-wings-v2.2.9_GH0.tar.gz) = 3828073 +TIMESTAMP = 1696766481 +SHA256 (erlang/dgud-wings-v2.3_GH0.tar.gz) = d8d7751a898afa983b017fe9cd6bdc47dc430e0d86125da782344d4cf1be0f1d +SIZE (erlang/dgud-wings-v2.3_GH0.tar.gz) = 3962938 SHA256 (erlang/dgud-libigl-v2.1.0_GH0.tar.gz) = 816ec64b6b2fbabcb1c6353c7df8a2fc1ad5bf4c607b332871a6ab8b29c89dbc SIZE (erlang/dgud-libigl-v2.1.0_GH0.tar.gz) = 976016 diff --git a/graphics/wings/files/patch-src_Makefile b/graphics/wings/files/patch-src_Makefile index 935e225d79b3..0fe6dcd19528 100644 --- a/graphics/wings/files/patch-src_Makefile +++ b/graphics/wings/files/patch-src_Makefile @@ -1,11 +1,13 @@ ---- src/Makefile.orig 2019-04-06 15:47:18 UTC +diff --git src/Makefile src/Makefile +index 234f075e..bf82dafc 100644 +--- src/Makefile +++ src/Makefile -@@ -142,7 +142,7 @@ APP_TARGET = $(EBIN)/$(APP_FILE) +@@ -147,7 +147,7 @@ APP_TARGET = $(EBIN)/$(APP_FILE) # ---------------------------------------------------- # FLAGS # ---------------------------------------------------- --ERL_COMPILE_FLAGS += -Werror -I ../.. -I../_deps $(TYPE_FLAGS) \ -+ERL_COMPILE_FLAGS += -I .. -I../_deps $(TYPE_FLAGS) \ - '-Dwings_version="$(WINGS_VSN)"' -pa $(WINGS_INTL) +-ERL_COMPILE_FLAGS += +nowarn_match_float_zero -Werror -I ../.. -I../_deps $(TYPE_FLAGS) -pa $(WINGS_INTL) ++ERL_COMPILE_FLAGS += +nowarn_match_float_zero -I ../.. -I../_deps -I .. $(TYPE_FLAGS) -pa $(WINGS_INTL) # ---------------------------------------------------- + # Targets diff --git a/graphics/wings/files/patch-src_wings__frame.erl b/graphics/wings/files/patch-src_wings__frame.erl deleted file mode 100644 index 34e7526a7c99..000000000000 --- a/graphics/wings/files/patch-src_wings__frame.erl +++ /dev/null @@ -1,29 +0,0 @@ -commit 94b3a3c6a0cfdcdbd98edce055d5c83ecb361f37 -Author: acxz <17132214+acxz@users.noreply.github.com> -Date: Thu Aug 4 20:10:53 2022 -0400 - - ifndef `wxID_OSX_*` for erlang 25.0 - -diff --git src/wings_frame.erl src/wings_frame.erl -index f6c13c71..3ec6bb83 100644 ---- src/wings_frame.erl -+++ src/wings_frame.erl -@@ -37,10 +37,18 @@ - -define(IS_SPLIT(WinProp), (element(1, WinProp) =:= split - orelse element(1, WinProp) =:= split_rev)). - -+-ifndef(wxID_OSX_HIDE). - -define(wxID_OSX_HIDE, 5250). -+-endif. -+-ifndef(wxID_OSX_HIDEOTHERS). - -define(wxID_OSX_HIDEOTHERS, 5251). -+-endif. -+-ifndef(wxID_OSX_SHOWALL). - -define(wxID_OSX_SHOWALL, 5252). -+-endif. -+-ifndef(wxID_OSX_MENU_LAST). - -define(wxID_OSX_MENU_LAST, 5255). -+-endif. - - %% API %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - diff --git a/graphics/wings/pkg-plist b/graphics/wings/pkg-plist index 9d75308e0f8f..6ef7f180e1dc 100644 --- a/graphics/wings/pkg-plist +++ b/graphics/wings/pkg-plist @@ -96,6 +96,7 @@ lib/erlang/lib/wings/ebin/wings_msg.beam lib/erlang/lib/wings/ebin/wings_obj.beam lib/erlang/lib/wings/ebin/wings_outliner.beam lib/erlang/lib/wings/ebin/wings_palette.beam +lib/erlang/lib/wings/ebin/wings_palette_imports.beam lib/erlang/lib/wings/ebin/wings_pb.beam lib/erlang/lib/wings/ebin/wings_pick.beam lib/erlang/lib/wings/ebin/wings_pick_nif.beam @@ -357,6 +358,8 @@ lib/erlang/lib/wings/plugins/commands/wpc_absolute_scale_pl.lang lib/erlang/lib/wings/plugins/commands/wpc_absolute_scale_pt.lang lib/erlang/lib/wings/plugins/commands/wpc_absolute_scale_tr.lang lib/erlang/lib/wings/plugins/commands/wpc_absolute_scale_zh-tw.lang +lib/erlang/lib/wings/plugins/commands/wpc_align_to_axis.beam +lib/erlang/lib/wings/plugins/commands/wpc_align_to_axis_en.lang lib/erlang/lib/wings/plugins/commands/wpc_ambocc.beam lib/erlang/lib/wings/plugins/commands/wpc_ambocc_de.lang lib/erlang/lib/wings/plugins/commands/wpc_ambocc_en.lang @@ -445,6 +448,8 @@ lib/erlang/lib/wings/plugins/commands/wpc_doosabin_ko.lang lib/erlang/lib/wings/plugins/commands/wpc_doosabin_pl.lang lib/erlang/lib/wings/plugins/commands/wpc_doosabin_tr.lang lib/erlang/lib/wings/plugins/commands/wpc_doosabin_zh-tw.lang +lib/erlang/lib/wings/plugins/commands/wpc_duplicate_radial.beam +lib/erlang/lib/wings/plugins/commands/wpc_duplicate_radial_en.lang lib/erlang/lib/wings/plugins/commands/wpc_explode.beam lib/erlang/lib/wings/plugins/commands/wpc_explode_de.lang lib/erlang/lib/wings/plugins/commands/wpc_explode_en.lang @@ -684,6 +689,7 @@ lib/erlang/lib/wings/plugins/import_export/wpc_kerky_de.lang lib/erlang/lib/wings/plugins/import_export/wpc_kerky_en.lang lib/erlang/lib/wings/plugins/import_export/wpc_kerky_es-ES.lang lib/erlang/lib/wings/plugins/import_export/wpc_lwo.beam +lib/erlang/lib/wings/plugins/import_export/wpc_lwo_en.lang lib/erlang/lib/wings/plugins/import_export/wpc_obj.beam lib/erlang/lib/wings/plugins/import_export/wpc_obj_de.lang lib/erlang/lib/wings/plugins/import_export/wpc_obj_en.lang @@ -726,6 +732,8 @@ lib/erlang/lib/wings/plugins/import_export/wpc_svg_path_en.lang lib/erlang/lib/wings/plugins/import_export/wpc_svg_path_es-ES.lang lib/erlang/lib/wings/plugins/import_export/wpc_svg_path_jp.lang lib/erlang/lib/wings/plugins/import_export/wpc_svg_path_ko.lang +lib/erlang/lib/wings/plugins/import_export/wpc_wmf_paths.beam +lib/erlang/lib/wings/plugins/import_export/wpc_wmf_paths_en.lang lib/erlang/lib/wings/plugins/import_export/wpc_wrl.beam lib/erlang/lib/wings/plugins/import_export/wpc_wrl_de.lang lib/erlang/lib/wings/plugins/import_export/wpc_wrl_en.lang @@ -748,6 +756,11 @@ lib/erlang/lib/wings/plugins/import_export/wpc_yafaray.beam lib/erlang/lib/wings/plugins/import_export/wpc_yafaray_de.lang lib/erlang/lib/wings/plugins/import_export/wpc_yafaray_en.lang lib/erlang/lib/wings/plugins/import_export/wpc_yafaray_es-ES.lang +lib/erlang/lib/wings/plugins/import_export/x3d_import.beam +lib/erlang/lib/wings/plugins/import_export/x3d_import__sgi.beam +lib/erlang/lib/wings/plugins/import_export/x3d_import_en.lang +lib/erlang/lib/wings/plugins/import_export/x_import.beam +lib/erlang/lib/wings/plugins/import_export/x_import_en.lang lib/erlang/lib/wings/plugins/primitives/README lib/erlang/lib/wings/plugins/primitives/wpc_bbox.beam lib/erlang/lib/wings/plugins/primitives/wpc_bbox_de.lang @@ -801,6 +814,8 @@ lib/erlang/lib/wings/plugins/primitives/wpc_ncube_jp.lang lib/erlang/lib/wings/plugins/primitives/wpc_ncube_ko.lang lib/erlang/lib/wings/plugins/primitives/wpc_ncube_tr.lang lib/erlang/lib/wings/plugins/primitives/wpc_ncube_zh-tw.lang +lib/erlang/lib/wings/plugins/primitives/wpc_oblong.beam +lib/erlang/lib/wings/plugins/primitives/wpc_oblong_en.lang lib/erlang/lib/wings/plugins/primitives/wpc_plane.beam lib/erlang/lib/wings/plugins/primitives/wpc_plane_de.lang lib/erlang/lib/wings/plugins/primitives/wpc_plane_en.lang @@ -930,6 +945,7 @@ lib/erlang/lib/wings/src/wings_msg.erl lib/erlang/lib/wings/src/wings_obj.erl lib/erlang/lib/wings/src/wings_outliner.erl lib/erlang/lib/wings/src/wings_palette.erl +lib/erlang/lib/wings/src/wings_palette_imports.erl lib/erlang/lib/wings/src/wings_pb.erl lib/erlang/lib/wings/src/wings_pick.erl lib/erlang/lib/wings/src/wings_pick_nif.erl