From d32e73806b05bac82d0bbdb09b9debdc6f9e327a Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sun, 31 Dec 2017 19:36:04 +0300 Subject: wxGTK-3.0.3 filezilla version bump --- .../filezilla/files/filezilla-3.22.1-debug.patch | 12 ++ net-ftp/filezilla/filezilla-3.29.0.ebuild | 68 +++++++++ net-ftp/filezilla/metadata.xml | 18 +++ x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild | 166 --------------------- x11-libs/wxGTK/wxGTK-3.0.3.1.ebuild | 161 ++++++++++++++++++++ 5 files changed, 259 insertions(+), 166 deletions(-) create mode 100644 net-ftp/filezilla/files/filezilla-3.22.1-debug.patch create mode 100644 net-ftp/filezilla/filezilla-3.29.0.ebuild create mode 100644 net-ftp/filezilla/metadata.xml delete mode 100644 x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild create mode 100644 x11-libs/wxGTK/wxGTK-3.0.3.1.ebuild diff --git a/net-ftp/filezilla/files/filezilla-3.22.1-debug.patch b/net-ftp/filezilla/files/filezilla-3.22.1-debug.patch new file mode 100644 index 0000000..71430db --- /dev/null +++ b/net-ftp/filezilla/files/filezilla-3.22.1-debug.patch @@ -0,0 +1,12 @@ +--- filezilla-3.22.1/configure.ac ++++ filezilla-3.22.1/configure.ac +@@ -36,9 +36,7 @@ + + if test "X$GCC" = Xyes; then + AX_APPEND_FLAG(-Wall, CFLAGS) +- AX_APPEND_FLAG(-g, CFLAGS) + AX_APPEND_FLAG(-Wall, CXXFLAGS) +- AX_APPEND_FLAG(-g, CXXFLAGS) + fi + + # Do this early: Compiler and linker flags to work around a nasty bug in Xcode. diff --git a/net-ftp/filezilla/filezilla-3.29.0.ebuild b/net-ftp/filezilla/filezilla-3.29.0.ebuild new file mode 100644 index 0000000..80c8e19 --- /dev/null +++ b/net-ftp/filezilla/filezilla-3.29.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +WX_GTK_VER="3.0" + +inherit autotools eutils flag-o-matic multilib wxwidgets + +MY_PV=${PV/_/-} +MY_P="FileZilla_${MY_PV}" + +DESCRIPTION="FTP client with lots of useful features and an intuitive interface" +HOMEPAGE="http://filezilla-project.org/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86" +IUSE="dbus nls test" + +# pugixml 1.7 minimal dependency is for c++11 proper configuration +RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1 + >=dev-libs/nettle-3.1:= + >=dev-db/sqlite-3.7 + >=dev-libs/libfilezilla-0.11.1 + >=dev-libs/pugixml-1.7 + net-dns/libidn + >=net-libs/gnutls-3.4.0 + >=x11-libs/wxGTK-3.0.3.0:${WX_GTK_VER}[X] + x11-misc/xdg-utils + dbus? ( sys-apps/dbus )" +DEPEND="${RDEPEND} + virtual/pkgconfig + >=sys-devel/libtool-1.4 + nls? ( >=sys-devel/gettext-0.11 ) + test? ( dev-util/cppunit )" + +S="${WORKDIR}"/${PN}-${MY_PV} + +DOCS=(AUTHORS ChangeLog NEWS ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.22.1-debug.patch +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + if ! test-flag-CXX -std=c++14; then + eerror "${P} requires C++14-capable C++ compiler. Your current compiler" + eerror "does not seem to support -std=c++14 option. Please upgrade your compiler" + eerror "to gcc-4.9 or an equivalent version supporting C++14." + die "Currently active compiler does not support -std=c++14" + fi + fi +} + +src_prepare() { + setup-wxwidgets + default + eautoreconf +} + +src_configure() { + econf $(use_with dbus) $(use_enable nls locales) \ + --with-pugixml=system \ + --disable-autoupdatecheck +} diff --git a/net-ftp/filezilla/metadata.xml b/net-ftp/filezilla/metadata.xml new file mode 100644 index 0000000..13541a4 --- /dev/null +++ b/net-ftp/filezilla/metadata.xml @@ -0,0 +1,18 @@ + + + + + voyageur@gentoo.org + Bernard Cafarelli + + + polynomial-c@gentoo.org + Lars Wendler + + + The native linux ftp/sftp client GUI built on wxGTK + + + filezilla + + diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild deleted file mode 100644 index 802c874..0000000 --- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r4.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit autotools eutils 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~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:0=[${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[${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 ) - ) - aqua? ( - x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}] - virtual/jpeg:0=[${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.x-gxx-abi.patch # relaxed cxx abi check - epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch - epatch "${FILESDIR}"/${P}-webview-fixes.patch - epatch "${FILESDIR}"/${P}-gcc6.patch - epatch_user - - for f in $(find "${S}" -name configure.in); do - mv "${f}" "${f/in/ac}" || die - done - AT_M4DIR="${S}/build/aclocal" eautoreconf - - # 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 - # https://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 -} diff --git a/x11-libs/wxGTK/wxGTK-3.0.3.1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3.1.ebuild new file mode 100644 index 0000000..f1daa60 --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-3.0.3.1.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit autotools eutils 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="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="+X aqua 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:0=[${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[${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 ) + ) + aqua? ( + x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}] + virtual/jpeg:0=[${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 + " + +S="${WORKDIR}/wxWidgets-${PV}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.0.x-gxx-abi.patch # relaxed cxx abi check + epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch +# epatch "${FILESDIR}"/${PN}-3.0.2.0-webview-fixes.patch +# epatch "${FILESDIR}"/${PN}-3.0.2.0-gcc6.patch + epatch_user + + for f in $(find "${S}" -name configure.in); do + mv "${f}" "${f/in/ac}" || die + done + AT_M4DIR="${S}/build/aclocal" eautoreconf + + # 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 + # https://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 + + # 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 +} -- cgit v1.2.3