mgorny 15/08/06 12:02:36 Modified: ChangeLog Added: wxGTK-3.0.2.0-r2.ebuild wxGTK-2.8.12.1-r2.ebuild Log: Enable multilib support. Backport some build system patches. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/142 by nE0sIghT. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.324 x11-libs/wxGTK/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.324&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.324&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?r1=1.323&r2=1.324 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v retrieving revision 1.323 retrieving revision 1.324 diff -u -r1.323 -r1.324 --- ChangeLog 30 Jul 2015 16:48:54 -0000 1.323 +++ ChangeLog 6 Aug 2015 12:02:36 -0000 1.324 @@ -1,6 +1,16 @@ # ChangeLog for x11-libs/wxGTK # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.323 2015/07/30 16:48:54 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.324 2015/08/06 12:02:36 mgorny Exp $ + +*wxGTK-3.0.2.0-r2 (06 Aug 2015) +*wxGTK-2.8.12.1-r2 (06 Aug 2015) + + 06 Aug 2015; Michał Górny <[email protected]> + +files/wxGTK-2.8.12.1-autoconf.patch, +files/wxGTK-2.8.12.1-bakefile.patch, + +files/wxGTK-2.8.12.1-libdir.patch, +wxGTK-2.8.12.1-r2.ebuild, + +wxGTK-3.0.2.0-r2.ebuild: + Enable multilib support. Backport some build system patches. + https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/142 by nE0sIghT. 30 Jul 2015; Markus Meier <[email protected]> wxGTK-3.0.2.0-r1.ebuild: arm stable, bug #547680 1.1 x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild?rev=1.1&content-type=text/plain Index: wxGTK-3.0.2.0-r2.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild,v 1.1 2015/08/06 12:02:36 mgorny Exp $ EAPI="5" inherit eutils flag-o-matic multilib-minimal DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" HOMEPAGE="http://wxwidgets.org/"; # we use the wxPython tarballs because they include the full wxGTK sources and # docs, and are released more frequently than wxGTK. SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2 doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit" SLOT="3.0" RDEPEND=" dev-libs/expat[${MULTILIB_USEDEP}] sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] ) X? ( >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] media-libs/libpng:0=[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] virtual/jpeg:=[${MULTILIB_USEDEP}] >=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}] x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] x11-libs/libSM[${MULTILIB_USEDEP}] x11-libs/libXxf86vm[${MULTILIB_USEDEP}] x11-libs/pango[X,${MULTILIB_USEDEP}] gstreamer? ( media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] ) libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) webkit? ( net-libs/webkit-gtk:2 ) ) aqua? ( >=x11-libs/gtk+-2.4:2[aqua=,${MULTILIB_USEDEP}] virtual/jpeg:=[${MULTILIB_USEDEP}] tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) )" DEPEND="${RDEPEND} virtual/pkgconfig[${MULTILIB_USEDEP}] opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) X? ( x11-proto/xproto[${MULTILIB_USEDEP}] x11-proto/xineramaproto[${MULTILIB_USEDEP}] x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] )" PDEPEND=">=app-eselect/eselect-wxwidgets-20131230" LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )" S="${WORKDIR}/wxPython-src-${PV}" src_prepare() { epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch epatch_user # https://bugs.gentoo.org/536004 sed \ -e 's:3\.0\.1:3.0.2:g' \ -e 's:^wx_release_number=1$:wx_release_number=2:' \ -i "${S}"/configure || die } multilib_src_configure() { local myconf # X independent options myconf=" --with-zlib=sys --with-expat=sys --enable-compat28 $(use_with sdl)" # debug in >=2.9 # there is no longer separate debug libraries (gtk2ud) # wxDEBUG_LEVEL=1 is the default and we will leave it enabled # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs. # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0. # http://docs.wxwidgets.org/3.0/overview_debugging.html # http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c use debug \ && myconf="${myconf} --enable-debug=max" # wxGTK options # --enable-graphics_ctx - needed for webkit, editra # --without-gnomevfs - bug #203389 use X && \ myconf="${myconf} --enable-graphics_ctx --with-gtkprint --enable-gui --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --without-gnomevfs $(use_enable gstreamer mediactrl) $(multilib_native_use_enable webkit webview) $(use_with libnotify) $(use_with opengl) $(use_with tiff libtiff sys)" use aqua && \ myconf="${myconf} --enable-graphics_ctx --enable-gui --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-mac --with-opengl" # cocoa toolkit seems to be broken # wxBase options if use !X && use !aqua ; then myconf="${myconf} --disable-gui" fi ECONF_SOURCE="${S}" econf ${myconf} } multilib_src_install_all() { cd "${S}"/docs || die dodoc changes.txt readme.txt newdoc base/readme.txt base_readme.txt newdoc gtk/readme.txt gtk_readme.txt if use doc; then dodoc -r "${S}"/docs/doxygen/out/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() { has_version app-eselect/eselect-wxwidgets \ && eselect wxwidgets update } pkg_postrm() { has_version app-eselect/eselect-wxwidgets \ && eselect wxwidgets update } 1.1 x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild?rev=1.1&content-type=text/plain Index: wxGTK-2.8.12.1-r2.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild,v 1.1 2015/08/06 12:02:36 mgorny Exp $ EAPI="5" inherit autotools eutils flag-o-matic versionator multilib-minimal DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" HOMEPAGE="http://wxwidgets.org/"; BASE_PV="$(get_version_component_range 1-3)" BASE_P="${PN}-${BASE_PV}" # we use the wxPython tarballs because they include the full wxGTK sources and # 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" IUSE="+X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff" SLOT="2.8" RDEPEND=" dev-libs/expat[${MULTILIB_USEDEP}] odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] ) X? ( 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[${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:2[aqua=,${MULTILIB_USEDEP}] virtual/jpeg:=[${MULTILIB_USEDEP}] tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) )" DEPEND="${RDEPEND} virtual/pkgconfig[${MULTILIB_USEDEP}] opengl? ( virtual/glu[${MULTILIB_USEDEP}] ) X? ( x11-proto/xproto[${MULTILIB_USEDEP}] x11-proto/xineramaproto[${MULTILIB_USEDEP}] x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] ) " PDEPEND=">=app-eselect/eselect-wxwidgets-0.7" LICENSE="wxWinLL-3 GPL-2 odbc? ( LGPL-2 ) doc? ( wxWinFDL-3 )" S="${WORKDIR}/wxPython-src-${PV}" src_prepare() { epatch "${FILESDIR}"/${PN}-2.8.11-unicode-odbc.patch epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch # Bug #174874 epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch # Bug #310923 # Bug #421851 epatch "${FILESDIR}"/${P}-libdir.patch epatch "${FILESDIR}"/${P}-bakefile.patch epatch "${FILESDIR}"/${P}-autoconf.patch # prefix https://bugs.gentoo.org/394123 sed -i -e "s:/usr:${EPREFIX}/usr:g" \ -e '/SEARCH_INCLUDE="\\/,/"/cSEARCH_INCLUDE="'${EPREFIX}'/usr/include"' \ configure || die epatch_user mv configure.in configure.ac || die eautoconf } multilib_src_configure() { local myconf append-flags -fno-strict-aliasing # X independent options myconf="--enable-compat26 --enable-shared --enable-unicode --with-regex=builtin --with-zlib=sys --with-expat=sys $(use_enable debug) $(use_enable pch precomp-headers) $(use_with odbc odbc sys) $(use_with sdl) $(use_with tiff libtiff sys)" # wxGTK options # --enable-graphics_ctx - needed for webkit, editra # --without-gnomevfs - bug #203389 use X && \ myconf="${myconf} --enable-graphics_ctx --enable-gui --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys $(use_enable gstreamer mediactrl) $(use_enable opengl) $(use_with opengl) $(use_with gnome gnomeprint) --without-gnomevfs" use aqua && \ myconf="${myconf} --enable-graphics_ctx --enable-gui --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-mac --with-opengl" # cocoa toolkit seems to be broken # wxBase options if use !X && use !aqua ; then myconf="${myconf} --disable-gui" fi ECONF_SOURCE="${S}" econf ${myconf} } multilib_src_compile() { emake if [[ -d contrib/src ]]; then cd contrib/src || die emake fi } multilib_src_install() { default if [[ -d contrib/src ]]; then cd contrib/src || die emake DESTDIR="${D}" install fi } multilib_src_install_all() { cd "${S}"/docs || die dodoc changes.txt readme.txt todo30.txt newdoc base/readme.txt base_readme.txt newdoc gtk/readme.txt gtk_readme.txt if use doc; then dodoc -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() { has_version app-eselect/eselect-wxwidgets \ && eselect wxwidgets update } pkg_postrm() { has_version app-eselect/eselect-wxwidgets \ && eselect wxwidgets update }
