Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 53169 Details for
Bug 84846
x11-libs/wxGTK ebuild rewrite
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for wxGTK-2.5.3.ebuild
wxGTK-2.5.3.patch (text/plain), 5.93 KB, created by
Diego Elio Pettenò (RETIRED)
on 2005-03-11 04:27:30 UTC
(
hide
)
Description:
Patch for wxGTK-2.5.3.ebuild
Filename:
MIME Type:
Creator:
Diego Elio Pettenò (RETIRED)
Created:
2005-03-11 04:27:30 UTC
Size:
5.93 KB
patch
obsolete
>--- /usr/portage/x11-libs/wxGTK/wxGTK-2.5.3.ebuild Sun Jan 16 11:08:31 2005 >+++ wxGTK-2.5.3.ebuild Fri Mar 11 12:13:07 2005 >@@ -11,25 +11,40 @@ > LICENSE="wxWinLL-3" > SLOT="2.5" > KEYWORDS="~x86" >-IUSE="debug no_wxgtk1 gtk2 odbc opengl unicode" >+IUSE="debug no_wxgtk1 gtk gtk2 odbc opengl unicode X png jpeg tiff >+ xpm dmalloc sdl zlib wine motif joystick" > >-RDEPEND="virtual/x11 >+RDEPEND="X? ( virtual/x11 ) > sys-libs/zlib >- media-libs/libpng >- media-libs/jpeg >- media-libs/tiff >+ png? ( media-libs/libpng ) >+ jpeg? ( media-libs/jpeg ) >+ tiff? ( media-libs/tiff ) >+ xpm? ( virtual/x11 ) > !unicode? ( odbc? ( dev-db/unixODBC ) ) > opengl? ( virtual/opengl ) >- gtk2? ( >=x11-libs/gtk+-2.0 >=dev-libs/glib-2.0 ) >- !no_wxgtk1? ( =x11-libs/gtk+-1.2* =dev-libs/glib-1.2* )" >+ gtk? ( >+ gtk2? ( >=x11-libs/gtk+-2.0 >+ >=dev-libs/glib-2.0 ) >+ !no_wxgtk1? ( =x11-libs/gtk+-1.2* >+ =dev-libs/glib-1.2* ) >+ ) >+ dmalloc? ( dev-libs/dmalloc ) >+ sdl? ( media-libs/libsdl ) >+ zlib? ( sys-libs/zlib ) >+ wine? ( app-emulation/wine ) >+ motif? ( virtual/motif )" >+ > DEPEND="${RDEPEND} >- gtk2? ( dev-util/pkgconfig ) >+ gtk? ( gtk2? ( dev-util/pkgconfig ) ) > sys-apps/sed" > > # Note 1: Gettext is not runtime dependency even if nls? because wxWidgets > # has its own implementation of it > # Note 2: PCX support is enabled if the correct libraries are detected. > # There is no USE flag for this. >+# Note 3: This ebuild will install many variants of wxWindows libraries: >+# base version (no gui), base version with unicode, gtk version >+# gtk2 version, gtk2 version with unicode > > pkg_setup() { > einfo "New in >=wxGTK-2.4.2-r2:" >@@ -42,8 +57,8 @@ > einfo "NOTE:" > einfo "You can also get debug versions of any of those, but not debug" > einfo "and normal installed at the same time." >- if use unicode; then >- ! use gtk2 && die "You must put gtk2 in your USE if you need unicode support" >+ if use unicode; then >+ ! use gtk2 && einfo "Unicode support will be built only for base library" > fi > if use no_wxgtk1 && ! use gtk2; then > die "You must have at least gtk2 or -no_wxgtk1 in your USE" >@@ -57,61 +72,102 @@ > export LANG='C' > sed -i "s/-O2//g" configure || die "sed configure failed" > >- myconf="${myconf} `use_with opengl`" >- myconf="${myconf} --with-gtk" >- myconf="${myconf} `use_enable debug`" >+ myconf="${myconf} >+ $(use_with opengl) >+ $(use_with gtk) >+ $(use_enable debug) >+ $(use_with png libpng) >+ $(use_with jpeg libjpeg) >+ $(use_with tiff libtiff) >+ $(use_with xpm libxpm) $(use_enable xpm) >+ $(use_with dmalloc) >+ $(use_with sdl) >+ $(use_with ppc-macos mac) >+ $(use_with motif) >+ $(use_with zlib) >+ $(use_with motif) >+ $(use_enable joystick) >+ --enable-monolithic >+ --prefix=/usr >+ --infodir=/usr/share/info >+ --mandir=/usr/share/man" >+ >+ mkdir build_base >+ einfo "Building base version" >+ cd build_base >+ ../configure ${myconf} --disable-gui \ >+ $(use_with odbc) || die "../configure for base filed" >+ emake || die "make base failed" >+ cd contrib/src >+ emake || die "make contrib base failed" >+ cd ${S} >+ >+ if use unicode; then >+ mkdir build_unicode >+ einfo "Building base unicode version" >+ cd build_unicode >+ ../configure ${myconf} --disable-gui --enable-unicode \ >+ $(use_with odbc) || die "./configure failed" >+ emake || die "make base unicode failed" >+ cd contrib/src >+ emake || die "make base unicode contrib failed" >+ fi >+ cd ${S} > >- if ! use no_wxgtk1 ; then >+ if use gtk && ! use no_wxgtk1 ; then > mkdir build_gtk > einfo "Building gtk version" > cd build_gtk >- ../configure ${myconf} --disable-gtk2 `use_with odbc`\ >- --host=${CHOST} \ >- --prefix=/usr \ >- --infodir=/usr/share/info \ >- --mandir=/usr/share/man || die "./configure failed" >+ ../configure ${myconf} --disable-gtk2 \ >+ $(use_with odbc) || die "./configure failed" > emake || die "make gtk failed" > cd contrib/src > emake || die "make gtk contrib failed" > fi > cd ${S} > >- if use gtk2 ; then >- myconf="${myconf} --enable-gtk2" >- einfo "Building gtk2 version" >+ if use gtk && use gtk2 ; then >+ einfo "Building GTK2 version" > mkdir build_gtk2 > cd build_gtk2 >- ../configure ${myconf} \ >- --host=${CHOST} \ >- --prefix=/usr \ >- --infodir=/usr/share/info \ >- --mandir=/usr/share/man || die "./configure failed" >+ ../configure ${myconf} --enable-gtk2 \ >+ || die "./configure failed" > emake || die "make gtk2 failed" > cd contrib/src > emake || die "make gtk2 contrib failed" > > cd ${S} >+ fi > >- if use unicode ; then >- myconf="${myconf} --enable-unicode" >- einfo "Building unicode version" >- mkdir build_unicode >- cd build_unicode >- ../configure ${myconf} \ >- --host=${CHOST} \ >- --prefix=/usr \ >- --infodir=/usr/share/info \ >- --mandir=/usr/share/man || die "./configure failed" >- >- emake || die "make unicode failed" >- >- cd contrib/src >- emake || die "make unicode contrib failed" >- fi >+ if use gtk && use gtk2 && use unicode ; then >+ myconf="${myconf} --enable-unicode" >+ einfo "Building GTK2 unicode version" >+ mkdir build_unicode >+ cd build_unicode >+ ../configure ${myconf} \ >+ --enable-unicode --enable-gtk2 \ >+ || die "./configure failed" >+ >+ emake || die "make unicode failed" >+ >+ cd contrib/src >+ emake || die "make unicode contrib failed" > fi > } > > src_install() { >+ cd ${S}/build_base >+ einstall || die "install base failed" >+ cd contrib/src >+ einstall || die "install base contrib failed" >+ >+ if [ -e ${S}/build_base_unicode ]; then >+ cd ${S}/build_base_unicode >+ einstall || die "install base unicode failed" >+ cd contrib/src >+ einstall || die "install base unicode contrib failed" >+ fi >+ > if [ -e ${S}/build_gtk ] ; then > cd ${S}/build_gtk > einstall || die "install gtk failed" >@@ -121,9 +177,9 @@ > > if [ -e ${S}/build_unicode ] ; then > cd ${S}/build_unicode >- einstall || die "install unicode failed" >+ einstall || die "install gtk2 unicode failed" > cd contrib/src >- einstall || die "install unicode contrib failed" >+ einstall || die "install gtk2 unicode contrib failed" > fi > > if [ -e ${S}/build_gtk2 ] ; then
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 84846
: 53169 |
53170