From 9d4810f84de876ec9d0ae03d0d44224500b41188 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 19 May 2024 00:01:59 +0100 Subject: gentoo auto-resync : 19:05:2024 - 00:01:59 --- media-sound/Manifest.gz | Bin 57589 -> 57594 bytes media-sound/amsynth/Manifest | 2 - media-sound/amsynth/amsynth-1.13.2.ebuild | 64 ------- media-sound/ardour/Manifest | 2 - media-sound/ardour/ardour-8.4.ebuild | 198 --------------------- media-sound/guitarix/Manifest | 2 +- media-sound/guitarix/guitarix-0.46.0.ebuild | 2 +- media-sound/rhythmbox/Manifest | 6 + .../rhythmbox-3.4.7-implicit-declaration.patch | 72 ++++++++ .../files/rhythmbox-3.4.7-libxml-entities.patch | 36 ++++ .../files/rhythmbox-3.4.7-libxml2-2.12.patch | 38 ++++ .../files/rhythmbox-3.4.7-python3.12.patch | 30 ++++ .../files/rhythmbox-3.4.7-skip-broken-test.patch | 24 +++ media-sound/rhythmbox/rhythmbox-3.4.7-r4.ebuild | 143 +++++++++++++++ 14 files changed, 351 insertions(+), 268 deletions(-) delete mode 100644 media-sound/amsynth/amsynth-1.13.2.ebuild delete mode 100644 media-sound/ardour/ardour-8.4.ebuild create mode 100644 media-sound/rhythmbox/files/rhythmbox-3.4.7-implicit-declaration.patch create mode 100644 media-sound/rhythmbox/files/rhythmbox-3.4.7-libxml-entities.patch create mode 100644 media-sound/rhythmbox/files/rhythmbox-3.4.7-libxml2-2.12.patch create mode 100644 media-sound/rhythmbox/files/rhythmbox-3.4.7-python3.12.patch create mode 100644 media-sound/rhythmbox/files/rhythmbox-3.4.7-skip-broken-test.patch create mode 100644 media-sound/rhythmbox/rhythmbox-3.4.7-r4.ebuild (limited to 'media-sound') diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index 947f89ada7c9..ae66618ea38c 100644 Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest index 83c5d7342e8e..06f07299332f 100644 --- a/media-sound/amsynth/Manifest +++ b/media-sound/amsynth/Manifest @@ -1,9 +1,7 @@ AUX amsynth-1.12.2-metadata.patch 522 BLAKE2B 8d49d9323dd7739c90aa456d5e123b3f2303764ae2c3959fc3a4b271e109d56151f3ddf08a21904fbd6aa4e397c96eea88c7735a02004e600d0c07b3a58dd9e1 SHA512 ea35b8ae9d11525b314cd4c89385e24b98c22dec34a042b694a707e9a3bdf8741497c6ede792d9837976cf939795f7e645be23174cddcc5df9b3fb228ef56198 AUX amsynth-1.12.2-x11.patch 1233 BLAKE2B 4df9ab5cfc99ddfbf490a716ae52f13727d4307e4added4ca6916e9fdf31a09b909bdcd437d1076caa3e7c305145e5ab9a2ee1b1747c1c6fb4c506dc37b6fce1 SHA512 03732a90908d9756f9d8517021255860cadc73becec99888fc74d26aa307c2b7e756c265b8e04b356fcf95868d8c125129fcf32820d38131c857e762d2854e10 -DIST amsynth-1.13.2.tar.gz 1621330 BLAKE2B 04f0b81e0a63f4f0bbd6b1dbc92c9ae638a46ad5e5b0bbaaf99cd7cf53761e3a599e6c15f303ea509e53e5aaf8d9040e17e783c8111abdf4fa4837dcd50092d1 SHA512 b93949d3be3c484a27534bd515b12a460aa07d353635b09ecee0e731bf27025b4bf4684e2968cf3a7887c765e1ad80a912fd86582c6f028738fa60df82a40f86 DIST amsynth-1.13.3.tar.gz 1641606 BLAKE2B 65c1bffa46f71f1fe9c89288da700348670575c59738f43f6b712ddb6555770677926fbac508dc11f7e34829bcb46f66cc850a651a2bcbeab3b63555aa4f2abd SHA512 b7d1592d6d4b06fa1d6b3892804433bde617d566044aad82c93d0e75af30ea04d07c3ed98cc9ff24c83efd4b829d109ecc4e7758d0a13127f7e6642ebb74c119 DIST amsynth-1.13.4.tar.gz 1641690 BLAKE2B 7041009e34f3b7b82db89d64e515fd542c1be06328317fdbabca6c3a8aea158e71d9372c83e65235b84cdd6c409d7f83830203418cdb49b195124a64668aceb7 SHA512 94da080036667cc89dd22c04cadc8993fa4ff534b0f009f84d374fa20d391928a3b104287e6c6856edbdb1e5d26daf2c730a73fc08734db8c7eb62c8f35cc129 -EBUILD amsynth-1.13.2.ebuild 1164 BLAKE2B 72e27e77a4a965e5c40348b45b18d5dd6de4f4f7f901cf2c3911169c7076305f867bdebb0f6851598259ea2e1a2d1b6c9263b6ca707ffe53ae8b7a04dca68dbb SHA512 0e5137963330889deeb2b46b886fe0eaa2a678c185272454404b20ec6013c1c381861edad1b5f901127a8f1430e951cdb2a9366a809b7bdc753e800fc89ea348 EBUILD amsynth-1.13.3.ebuild 1164 BLAKE2B 5409a6d4f8930ed38c0f43c3bb9f73c2e95c17f7b6357641f239ebb571e168584e7a6edf4257e35cde94ede7f0f622a0ffec7c0c972d402467143270fcf43044 SHA512 0bd6b09ec7dd5feff266be697bf30e8fa1abde1cbcd5981c794907f244de69690038a4b541db4c6de72bf5a8519db12cf83c91ab34cb72216534147ce04647e6 EBUILD amsynth-1.13.4.ebuild 1166 BLAKE2B 13b3575994ae5214173e4d6366ee4fd7b92f314778052f470bb212286385103cb505487f878e8001b3c5c1ef78ec3a42917ee9e7d46acdff07918764381b3997 SHA512 8ff70b6c11c22ac2a43c4c44eb52e9f152335a66cb7495f67de252d5ea42e913a81eb733682b0547f8072df6df288182c9125402f6e1e50fc177cc641d955302 MISC metadata.xml 581 BLAKE2B 5037cdf24f188f706fc4f413589b4c7c9c48c35bb611f1360f1a1395a2a8a123cca098cb4835ba5a4c8c85187fa6e829c515bc9909e89bf03e7d526236793cdf SHA512 fb63a72d147949e50e286a8aa2a3ecef65c1db90c5453dfb749fd8707a78beac99886ed6ccb1560b0dce48cd6b7212d51193b1af2b323ad2aa6bbc7bd538f965 diff --git a/media-sound/amsynth/amsynth-1.13.2.ebuild b/media-sound/amsynth/amsynth-1.13.2.ebuild deleted file mode 100644 index cfa69f0933f4..000000000000 --- a/media-sound/amsynth/amsynth-1.13.2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit xdg - -DESCRIPTION="Virtual analogue synthesizer" -HOMEPAGE="https://github.com/amsynth/amsynth" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="alsa dssi gtk jack lash lv2 nsm oss vst" - -REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk ) vst? ( gtk )" - -BDEPEND=" - dev-util/intltool - virtual/pkgconfig -" -RDEPEND=" - alsa? ( - media-libs/alsa-lib:= - media-sound/alsa-utils - ) - dssi? ( - media-libs/dssi:= - media-libs/liblo:= - ) - gtk? ( - x11-libs/gtk+:2 - x11-libs/libX11 - ) - jack? ( virtual/jack ) - lash? ( media-sound/lash ) - lv2? ( media-libs/lv2 ) -" -DEPEND="${RDEPEND} - oss? ( virtual/os-headers ) -" - -PATCHES=( - "${FILESDIR}/${PN}-1.12.2-metadata.patch" -) - -src_prepare() { - default - ! use gtk && eapply "${FILESDIR}/${PN}-1.12.2-x11.patch" -} - -src_configure() { - econf \ - $(use_with alsa) \ - $(use_with dssi) \ - $(use_with gtk gui) \ - $(use_with jack) \ - $(use_with lash) \ - $(use_with lv2) \ - $(use_with nsm) \ - $(use_with oss) \ - $(use_with vst) -} diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest index ea88f53e9942..ee4da78d0a3d 100644 --- a/media-sound/ardour/Manifest +++ b/media-sound/ardour/Manifest @@ -1,7 +1,5 @@ AUX ardour-6.8-metadata.patch 568 BLAKE2B 68bb84e5249d67e88e191dbc009b7f2b696d448903a2c7164778f4fda3b526370bd2562fa627faea832da2c115d61fe8ddccf6c54c016a7f68e5cab688868984 SHA512 1bf77b0cf2692e7051a524a049add8f22feb734120d9ae58ffcf06647e8ed28249dcbe2cd124eb2354897f119a2977c6124228fc37c15e476053dc5ea4b5033c -DIST Ardour-8.4.0.tar.bz2 17574218 BLAKE2B a71be1af5577cf3cbded339c2cb25f3124f973bf8966bd663b1c53cdea51e069a61217e844b2ecbf329ddbc54c61e4e4364fc70c9f90cf38871d0ff55e496846 SHA512 838eae28867f1bf108207d171ac60e50d4d7f467a3fd64f95e8c9585d1b2b02ded1af0405c0a363664f9ea3a007143e9ec4e54f36a7df5387b5e12549b804719 DIST Ardour-8.6.0.tar.bz2 17588463 BLAKE2B e8d3b603fecaf453eae9e0c2cac531a5c2d35850b282d27c25dbd22a930a6537fbbff3f1fa58f4dcc525dcc65ef8343172642d16ad473c8b80b0e373364a06cb SHA512 c4a3b6369fe1a1789ba2b5cbcfd23b6ac6b93f819b016aac2c071f1135e32826ca4f5bb99d4c3e4e1d8f91f82719ae17bcf2991eb29072c14e60f282545f934a -EBUILD ardour-8.4.ebuild 5204 BLAKE2B 16e8c0cf203b95da34fe55fa44b9fa83f17cb675ab76b0d6b19325c164f881fb184e54bb4751434613c3f029da7f5cc644fb7676e08d929365b3973a009a4544 SHA512 8fd20142e6bb42cfc047508f3b2d60f4d58ac11d2c724feccc6e97c62bffd2e5e71aca178f59da2709b43d35f5df06c1292b77d25ba4c8a49da7a89508661535 EBUILD ardour-8.6.ebuild 5204 BLAKE2B 16e8c0cf203b95da34fe55fa44b9fa83f17cb675ab76b0d6b19325c164f881fb184e54bb4751434613c3f029da7f5cc644fb7676e08d929365b3973a009a4544 SHA512 8fd20142e6bb42cfc047508f3b2d60f4d58ac11d2c724feccc6e97c62bffd2e5e71aca178f59da2709b43d35f5df06c1292b77d25ba4c8a49da7a89508661535 EBUILD ardour-9999.ebuild 5205 BLAKE2B 190e7e14668d84494daaf11352a9c57b45c0e5c31ec32ba378bfa07fd251417a9465afce95aa1a19e637cf9914e7c2bcb92678816090bd3eae40602918f80323 SHA512 6fbd533981465023be86c6c6b5668638c8f5a058c2c1f603b6353f969c2728cddac4ca1a71f011c5f1d1a060fbe5c423e41efffc6493292ac285dae708031f42 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb diff --git a/media-sound/ardour/ardour-8.4.ebuild b/media-sound/ardour/ardour-8.4.ebuild deleted file mode 100644 index 51d880ba1dae..000000000000 --- a/media-sound/ardour/ardour-8.4.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) -PYTHON_REQ_USE='threads(+)' -PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh" -inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg - -DESCRIPTION="Digital Audio Workstation" -HOMEPAGE="https://ardour.org/" - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git" - inherit git-r3 -else - KEYWORDS="amd64 ~loong ~x86" - SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2" - S="${WORKDIR}/Ardour-${PV}.0" -fi - -LICENSE="GPL-2" -SLOT="8" -IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow" - -RDEPEND=" - dev-cpp/glibmm:2 - dev-cpp/gtkmm:2.4 - dev-libs/boost:= - dev-libs/glib:2 - dev-libs/libsigc++:2 - dev-libs/libxml2:2 - media-libs/alsa-lib - media-libs/aubio - media-libs/flac:= - media-libs/freetype:2 - media-libs/liblo - media-libs/liblrdf - media-libs/libsamplerate - media-libs/libsndfile - media-libs/libsoundtouch - media-libs/raptor:2 - media-libs/rubberband - media-libs/taglib - media-libs/vamp-plugin-sdk - net-libs/libwebsockets - net-misc/curl - sys-libs/readline:0= - sci-libs/fftw:3.0[threads] - virtual/libusb:1 - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/pango - jack? ( virtual/jack ) - pulseaudio? ( media-libs/libpulse ) - media-libs/lilv - media-libs/sratom - dev-libs/sord - media-libs/suil[X,gtk2] - media-libs/lv2" -# !bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle... - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/itstool - sys-devel/gettext - virtual/pkgconfig - doc? ( app-text/doxygen[dot] ) - jack? ( virtual/jack )" - -PATCHES=( - "${FILESDIR}/${PN}-6.8-metadata.patch" -) - -pkg_pretend() { - [[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \ - ewarn "Linking with gold linker might produce broken executable, see bug #733972" -} - -pkg_setup() { - if has_version \>=dev-libs/libsigc++-2.6 ; then - append-cxxflags -std=c++11 - fi - python-any-r1_pkg_setup -} - -src_prepare() { - default - - # delete optimization flags - sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die - - # handle arch - MARCH=$(get-flag march) - OPTFLAGS="" - if use cpu_flags_x86_sse; then - if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then - elog "You enabled sse but use an march that does not support sse!" - elog "We add -msse to the flags now, but please consider switching your march in make.conf!" - fi - OPTFLAGS="sse" - fi - if use cpu_flags_x86_mmx; then - if [[ ${MARCH} == "i486" ]]; then - elog "You enabled mmx with i486 set as march! You have been warned!" - fi - OPTFLAGS="${OPTFLAGS} mmx" - fi - if use cpu_flags_x86_3dnow; then - OPTFLAGS="${OPTFLAGS} 3dnow" - fi - sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \ - -i "${S}"/wscript || die - sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die - - # boost and shebang - append-flags "-lboost_system" - python_fix_shebang "${S}"/wscript - python_fix_shebang "${S}"/waf - - # handle locales - my_lcmsg() { - rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po - } - plocale_for_each_disabled_locale my_lcmsg -} - -src_configure() { - # avoid bug https://bugs.gentoo.org/800067 - local -x AS="$(tc-getCC) -c" - - # -Werror=odr - # https://tracker.ardour.org/view.php?id=9649 - # https://bugs.gentoo.org/917095 - filter-lto - - local backends="alsa,dummy" - use jack && backends+=",jack" - use pulseaudio && backends+=",pulseaudio" - - tc-export CC CXX - local myconf=( - --configdir=/etc - --freedesktop - --noconfirm - --optimize - --with-backends=${backends} - $({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \ - echo '' || echo "--no-fpu-optimization") - $(usex doc "--docs" '') - $(usex nls '' "--no-nls") - $(usex phonehome '' "--no-phone-home") - # not possible right now --use-external-libs - # missing dependency: https://github.com/c4dm/qm-dsp - ) - - waf-utils_src_configure "${myconf[@]}" -} - -src_compile() { - waf-utils_src_compile - use nls && waf-utils_src_compile i18n -} - -src_install() { - local s - - waf-utils_src_install - - mv ${PN}.1 ${PN}${SLOT}.1 || die - doman ${PN}${SLOT}.1 - - for s in 16 22 32 48 256 512; do - newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png - done - - # the build system still installs ardour6.png files so we get rid of those to not conflict with ardour:6 - find "${D}/usr/share/icons/" -name ardour6.png -delete - - sed -i \ - -e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \ - -e 's/;AudioEditing;/;X-AudioEditing;/' \ - build/gtk2_ardour/ardour${SLOT}.desktop || die - domenu build/gtk2_ardour/ardour${SLOT}.desktop - - insinto /usr/share/mime/packages - newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml - rm "${D}/usr/share/mime/packages/ardour.xml" || die -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "Please do _not_ report problems with the package to ${PN} upstream." - elog "If you think you've found a bug, check the upstream binary package" - elog "before you report anything to upstream." -} diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest index 98e1d37d2e42..5ba962fa6278 100644 --- a/media-sound/guitarix/Manifest +++ b/media-sound/guitarix/Manifest @@ -4,6 +4,6 @@ AUX guitarix-0.46.0-nostrip.patch 1064 BLAKE2B 3f44dcd75d2d7f90c8d5b430b3d1b1d9d DIST guitarix2-0.45.0.tar.xz 75575216 BLAKE2B dfe65b3cdab6cf30c808b65d4d9280617d5b9b9d0227bb6b60b68ac52e64fb34903fdfb3084ebf790630b60a54cfd1f0b170b209b8dfb5c0f23f1d8084e3c342 SHA512 be894076f5b016cb8feb243294e8277f893f7e7054c91353f1a82e9b41ef1bc8c97714c4b6cf9765ee6ab1cff91d02f3a0abe525985922dcde788011a88b9cf4 DIST guitarix2-0.46.0.tar.xz 77670776 BLAKE2B b650d53f4e73539419bbe194e07ee770494f80b547d407f5a269c035b91fbf3e0fe078a9e82da21f773d69395523f70fc179be7942f08e2b8689b220414c9925 SHA512 cdb8eccdd230bade493cf0b7fd2a6e748fcaf3c3fd6b5ed5fbd6134d08be9518c93400625d63e386b436fcef3e1738cae543256b09941445436d7f2bf41649a0 EBUILD guitarix-0.45.0.ebuild 1959 BLAKE2B 1010ac5aed8e8178a559ea184ea1850496ed6a7e90c9e36921f2c602c7a5fc42acb4ad21ded65b6c9cc451abeaba12a79ab10d9c0c61a04db84ed8af6e83c901 SHA512 c953e63774a45e52c6483a0b49087f67f151b92c6b19e88d35cbb84dfcc8762b29a298a443884c091ba043265f6bda99c8948baf23c9494fd96a822ef2b4d39c -EBUILD guitarix-0.46.0.ebuild 1902 BLAKE2B 842f4c44c718b0881b37d5f5d0d552e10967eacec98695fa88edbde42a7044bc6886c0049bb800bc7e5bdeef589de8f7e87a2477bd9e32416b041b2db73406fb SHA512 9dcbc31e4790b4208a6bb4553867134c6c4c32e9062b86e2bf40e414cbc76c75b77611ad6a644150b5056267e556dcda4b1ae07f8631700faeba14c4ba6b8eba +EBUILD guitarix-0.46.0.ebuild 1901 BLAKE2B 5c671200748f0bfe5b5e89bfbc5a6dc186ff39e4bd4c8e5a162a6a79e627bd026d94fb49e18cc66c825440100377f85987104ac35017eb6ae94aa62d062f785e SHA512 c5619a9d45c234bb7a28f41a5106df08b5ff7914d3c8c752d00513fd702a60dddf8bb573a225de72d7f57e125237f030040557e494d32cd14c409efac33a7996 EBUILD guitarix-9999.ebuild 1950 BLAKE2B 64757e3d79c108eb8527a694ffa3f7ce17053859f6b7a520c75f5bd615ed809ce359c47ff6b36793134f94b0d2fd800e9e05a2a01393200223eda861d47e3772 SHA512 2fa5d8b501f080fb670b9a3d73c016539a39810427c78cc6c283d9fc9e3d9a7f6659e519cdb49eba889d6018d5252c68278ef9dc9ce9f1696fb938b1cfb74cfd MISC metadata.xml 785 BLAKE2B 6336ddc95e9ef9c46a0e16b963abc12b4fd9fd2048712fbc041901f7c4940c18d010df3dd23092717a4635522bec8486ca18e4d1728c4cfd12fffaf0fe591c83 SHA512 4ec6c6198959646bb85147109a1d9c9af6f1ed296486f4d573524733a06434832daa817964c8e3c28db0ec317b6991840ca3232ee64473cd73aca16803a9b573 diff --git a/media-sound/guitarix/guitarix-0.46.0.ebuild b/media-sound/guitarix/guitarix-0.46.0.ebuild index bd63bf337a24..7d5de843f0ad 100644 --- a/media-sound/guitarix/guitarix-0.46.0.ebuild +++ b/media-sound/guitarix/guitarix-0.46.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/brummer10/${PN}/releases/download/V${PV}/guitarix2-$ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf" REQUIRED_USE="|| ( lv2 standalone )" diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest index 660286230070..07ca7adad1ab 100644 --- a/media-sound/rhythmbox/Manifest +++ b/media-sound/rhythmbox/Manifest @@ -1,3 +1,9 @@ +AUX rhythmbox-3.4.7-implicit-declaration.patch 2027 BLAKE2B f9d2d9e5e95eec92d2bffc49724efbdec46b3fef3fad1e98c0166d4232b421c958eb51210d3e85abc45aada49b09a295fcee094582e184de369af24c06891329 SHA512 480e5ce1cbbe7332cef282ee5dfd8cb710dfeb7fa34571a4f832dae2d07c994b0879af9afa0208e6ab7eabec53ec000d47d6d2c4f305066a684a475ad5322c10 +AUX rhythmbox-3.4.7-libxml-entities.patch 1028 BLAKE2B b5d6280e2233180887c8f74efa94f711ac5b2e007f8d9110e6c010dd5a4bf93fbce58e3ad466cf1ace0894d86f9222e24f1544410b1e4e47df8113db3e642731 SHA512 9bd2c67d1eedf070d7d1ab8ab988ae476914bac0d92d04083d95fe1038c82b21211c85fb651fe49d77a72d788e61e5d0248ac3f02795694ec853a231a011a72c +AUX rhythmbox-3.4.7-libxml2-2.12.patch 1735 BLAKE2B 42a6205404600150e32473fe7898de166e99ee3d5f7cb858c718565d3fce5529f4c8f08e4856743b80da460c3ea1772c084237b9daa6651654705e76eb121bd4 SHA512 2e4f87f72ff9eab6cf3f53fedc4bcba5e1eb0c6ba65016e24b6cc64bdc822815c7451c9edc749a3bab4a33ece601f1419efed08679c790e6724c4abb6a03f247 +AUX rhythmbox-3.4.7-python3.12.patch 914 BLAKE2B 40dffbd00dcef96911c35e1910a8c854a674b7f8472048a3c799fd1cad600f0a9d0b1c57094bcecfdb7aaafbc6d023b29e0031221f4d3a5d07bca98b274b3771 SHA512 c6bf6b5f4c23b18dd82e3b9abfb9e81f2f89e52f367d753032169d38ef19dd3f2be059c336191496457b048646f0596cd654da23516f7923236c29cb1b2678dd +AUX rhythmbox-3.4.7-skip-broken-test.patch 1038 BLAKE2B 3a9ac9e9303560f6c4525eab16842433e4aac1ba526b6ae7d8a59e3ac14eddd83d030891ac5fc5e18efe9227a22a97f28647fddddd2ec693c383e3e30cc273df SHA512 5d99757992c951f74e1dae8ef6859892d0fca5959c196b781586fde1ef83adf962a05d11240fa7b53c27d12474f203a3410cdb283a4d8974669579df1b37da09 DIST rhythmbox-3.4.7.tar.xz 3673444 BLAKE2B a9186d7c23f281ff0a0d4a2188061473e9bab39078f816051e385319afeb1a8825e124e608fc50422f1bd27adae569d75fb6c53af23c7d51086dcf01b962d652 SHA512 58de6e51d046920857ba0905043f4863ef443d5eca28cdf93c1a25e3053322664eb1f894c102d5629f8261c507626e215c097ee166f13a3e7cd82fb35c891cb4 EBUILD rhythmbox-3.4.7-r3.ebuild 3182 BLAKE2B 4fd4553673787c42f8d868cd928922dfc19a28f7ba8056dd42932afa4e64c5bee17f7dd076cedd77b3bedd67d53711e637405bd4d896b806f3cdddbffe943ed8 SHA512 87e0d92b4702e0eb6dbe5cc8c080799234671f7c8836fa8faf00a3a881486dd07ef891dbf1482511a1530423f470973c8d40193732e889b315e8adcaf7c85c0b +EBUILD rhythmbox-3.4.7-r4.ebuild 3405 BLAKE2B 9a163a5fe87856c5e310271fdcee0852ea99d147a6e12d90313728909e1a1508e1f395d5ddb92df403b8f0a3e88d84c66a79c400b828049821dde8493299f26f SHA512 8d026caaa024131a07bdb11a648e41c8c554a0dcf1963d17062a876dfc71c2c0a2f5317d41185001ed6501b7c369ddffb7441f41e951dc51661308079f3619e4 MISC metadata.xml 644 BLAKE2B 634d49a8c604a388d4dd50e52ce3d6730b5202e4b67a4ce103fe47e48de2311339905231d2426e9a8bb84a13ea047c9337169562d04c909f9e954e443927fb23 SHA512 9019047907c04b18d2c94eb2c3d5aef1f2adba2be503537cc1538a26b5b61fa882c898a4efbce3fd799c633bed3e6359fef073c0b597093673fce15768386991 diff --git a/media-sound/rhythmbox/files/rhythmbox-3.4.7-implicit-declaration.patch b/media-sound/rhythmbox/files/rhythmbox-3.4.7-implicit-declaration.patch new file mode 100644 index 000000000000..2595561ad779 --- /dev/null +++ b/media-sound/rhythmbox/files/rhythmbox-3.4.7-implicit-declaration.patch @@ -0,0 +1,72 @@ +From 10369b9a6b896dc79d7ae715fe67bf3b4c581c22 Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Tue, 9 May 2023 15:48:56 -0400 +Subject: [PATCH] build: Define _GNU_SOURCE for pthread_getname_np + +With clang-16, implicit function definitions are treated as errors. As a +result, the check for pthread_getname_np fails because +pthread_getname_np is only provided under _GNU_SOURCE (see +pthread_getname_np(3)) + +> Checking if "pthread_getname_np" : links: NO + +The compilation failure is + +> error: implicit declaration of function 'pthread_getname_np' [-Werror,-Wimplicit-function-declaration] + +The inclusion of pthread.h lib/rb-debug.c must be moved above the system +headers because they may include pthread.h themselves (and in practice +unistd.h does). If that change is not done, lib/rb-debug.c will fail to +compile for the same reason as the configure test. + +Note that to test this, one must disable prctl() detection. + +Bug: https://bugs.gentoo.org/898926 +--- + lib/rb-debug.c | 11 ++++++----- + meson.build | 1 + + 2 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/lib/rb-debug.c b/lib/rb-debug.c +index a5b4ccac6..b9e0ec81d 100644 +--- a/lib/rb-debug.c ++++ b/lib/rb-debug.c +@@ -30,17 +30,18 @@ + + #include "config.h" + ++#if defined(HAVE_PRCTL) ++#include ++#elif defined(HAVE_PTHREAD_GETNAME_NP) ++#define _GNU_SOURCE ++#include ++#endif + #include + #include + #include + #include + #include + #include +-#if defined(HAVE_PRCTL) +-#include +-#elif defined(HAVE_PTHREAD_GETNAME_NP) +-#include +-#endif + + #include + +diff --git a/meson.build b/meson.build +index 681e084e8..bbe014246 100644 +--- a/meson.build ++++ b/meson.build +@@ -110,6 +110,7 @@ have_prctl = cc.has_function('prctl', prefix: '#include ') + cdata.set('HAVE_PRCTL', have_prctl) + + have_pthread_getname_np = cc.links(''' ++ #define _GNU_SOURCE + #include + int main() { + char nm[17]; +-- +GitLab + diff --git a/media-sound/rhythmbox/files/rhythmbox-3.4.7-libxml-entities.patch b/media-sound/rhythmbox/files/rhythmbox-3.4.7-libxml-entities.patch new file mode 100644 index 000000000000..b542224d2fbe --- /dev/null +++ b/media-sound/rhythmbox/files/rhythmbox-3.4.7-libxml-entities.patch @@ -0,0 +1,36 @@ +From: =?utf-8?q?J=C3=BCrg_Billeter?= +Date: Tue, 28 Nov 2023 20:12:07 +0100 +Subject: Add missing include + +(cherry picked from commit 4a906b33535c794f45d3bbc816f3b56a729529b4) + +Origin: upstream, after 3.4.7 +--- + rhythmdb/rhythmdb-query.c | 1 + + sources/rb-static-playlist-source.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/rhythmdb/rhythmdb-query.c b/rhythmdb/rhythmdb-query.c +index 0d1c24c..0009dde 100644 +--- a/rhythmdb/rhythmdb-query.c ++++ b/rhythmdb/rhythmdb-query.c +@@ -30,6 +30,7 @@ + + #include + ++#include + #include + #include + #include +diff --git a/sources/rb-static-playlist-source.c b/sources/rb-static-playlist-source.c +index 4c60f70..9d8606a 100644 +--- a/sources/rb-static-playlist-source.c ++++ b/sources/rb-static-playlist-source.c +@@ -46,6 +46,7 @@ + + #include + ++#include + #include + #include + #include diff --git a/media-sound/rhythmbox/files/rhythmbox-3.4.7-libxml2-2.12.patch b/media-sound/rhythmbox/files/rhythmbox-3.4.7-libxml2-2.12.patch new file mode 100644 index 000000000000..7d95cb439d57 --- /dev/null +++ b/media-sound/rhythmbox/files/rhythmbox-3.4.7-libxml2-2.12.patch @@ -0,0 +1,38 @@ +From: =?utf-8?q?J=C3=BCrg_Billeter?= +Date: Tue, 28 Nov 2023 20:04:17 +0100 +Subject: playlist-manager: Fix crash with libxml2 2.12 +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +The missing include resulted in an implicit function declaration, which +may result in a segmentation fault on startup. + + ../shell/rb-playlist-manager.c: In function ‘rb_playlist_manager_load_playlists’: + ../shell/rb-playlist-manager.c:374:23: warning: implicit declaration of function ‘xmlParseMemory’ [-Wimplicit-function-declaration] + 374 | doc = xmlParseMemory (g_bytes_get_data (data, NULL), g_bytes_get_size (data)); + | ^~~~~~~~~~~~~~ + ../shell/rb-playlist-manager.c:374:23: warning: nested extern declaration of ‘xmlParseMemory’ [-Wnested-externs] + ../shell/rb-playlist-manager.c:374:21: warning: assignment to ‘xmlDocPtr’ {aka ‘struct _xmlDoc *’} from ‘int’ makes pointer from integer without a cast [-Wint-conversion] + 374 | doc = xmlParseMemory (g_bytes_get_data (data, NULL), g_bytes_get_size (data)); + | ^ + +(cherry picked from commit 66da2f843e84bfa85870a4ace4054aa91ea07951) + +Origin: upstream, after 3.4.7 +--- + shell/rb-playlist-manager.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/shell/rb-playlist-manager.c b/shell/rb-playlist-manager.c +index 4974c9f..e0a54c6 100644 +--- a/shell/rb-playlist-manager.c ++++ b/shell/rb-playlist-manager.c +@@ -41,6 +41,7 @@ + #include /* rename() */ + #include /* unlink() */ + ++#include + #include + #include + #include diff --git a/media-sound/rhythmbox/files/rhythmbox-3.4.7-python3.12.patch b/media-sound/rhythmbox/files/rhythmbox-3.4.7-python3.12.patch new file mode 100644 index 000000000000..fb38b66c89d4 --- /dev/null +++ b/media-sound/rhythmbox/files/rhythmbox-3.4.7-python3.12.patch @@ -0,0 +1,30 @@ +From: Jonathan Matthew +Date: Mon, 4 Dec 2023 08:15:19 +1000 +Subject: artsearch: fix regex strings so python 3.12 stops complaining + +(cherry picked from commit ceeed5736c3e25d33fec5a100afde20ef485e07e) + +Origin: upstream, after 3.4.7 +--- + plugins/artsearch/lastfm.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/plugins/artsearch/lastfm.py b/plugins/artsearch/lastfm.py +index 0409105..82d5eeb 100644 +--- a/plugins/artsearch/lastfm.py ++++ b/plugins/artsearch/lastfm.py +@@ -49,10 +49,10 @@ API_URL = 'https://ws.audioscrobbler.com/2.0/' + # LASTFM_TOOLTIP = (LASTFM_LOGO, _("Image provided by Last.fm")) + + DISC_NUMBER_REGEXS = ( +- "\(disc *[0-9]+\)", +- "\(cd *[0-9]+\)", +- "\[disc *[0-9]+\]", +- "\[cd *[0-9]+\]", ++ "\\(disc *[0-9]+\\)", ++ "\\(cd *[0-9]+\\)", ++ "\\[disc *[0-9]+\\]", ++ "\\[cd *[0-9]+\\]", + " - disc *[0-9]+$", + " - cd *[0-9]+$", + " disc *[0-9]+$", diff --git a/media-sound/rhythmbox/files/rhythmbox-3.4.7-skip-broken-test.patch b/media-sound/rhythmbox/files/rhythmbox-3.4.7-skip-broken-test.patch new file mode 100644 index 000000000000..6cfccb262f7c --- /dev/null +++ b/media-sound/rhythmbox/files/rhythmbox-3.4.7-skip-broken-test.patch @@ -0,0 +1,24 @@ +From: Jeremy Bicha +Date: Thu, 23 Jun 2022 10:12:20 -0400 +Subject: tests: Skip load_query_multiple + +This test fails on arm64 only + +https://gitlab.gnome.org/GNOME/rhythmbox/-/issues/1993 +--- + tests/test-widgets.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test-widgets.c b/tests/test-widgets.c +index 0f725ed..60b194d 100644 +--- a/tests/test-widgets.c ++++ b/tests/test-widgets.c +@@ -291,7 +291,7 @@ rb_query_creator_suite (void) + tcase_add_checked_fixture (tc_qls, test_rhythmdb_setup, test_rhythmdb_shutdown); + tcase_add_test (tc_qls, test_query_creator_load_query_empty); + tcase_add_test (tc_qls, test_query_creator_load_query_simple); +- tcase_add_test (tc_qls, test_query_creator_load_query_multiple); ++ /* tcase_add_test (tc_qls, test_query_creator_load_query_multiple); */ + tcase_add_test (tc_qls, test_query_creator_load_query_disjunction); + tcase_add_test (tc_qls, test_query_creator_load_limit_count); + tcase_add_test (tc_qls, test_query_creator_load_limit_minutes); diff --git a/media-sound/rhythmbox/rhythmbox-3.4.7-r4.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.7-r4.ebuild new file mode 100644 index 000000000000..429b5babe57c --- /dev/null +++ b/media-sound/rhythmbox/rhythmbox-3.4.7-r4.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" + +inherit gnome.org gnome2-utils python-single-r1 meson virtualx xdg + +DESCRIPTION="Music management and playback software for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox" + +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + +IUSE="cdr daap dbus keyring gtk-doc ipod libnotify lirc mtp +python test +udev upnp-av" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + ipod? ( udev ) + mtp? ( udev ) + dbus? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +DEPEND=" + x11-libs/cairo + >=x11-libs/gdk-pixbuf-2.18:2 + >=dev-libs/glib-2.66.0:2 + >=dev-libs/gobject-introspection-0.10:= + >=media-libs/gstreamer-1.4.0:1.0[introspection] + >=media-libs/gst-plugins-base-1.4.0:1.0[introspection] + >=x11-libs/gtk+-3.20.0:3[introspection] + dev-libs/json-glib + >=dev-libs/libpeas-0.7.3:0[gtk] + >=net-libs/libsoup-3.0.7:3.0 + >=dev-libs/libxml2-2.7.8:2 + x11-libs/pango + >=sys-libs/tdb-1.2.6 + >=dev-libs/totem-pl-parser-3.2:= + + cdr? ( >=app-cdr/brasero-2.91.90 ) + daap? ( + >=net-libs/libdmapsharing-3.9.11:4.0= + >=media-plugins/gst-plugins-soup-1.4:1.0 + ) + keyring? ( >=app-crypt/libsecret-0.18 ) + libnotify? ( >=x11-libs/libnotify-0.7.0 ) + lirc? ( app-misc/lirc ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}] + ') + ) + udev? ( + dev-libs/libgudev:= + ipod? ( >=media-libs/libgpod-0.7.92[udev] ) + mtp? ( >=media-libs/libmtp-0.3 ) + ) +" +RDEPEND="${DEPEND} + media-plugins/gst-plugins-soup:1.0 + || ( + media-plugins/gst-plugins-cdparanoia:1.0 + media-plugins/gst-plugins-cdio:1.0 + ) + media-plugins/gst-plugins-meta:1.0 + media-plugins/gst-plugins-taglib:1.0 + x11-themes/adwaita-icon-theme + python? ( + >=dev-libs/libpeas-0.7.3:0[python,${PYTHON_SINGLE_USEDEP}] + net-libs/libsoup:3.0[introspection] + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/gtk+:3[introspection] + x11-libs/pango[introspection] + + dbus? ( sys-apps/dbus ) + keyring? ( >=app-crypt/libsecret-0.18[introspection] ) + ) + upnp-av? ( + >=media-libs/grilo-0.3.15-r1:0.3 + >=media-plugins/grilo-plugins-0.3.16:0.3[upnp-av] + ) +" +BDEPEND=" + gtk-doc? ( dev-util/gtk-doc ) + dev-util/itstool + virtual/pkgconfig + test? ( dev-libs/check ) +" + +PATCHES=( + "${FILESDIR}"/${P}-implicit-declaration.patch + "${FILESDIR}"/${P}-libxml2-2.12.patch + "${FILESDIR}"/${P}-libxml-entities.patch + "${FILESDIR}"/${P}-python3.12.patch + "${FILESDIR}"/${P}-skip-broken-test.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + $(meson_feature cdr brasero) + $(meson_feature daap) + -Dfm_radio=enabled + $(meson_feature upnp-av grilo) + $(meson_feature udev gudev) + $(meson_feature ipod) + $(meson_feature libnotify) + $(meson_feature keyring libsecret) + $(meson_feature lirc) + $(meson_feature mtp) + $(meson_feature python plugins_python) + -Dplugins_vala=disabled + -Dsample-plugins=false + + -Dhelp=true + $(meson_use gtk-doc gtk_doc) + $(meson_feature test tests) + ) + meson_src_configure +} + +src_test() { + unset SESSION_MANAGER + "${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die + GSETTINGS_SCHEMA_DIR="${S}/data" virtx meson_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} -- cgit v1.2.3