diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2016-06-12 10:55:52 +0200 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2016-06-12 10:55:52 +0200 |
| commit | 26c46c964e60fc951fb91ca24db2a3b2f2636fb1 (patch) | |
| tree | 2f047a02605621e920e9f8854cc9e48a5e57ab6c | |
| parent | media-gfx/wings: Fix include_lib (wx) (bug #585654). (diff) | |
| download | gentoo-26c46c964e60fc951fb91ca24db2a3b2f2636fb1.tar.gz gentoo-26c46c964e60fc951fb91ca24db2a3b2f2636fb1.tar.bz2 gentoo-26c46c964e60fc951fb91ca24db2a3b2f2636fb1.zip | |
media-gfx/wings: Fix include_lib everywhere (bug #585654).
Package-Manager: portage-2.3.0_rc1
| -rw-r--r-- | media-gfx/wings/files/wings-2.0.4-wx.patch | 10 | ||||
| -rw-r--r-- | media-gfx/wings/files/wings.sh-r1 | 4 | ||||
| -rw-r--r-- | media-gfx/wings/wings-2.0.4-r1.ebuild (renamed from media-gfx/wings/wings-2.0.4.ebuild) | 19 |
3 files changed, 8 insertions, 25 deletions
diff --git a/media-gfx/wings/files/wings-2.0.4-wx.patch b/media-gfx/wings/files/wings-2.0.4-wx.patch deleted file mode 100644 index a50f3d50ac95..000000000000 --- a/media-gfx/wings/files/wings-2.0.4-wx.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/plugins_src/primitives/wpc_tt.erl -+++ b/plugins_src/primitives/wpc_tt.erl -@@ -21,6 +21,7 @@ - - -include_lib("wings/src/wings.hrl"). - -include_lib("wings/e3d/e3d.hrl"). -+-include_lib("wx/include/wx.hrl"). - - -record(ttfont, - {nglyph, % number of glyphs diff --git a/media-gfx/wings/files/wings.sh-r1 b/media-gfx/wings/files/wings.sh-r1 new file mode 100644 index 000000000000..0816756f4cc8 --- /dev/null +++ b/media-gfx/wings/files/wings.sh-r1 @@ -0,0 +1,4 @@ +#!/bin/bash +ESDL_ROOT="/usr/lib/erlang/lib/esdl" +WINGS_ROOT="/usr/lib/erlang/lib/wings" +exec erl -smp enable -noshell -pa $ESDL_ROOT/ebin $WINGS_ROOT/ebin -run wings_start start_halt diff --git a/media-gfx/wings/wings-2.0.4.ebuild b/media-gfx/wings/wings-2.0.4-r1.ebuild index e295638ad526..a2736e5a5b04 100644 --- a/media-gfx/wings/wings-2.0.4.ebuild +++ b/media-gfx/wings/wings-2.0.4-r1.ebuild @@ -14,27 +14,16 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=" - >=dev-lang/erlang-18.1[wxwidgets] + >=dev-lang/erlang-18.1[smp,wxwidgets] dev-libs/cl media-libs/libsdl[opengl] " DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-2.0.4-wx.patch -) - src_prepare() { - default - sed -i \ - -e '/include_lib/s|wings/|../|' \ - plugins_src/primitives/wpc_knot.erl \ - plugins_src/primitives/wpc_plane.erl \ - plugins_src/primitives/wpc_spiral.erl \ - plugins_src/primitives/wpc_torus.erl \ - plugins_src/wp9_dialogs.erl \ - src/wings_text.erl \ + -e '/include_lib/s|"wings/|"../|' \ + $(find . -name '*'.erl) \ || die eapply_user @@ -64,6 +53,6 @@ src_install() { dosym ${WINGS_PATH} ${ERL_PATH}/${PN} dosym ${ESDL_PATH} ${ERL_PATH}/esdl - newbin "${FILESDIR}"/wings.sh wings + newbin "${FILESDIR}"/wings.sh-r1 wings dodoc AUTHORS README } |