[gentoo-commits] repo/gentoo:master commit in: media-sound/soundkonverter/, media-sound/soundkonverter/files/
commit: a41a4f9b1c2b7ebc9dd87ab149af3cf7fcf3e35f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jul 19 09:57:10 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 19 11:14:38 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a41a4f9b media-sound/soundkonverter: Update deps.patch Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/soundkonverter-3.0.0-deps.patch | 11 .../files/soundkonverter-3.0.1-deps.patch | 30 ++ .../soundkonverter/soundkonverter-3.0.1-r2.ebuild | 2 +- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch deleted file mode 100644 index aa5f68af939..000 --- a/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch +++ /dev/null @@ -1,11 +0,0 @@ a/CMakeLists.txt 2017-09-12 23:39:15.648029711 +0200 -+++ b/CMakeLists.txt 2017-09-12 23:44:47.944469934 +0200 -@@ -30,7 +30,7 @@ - include(ECMInstallIcons) - include(FeatureSummary) - --find_package(Qt5 REQUIRED COMPONENTS Network Core Widgets) -+find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml) - find_package(KF5 REQUIRED COMPONENTS I18n XmlGui KIO Solid Config ConfigWidgets WidgetsAddons KDELibs4Support) - find_package(KF5Cddb) - find_package(Phonon4Qt5 REQUIRED) diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch new file mode 100644 index 000..b7009d33125 --- /dev/null +++ b/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch @@ -0,0 +1,30 @@ +From 0eda1978640dda400ca02172abeeacbb725f7b7c Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 19 Jul 2020 11:43:30 +0200 +Subject: [PATCH] Consolidate find_package calls inside CMakeLists.txt + +- Drop unused Qt5Network +- Search for Qt5Xml once instead of in most plugins +- KF5WidgetsAddons and KF5KIO were already being searched for + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 521d0da..7e578f0 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -30,7 +30,7 @@ include(CMakePackageConfigHelpers) + include(ECMInstallIcons) + include(FeatureSummary) + +-find_package(Qt5 REQUIRED COMPONENTS Network Core Widgets) ++find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml) + find_package(KF5 REQUIRED COMPONENTS I18n XmlGui KIO Solid Config ConfigWidgets WidgetsAddons KDELibs4Support) + find_package(KF5Cddb) + find_package(Phonon4Qt5 REQUIRED) +-- +2.27.0 + diff --git a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild index 0beceea2e00..5730b13cb60 100644 --- a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild +++ b/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild @@ -45,7 +45,7 @@ RDEPEND="${DEPEND} " PATCHES=( - "${FILESDIR}/${PN}-3.0.0-deps.patch" + "${FILESDIR}/${P}-deps.patch" # pending upstream "${FILESDIR}/${P}-fix-add-dirs.patch" "${FILESDIR}/${P}-metainfodir.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-sound/soundkonverter/, media-sound/soundkonverter/files/
commit: aa48b7a92d8251e1e9c3a2f6e03b3a6b7ae2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jul 19 10:59:56 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 19 11:15:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa48b7a9 media-sound/soundkonverter: Fix build with ECM >=5.72.0 Closes: https://bugs.gentoo.org/733200 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> .../soundkonverter-3.0.1-kf-5.72-findtaglib.patch | 300 + .../soundkonverter/soundkonverter-3.0.1-r2.ebuild | 1 + 2 files changed, 301 insertions(+) diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch new file mode 100644 index 000..8439e7a83df --- /dev/null +++ b/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch @@ -0,0 +1,300 @@ +From 3760bccb3aa1e15bd5ec67bc977717c55a95bc6e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 19 Jul 2020 12:06:28 +0200 +Subject: [PATCH 1/2] FindTaglib.cmake: Update local copy with ECM 5.72.0 + version and adapt cmake + +ECM 5.72.0 ships an incompatible FindTaglib.cmake module. + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 6 +- + cmake/modules/FindTaglib.cmake | 209 +++-- + 2 files changed, 85 insertions(+), 130 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 521d0da..c9d9bee 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -40,7 +40,7 @@ find_package(Phonon4Qt5 REQUIRED) + find_package(Cdparanoia REQUIRED) + + set(TAGLIB_MIN_VERSION "1.10") +-find_package(Taglib REQUIRED) ++find_package(Taglib ${TAGLIB_MIN_VERSION} REQUIRED) + + + # plugins +@@ -48,7 +48,7 @@ add_subdirectory(plugins) + + + # include directories +-include_directories(${TAGLIB_INCLUDES} ${CDPARANOIA_INCLUDE_DIR}) ++include_directories(${CDPARANOIA_INCLUDE_DIR}) + + + # translation +@@ -120,7 +120,7 @@ set(soundkonverter_SRCS + ) + + add_executable(soundkonverter ${soundkonverter_SRCS}) +-target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 ${TAGLIB_LIBRARIES} ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore) ++target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 Taglib::Taglib ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore) + + install(TARGETS soundkonverter DESTINATION ${BIN_INSTALL_DIR}) + +diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake +index 5a985f9..40c5ca2 100644 +--- a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake +@@ -1,135 +1,90 @@ +-# - Try to find the Taglib library +-# Once done this will define ++#.rst: ++# FindTaglib ++# -- + # +-# TAGLIB_FOUND - system has the taglib library +-# TAGLIB_CFLAGS - the taglib cflags +-# TAGLIB_LIBRARIES - The libraries needed to use taglib +- +-# Copyright (c) 2006, Laurent Montel, ++# Try to find the Taglib library. + # +-# Redistribution and use is allowed according to the terms of the BSD license. +-# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +- +-if(NOT TAGLIB_MIN_VERSION) +- set(TAGLIB_MIN_VERSION "1.6") +-endif(NOT TAGLIB_MIN_VERSION) +- +-if(NOT WIN32) +-find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS +- ${BIN_INSTALL_DIR} +-) +-endif(NOT WIN32) +- +-#reset vars +-set(TAGLIB_LIBRARIES) +-set(TAGLIB_CFLAGS) +- +-# if taglib-config has been found +-if(TAGLIBCONFIG_EXECUTABLE) +- +- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_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 VERSION_LESS "${TAGLIB_MIN_VERSION}") +- +- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) +- +- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) ++# This will define the following variables: ++# ++# ``Taglib_FOUND`` ++# True if the system has the taglib library of at least the minimum ++# version specified by the version parameter to find_package() ++# ``Taglib_INCLUDE_DIRS`` ++# The taglib include dirs for use with target_include_directories ++# ``Taglib_LIBRARIES`` ++# The taglib libraries for use with target_link_libraries() ++# ``Taglib_VERSION`` ++# The version of taglib that was found ++# ++# If ``Taglib_FOUND is TRUE, it will also define the following imported ++# target: ++# ++#
[gentoo-commits] repo/gentoo:master commit in: media-sound/soundkonverter/, media-sound/soundkonverter/files/
commit: 8b1c61a7eef808f23ebbf2cce4809883cd9e7030 Author: Michael Palimaka gentoo org> AuthorDate: Fri Aug 5 16:47:50 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Aug 5 16:51:07 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1c61a7 media-sound/soundkonverter: remove old Package-Manager: portage-2.3.0 media-sound/soundkonverter/Manifest| 2 -- .../files/soundkonverter-2.1.2-taglib-110.patch| 26 --- .../soundkonverter/soundkonverter-2.1.2.ebuild | 38 -- .../soundkonverter/soundkonverter-2.2.0.ebuild | 36 4 files changed, 102 deletions(-) diff --git a/media-sound/soundkonverter/Manifest b/media-sound/soundkonverter/Manifest index 339a146..807b2f5 100644 --- a/media-sound/soundkonverter/Manifest +++ b/media-sound/soundkonverter/Manifest @@ -1,3 +1 @@ -DIST 29024-soundkonverter-2.1.2.tar.gz 756039 SHA256 b7b984cfcebb31c5e16fb3e04fc811b58453ef5454ea9e567e8510fcdd498957 SHA512 fdbb782eea4702d1b6bfe0135ed8ca482bd43422bc4c825b8b1afe3226faf315b618b4392223d5b3169e831c8e867ee64a11f22e22c53df7cb6b92dc5f1dda23 WHIRLPOOL 7f19644aff536d1715935b58f3c5bab27f7b967aadf7503ed26d168ba1fe1a92a76ba4bec28709c23053a46f32b593034e4941c2ec0e054e0eb8a79ad6097da2 -DIST 29024-soundkonverter-2.2.0.tar.gz 781668 SHA256 c3b1bb7d37fe14902364819959c7883fc379e9f4cdb34aada62dbaa83238a980 SHA512 d6e9b4062162adc560cd09b626c4403c83e1cbee940fffb1b7fac0714f8e3b20b4e5be554e4cec576704f2135e62253d25a23098143a1d63c438ad13c7301685 WHIRLPOOL bc503b57d850c7f08302c2f27bee09600018ba7e9907b59cf6f59478d0ec5a2d09746d7d7b34109834aa681f476e33fa0cba28dfc23c05fa6aca26fa78ebdd30 DIST 29024-soundkonverter-2.2.2.tar.gz 858128 SHA256 327de45ea21780d77c53835289e6b6dba196706d76df755fe5dd338761e97663 SHA512 d0539405feb229b6e844b814ae22705f4213acebac688fb6286c0d76c3d4cbea6dfe297448b148c6502be7eb1925fee2a1274ccf8df8d1c7ecb93e36fd7a6f6f WHIRLPOOL 8d4127a274041506c6436dcda128cad86ae0345470debe120c5989ca954b5c3dd4a3133959104ee7154e832830c689a00c598db9e00a1488579b513066dcdec3 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 deleted file mode 100644 index 314db93..000 --- a/media-sound/soundkonverter/files/soundkonverter-2.1.2-taglib-110.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 578ff4a..000 --- a/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -KDE_LINGUAS="ca cs de es et fr hu it pt pt_BR ro ru sl sv zh_CN zh_TW" -inherit kde4-base - -DESCRIPTION="Frontend to various audio converters" -HOMEPAGE="http://www.kde-apps.org/content/show.php/soundKonverter?content=29024; -SRC_URI="http://kde-apps.org/CONTENT/content-files/29024-${P}.tar.gz; - -LICENSE="GPL-2" -SLOT="4" -KEYWORDS="amd64 x86" -IUSE="debug" - -RDEPEND=" - $(add_kdeapps_dep libkcddb) - media-libs/phonon[qt4] - media-libs/taglib - media-sound/cdparanoia -" -DEPEND="${RDEPEND} - sys-devel/gettext -" - -PATCHES=( "${FILESDIR}/${PN}-2.1.2-taglib-110.patch" ) - -pkg_postinst() { - kde4-base_pkg_postinst - - elog "soundKonverter optionally supports many different audio formats." - elog "You will need to install the appropriate encoding packages for the" - elog "formats you require. For a full listing, consult the README file" - elog "in /usr/share/doc/${PF}" -} diff --git
[gentoo-commits] repo/gentoo:master commit in: media-sound/soundkonverter/, media-sound/soundkonverter/files/
commit: ea1b5b6f6ad191d09323d7af38660a6e803e2c58 Author: Michael Palimaka gentoo org> AuthorDate: Tue Jan 19 11:58:09 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Jan 19 11:58:09 2016 + 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 000..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