idella4 15/04/30 16:44:32 Modified: vlc-2.2.0.ebuild vlc-2.2.1.ebuild ChangeLog Log: add patch to address selection of qt4 vs qt5, patch by Karol Herbst, comment 19, bug #541678, tested and endorsed by users and proxy maintainer, limited to versioned ebuilds for now, finally closes said bug (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path 1.11 media-video/vlc/vlc-2.2.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild?r1=1.10&r2=1.11 Index: vlc-2.2.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- vlc-2.2.0.ebuild 24 Apr 2015 05:48:12 -0000 1.10 +++ vlc-2.2.0.ebuild 30 Apr 2015 16:44:32 -0000 1.11 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v 1.10 2015/04/24 05:48:12 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v 1.11 2015/04/30 16:44:32 idella4 Exp $ EAPI="5" @@ -261,6 +261,9 @@ # Bug #541928 epatch "${FILESDIR}"/${P}-fix-xcb.patch + # Bug #541678 + epatch "${FILESDIR}"/qt4-select.patch + # Don't use --started-from-file when not using dbus. if ! use dbus ; then sed -i 's/ --started-from-file//' share/vlc.desktop.in || die 1.5 media-video/vlc/vlc-2.2.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild?r1=1.4&r2=1.5 Index: vlc-2.2.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vlc-2.2.1.ebuild 24 Apr 2015 05:48:12 -0000 1.4 +++ vlc-2.2.1.ebuild 30 Apr 2015 16:44:32 -0000 1.5 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v 1.4 2015/04/24 05:48:12 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v 1.5 2015/04/30 16:44:32 idella4 Exp $ EAPI="5" @@ -264,6 +264,9 @@ # Fix up broken audio when skipping using a fixed reversed bisected commit. epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch + # Bug #541678 + epatch "${FILESDIR}"/qt4-select.patch + # Don't use --started-from-file when not using dbus. if ! use dbus ; then sed -i 's/ --started-from-file//' share/vlc.desktop.in || die 1.954 media-video/vlc/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.954&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.954&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.953&r2=1.954 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v retrieving revision 1.953 retrieving revision 1.954 diff -u -r1.953 -r1.954 --- ChangeLog 24 Apr 2015 05:48:12 -0000 1.953 +++ ChangeLog 30 Apr 2015 16:44:32 -0000 1.954 @@ -1,6 +1,12 @@ # ChangeLog for media-video/vlc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.953 2015/04/24 05:48:12 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.954 2015/04/30 16:44:32 idella4 Exp $ + + 30 Apr 2015; Ian Delaney <idel...@gentoo.org> +files/qt4-select.patch, + vlc-2.2.0.ebuild, vlc-2.2.1.ebuild: + add patch to address selection of qt4 vs qt5, patch by Karol Herbst, comment + 19, bug #541678, tested and endorsed by users and proxy maintainer, limited to + versioned ebuilds for now, finally closes said bug 24 Apr 2015; Ian Delaney <idel...@gentoo.org> vlc-2.2.0.ebuild, vlc-2.2.1.ebuild, vlc-2.2.9999.ebuild, vlc-9999.ebuild:
