commit: ea1b5b6f6ad191d09323d7af38660a6e803e2c58 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Tue Jan 19 11:58:09 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Tue Jan 19 11:58:09 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea1b5b6f
media-sound/soundkonverter: add patch to solve build failure with >=media-libs/taglib-1.10 Gentoo-bug: 572202 Package-Manager: portage-2.2.26 .../files/soundkonverter-2.1.2-taglib-110.patch | 26 ++++++++++++++++++++++ .../soundkonverter/soundkonverter-2.1.2.ebuild | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/media-sound/soundkonverter/files/soundkonverter-2.1.2-taglib-110.patch b/media-sound/soundkonverter/files/soundkonverter-2.1.2-taglib-110.patch new file mode 100644 index 0000000..314db93 --- /dev/null +++ b/media-sound/soundkonverter/files/soundkonverter-2.1.2-taglib-110.patch @@ -0,0 +1,26 @@ +Fix configure with taglib-1.10. + +--- a/cmake/modules/FindTaglib.cmake ++++ b/cmake/modules/FindTaglib.cmake +@@ -29,10 +29,10 @@ + + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) + +- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") ++ if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") + message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") + set(TAGLIB_FOUND FALSE) +- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") ++ else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") + + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) + +@@ -42,7 +42,7 @@ + set(TAGLIB_FOUND TRUE) + endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") +- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") ++ endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") + mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) + + else(TAGLIBCONFIG_EXECUTABLE) diff --git a/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild b/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild index 38f08ef..578ff4a 100644 --- a/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild +++ b/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -26,6 +26,8 @@ DEPEND="${RDEPEND} sys-devel/gettext " +PATCHES=( "${FILESDIR}/${PN}-2.1.2-taglib-110.patch" ) + pkg_postinst() { kde4-base_pkg_postinst