Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 379886 Details for
Bug 510708
x11-libs/wxGTK - add multilib support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch against wxGTK-2.8.12.1-r1.ebuild
wxGTK-2.8-multilib.patch (text/plain), 3.94 KB, created by
nE0sIghT
on 2014-06-29 07:56:51 UTC
(
hide
)
Description:
Patch against wxGTK-2.8.12.1-r1.ebuild
Filename:
MIME Type:
Creator:
nE0sIghT
Created:
2014-06-29 07:56:51 UTC
Size:
3.94 KB
patch
obsolete
>--- ../../../../../portage/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild 2014-05-23 12:31:37.000000000 +0400 >+++ ./wxGTK-2.8.12.1-r2.ebuild 2014-06-29 11:49:35.320770981 +0400 >@@ -4,7 +4,7 @@ > > EAPI="5" > >-inherit eutils flag-o-matic multilib versionator >+inherit eutils flag-o-matic versionator multilib-minimal > > DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" > HOMEPAGE="http://wxwidgets.org/" >@@ -16,46 +16,47 @@ > # docs, and are released more frequently than wxGTK. > SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2" > >-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" >+KEYWORDS="~amd64 ~x86" > IUSE="+X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff" > > SLOT="2.8" > > RDEPEND=" >- dev-libs/expat >- odbc? ( dev-db/unixODBC ) >- sdl? ( media-libs/libsdl ) >+ dev-libs/expat[${MULTILIB_USEDEP}] >+ odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) >+ sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] ) > X? ( >- dev-libs/glib:2 >- media-libs/libpng:0= >- sys-libs/zlib >- virtual/jpeg >- x11-libs/gtk+:2 >- x11-libs/libSM >- x11-libs/libXinerama >- x11-libs/libXxf86vm >- x11-libs/pango[X] >- gnome? ( gnome-base/libgnomeprintui:2.2 ) >+ dev-libs/glib:2[${MULTILIB_USEDEP}] >+ media-libs/libpng:0=[${MULTILIB_USEDEP}] >+ sys-libs/zlib[${MULTILIB_USEDEP}] >+ virtual/jpeg[${MULTILIB_USEDEP}] >+ x11-libs/gtk+:2[${MULTILIB_USEDEP}] >+ x11-libs/libSM[${MULTILIB_USEDEP}] >+ x11-libs/libXinerama[${MULTILIB_USEDEP}] >+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}] >+ x11-libs/pango[X,${MULTILIB_USEDEP}] >+ gnome? ( gnome-base/libgnomeprintui:2.2[${MULTILIB_USEDEP}] ) > gstreamer? ( >- gnome-base/gconf:2 >- media-libs/gstreamer:0.10 >- media-libs/gst-plugins-base:0.10 ) >- opengl? ( virtual/opengl ) >- tiff? ( media-libs/tiff:0 ) >+ gnome-base/gconf:2[${MULTILIB_USEDEP}] >+ media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] >+ media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] >+ ) >+ opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) >+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) > ) > aqua? ( >- >=x11-libs/gtk+-2.4[aqua=] >- virtual/jpeg >- tiff? ( media-libs/tiff:0 ) >+ >=x11-libs/gtk+-2.4[${MULTILIB_USEDEP},aqua=] >+ virtual/jpeg[${MULTILIB_USEDEP}] >+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) > )" > > DEPEND="${RDEPEND} >- virtual/pkgconfig >- opengl? ( virtual/glu ) >+ virtual/pkgconfig[${MULTILIB_USEDEP}] >+ opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) > X? ( >- x11-proto/xproto >- x11-proto/xineramaproto >- x11-proto/xf86vidmodeproto >+ x11-proto/xproto[${MULTILIB_USEDEP}] >+ x11-proto/xineramaproto[${MULTILIB_USEDEP}] >+ x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] > )" > > PDEPEND=">=app-admin/eselect-wxwidgets-0.7" >@@ -84,7 +85,7 @@ > epatch_user > } > >-src_configure() { >+multilib_src_configure() { > local myconf > > append-flags -fno-strict-aliasing >@@ -135,15 +136,10 @@ > --disable-gui" > fi > >- mkdir "${S}"/wxgtk_build >- cd "${S}"/wxgtk_build >- > ECONF_SOURCE="${S}" econf ${myconf} > } > >-src_compile() { >- cd "${S}"/wxgtk_build >- >+multilib_src_compile() { > emake > > if [[ -d contrib/src ]]; then >@@ -152,16 +148,22 @@ > fi > } > >-src_install() { >- cd "${S}"/wxgtk_build >- >- emake DESTDIR="${D}" install >+multilib_src_install() { >+ default > > if [[ -d contrib/src ]]; then > cd contrib/src > emake DESTDIR="${D}" install > fi > >+ if multilib_is_native_abi; then >+ # Stray windows locale file, causes collisions >+ local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" >+ [[ -e ${wxmsw} ]] && rm "${wxmsw}" >+ fi >+} >+ >+multilib_src_install_all() { > cd "${S}"/docs > dodoc changes.txt readme.txt todo30.txt > newdoc base/readme.txt base_readme.txt >@@ -170,10 +172,6 @@ > if use doc; then > dohtml -r "${S}"/docs/html/* > fi >- >- # Stray windows locale file, causes collisions >- local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" >- [[ -e ${wxmsw} ]] && rm "${wxmsw}" > } > > pkg_postinst() {
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 510708
:
379886
|
383964
|
386192
|
397324
|
397326
|
400036
|
400038
|
400068
|
400096
|
400286
|
403150
|
403768
|
403770