From 3c54b2473c5fb6fe0fc543b15fc4678471922cb1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 21 Jul 2022 08:43:51 +0100 Subject: gentoo auto-resync : 21:07:2022 - 08:43:51 --- media-sound/Manifest.gz | Bin 57093 -> 57090 bytes media-sound/rhythmbox/Manifest | 4 - ...-use-feature.allowed-around-dependency-ch.patch | 169 --------------------- .../files/3.4.5-relax-meson-version-check.patch | 42 ----- media-sound/rhythmbox/rhythmbox-3.4.5.ebuild | 142 ----------------- 5 files changed, 357 deletions(-) delete mode 100644 media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch delete mode 100644 media-sound/rhythmbox/files/3.4.5-relax-meson-version-check.patch delete mode 100644 media-sound/rhythmbox/rhythmbox-3.4.5.ebuild (limited to 'media-sound') diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index 62149dbbfa95..89a2a8017b67 100644 Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest index 708d1bddd751..ae7feeb06804 100644 --- a/media-sound/rhythmbox/Manifest +++ b/media-sound/rhythmbox/Manifest @@ -1,9 +1,5 @@ -AUX 3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch 5817 BLAKE2B 2530b6064799c647955d5f1b08174933137de7e4a4d76afc61091693386a84d70e5a453c3d68d648bed12017574d05f794779418e0ce995a1f5f17dd447156ce SHA512 2219b5f40717970953ce20cd92703c67a8c54461fd544275a3efaca141c2e070706ada82ea966de8a641ce67eca354193368215ea45f2c5a64e381b2347e2d4f -AUX 3.4.5-relax-meson-version-check.patch 1058 BLAKE2B cd8e34536be5bd95ccf040fcac294da2a28d433a0b4f7ceade4723e1993613c1b165b3bd2490adb8cfa59514cefff88ca415ca1dc531eb7afca47db0a2b39471 SHA512 c60a488df140bc587efd57aaa14768ab804d096f154f27c3838b86aabf6c92817cb7e485ad0fec07ec1f8b2b7c2465ff458e77ee16ca7dcb126d9de87de8f8d5 DIST rhythmbox-3.4.4.tar.xz 3890320 BLAKE2B 69c89c0478d6c43e1c4a10d39f25c25c3dc81f9b93f870e0de8947395e0f49d3902cb8dcf74c945da744536090b7058616545ad706626047e0c8fb61b0b792d7 SHA512 1fcd41dd66ffe34852f8cedb80ade57d101118295d6fd6f0a8687000ab6500991d2e11482daedb30a7abaf63e54e33ee3c4eaab73b075ec5e5907182f9a8c865 -DIST rhythmbox-3.4.5.tar.xz 3537764 BLAKE2B fe710816d0c48f5eac6925d5d160f0db060a3369a98afb8b57bd746998e40d413e51e3f5d2631d28eccb5af9a5b71b511f2c42812fbfa88e2cfd46f16338cc78 SHA512 aa9451a5046a99ed4318a45de6e3df069e7646d83e27895608a1e66f664312d0c2b72c8bb9da902eeb1255ab3d2f15956f4891ff51c1ad28f572c9c020dcefb7 DIST rhythmbox-3.4.6.tar.xz 3535224 BLAKE2B 5e24facd810e72296ea541f8131b2ac364de0b38b0fd08a1fe6223a333e619cd08a3959fbbc6fbbd36a39990c7cc871decaefc316ce4910460aa6b446b3cb4c0 SHA512 d48818a6f299b3da8ae78bf13e41d702244d83a473586008b53f9c4cc504495ac2570c520c65efaf9e75408363b0256121d12680940c673d2977c7d177ef1fb3 EBUILD rhythmbox-3.4.4.ebuild 3337 BLAKE2B 75495811cd8c559c630d14d33340c7d67b8d7c9acf0d50ad699fc6b4657fa389c9b39ae131a461f74e7eddce69c2b15117e7aa1bbcc077e653386a33bc312ae6 SHA512 2a489d4f822bed89869886dd41cc0852d5e7aefc017e03a7a31c67ca55663a4eb518d83b3ff4785fdf768cffd4c083b849b923defd9f9a5a37f18881c70cd318 -EBUILD rhythmbox-3.4.5.ebuild 3415 BLAKE2B 319a62ee706e0777afa2848d250514345212da2a2305dd6db68455766f4db92e091c227a009870ec55ea7919691aa12a57bfb620af7b2e73f4f56c5a8010509e SHA512 37cd266bbd929b95e4dc5539c0bddef75934214df0f1af51db273156cbb12d565332357349f365167dc294b6ce7f59fac3d128473111746a1347ee08e968f975 EBUILD rhythmbox-3.4.6.ebuild 3276 BLAKE2B 45dcab9d34dcae836758bbb0078300f5ed942536b3de9ac807f0cbed1225e03668f74c8342317e763c5d88c44efa3f9240cf3b43fdfaaa246c62cd5520df38f3 SHA512 13e22d517bbe635ffeed2b55a3adcd2105244ba1e426df94b119a65b2be49d8ca55a35c14f5359ad8ab2e7119ee82533acd0a9f5767eb9c18b1b8317557f611e MISC metadata.xml 546 BLAKE2B 3f273ab651f53329ae8c493be78977713b4bcf31b35a65d66b523f5b27e11b456b26cddf78ce4ec7b08478fff2fceb875b7e976e9491cb63007744ea93f518ed SHA512 bb4c662bc4728e72ff31d32101da0b67e77e254e3511de9b7cf5bf98bc224f21d6b31e07f3c687c41d66f7abe15109d353402d6db5405086edea1f5518f2436d diff --git a/media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch b/media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch deleted file mode 100644 index 294d2d2ef66f..000000000000 --- a/media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch +++ /dev/null @@ -1,169 +0,0 @@ -From c9dfc5a5899d2628ba1dd6f93f46cf589669bd45 Mon Sep 17 00:00:00 2001 -From: Jonathan Matthew -Date: Tue, 17 May 2022 08:18:21 +1000 -Subject: [PATCH] build: don't use feature.allowed() around dependency checks - -When the feature specified as the 'required' parameter to dependency() -is disabled, it returns an empty dependency object, which is much easier -to deal with than a dependency variable that's only conditionally -defined. - -Fixes: #1972 ---- - meson.build | 94 +++++++++++++++++++++-------------------------------- - 1 file changed, 37 insertions(+), 57 deletions(-) - -diff --git a/meson.build b/meson.build -index 5792b0e49..de265901b 100644 ---- a/meson.build -+++ b/meson.build -@@ -70,71 +70,52 @@ tdb = dependency('tdb', version: '>= 1.2.6', required: true) - totem_plparser = dependency('totem-plparser', version: '>= 3.2.0', required: true) - - use_gudev = false --if get_option('gudev').allowed() -- gudev = dependency('gudev-1.0', version: '>= 143', required: get_option('gudev')) -- if gudev.found() -- use_gudev = true -- cdata.set('HAVE_GUDEV', 1) -- endif -+gudev = dependency('gudev-1.0', version: '>= 143', required: get_option('gudev')) -+if gudev.found() -+ use_gudev = true -+ cdata.set('HAVE_GUDEV', 1) - endif - - use_ipod = false --if get_option('ipod').allowed() -- libgpod = dependency('libgpod-1.0', version: '>= 0.7.92', required: get_option('ipod')) -- if libgpod.found() -- use_ipod = true -- endif -+libgpod = dependency('libgpod-1.0', version: '>= 0.7.92', required: get_option('ipod')) -+if libgpod.found() -+ use_ipod = true - endif - - use_mtp = false --if get_option('mtp').allowed() -- libmtp = dependency('libmtp', version: '>= 0.3.0', required: get_option('mtp')) -- -- if libmtp.found() -- if use_gudev -- use_mtp = true -- elif get_option('mtp').enabled() -- error('MTP explicitly requested but GUdev is not available') -- endif -+libmtp = dependency('libmtp', version: '>= 0.3.0', required: get_option('mtp')) -+if libmtp.found() -+ if use_gudev -+ use_mtp = true -+ elif get_option('mtp').enabled() -+ error('MTP explicitly requested but GUdev is not available') - endif - endif - - use_notify = false --if get_option('libnotify').allowed() -- libnotify = dependency('libnotify', version: '>= 0.7.0', required: get_option('libnotify')) -- -- if libnotify.found() -- use_notify = true -- endif -+libnotify = dependency('libnotify', version: '>= 0.7.0', required: get_option('libnotify')) -+if libnotify.found() -+ use_notify = true - endif - - use_libsecret = false --if get_option('libsecret').allowed() -- libsecret = dependency('libsecret-1', version: '>= 0.18', required: get_option('libsecret')) -- -- if libsecret.found() -- use_libsecret = true -- endif -+libsecret = dependency('libsecret-1', version: '>= 0.18', required: get_option('libsecret')) -+if libsecret.found() -+ use_libsecret = true - endif - cdata.set('PY_LIBSECRET_ENABLED', use_libsecret) - cdata.set('WITH_LIBSECRET', use_libsecret) - - use_lirc = false --if get_option('lirc').allowed() -- lirc = dependency('lirc', required: get_option('lirc')) -- -- if lirc.found() -- use_lirc = true -- endif -+lirc = dependency('lirc', required: get_option('lirc')) -+if lirc.found() -+ use_lirc = true - endif - - have_libbrasero_media = false --if get_option('brasero').allowed() -- brasero_media = dependency('libbrasero-media3', version: '>= 2.31.5', required: get_option('brasero')) -- -- if brasero_media.found() -- have_libbrasero_media = true -- endif -+brasero_media = dependency('libbrasero-media3', version: '>= 2.31.5', required: get_option('brasero')) -+if brasero_media.found() -+ have_libbrasero_media = true - endif - - have_gnu_fwrite_unlocked = false -@@ -189,16 +170,16 @@ cdata.set('PLUGINDATADIR', plugindatadir) - cdata.set('SAMPLEPLUGINDIR', libdir / 'rhythmbox' / 'sample-plugins') - - enable_python = false --if get_option('plugins_python').allowed() -- python = find_program('python3', required: get_option('plugins_python')) -- pygobject = dependency('pygobject-3.0', version: '>= 3.0.0', required: get_option('plugins_python')) -- pyoverridesdir = run_command([python, '-c', '''import gi; print(gi._overridesdir)'''], check: true).stdout().strip() -+python = find_program('python3', required: get_option('plugins_python')) -+pygobject = dependency('pygobject-3.0', version: '>= 3.0.0', required: get_option('plugins_python')) -+pyoverridesdir = run_command([python, '-c', '''import gi; print(gi._overridesdir)'''], check: true).stdout().strip() -+if python.found() and pygobject.found() - enable_python = true - endif - - enable_vala = false --if get_option('plugins_vala').allowed() -- vala_found = add_languages('vala', required: get_option('plugins_vala'), native: false) -+vala_found = add_languages('vala', required: get_option('plugins_vala'), native: false) -+if vala_found - enable_vala = true - vapi_dir = meson.current_source_dir() / 'bindings' / 'vala' - add_project_arguments(['--vapidir', vapi_dir], language: 'vala') -@@ -231,12 +212,9 @@ if get_option('daap').allowed() - endif - - enable_grilo = false --if get_option('grilo').allowed() -- grilo = dependency('grilo-0.3', version: '>= 0.3.1', required: get_option('grilo')) -- -- if grilo.found() -- enable_grilo = true -- endif -+grilo = dependency('grilo-0.3', version: '>= 0.3.1', required: get_option('grilo')) -+if grilo.found() -+ enable_grilo = true - endif - - enable_check = false -@@ -279,7 +257,9 @@ summary({'iPod integration': use_ipod, - 'Python plugin support': enable_python, - 'Vala plugin support': enable_vala, - 'Libsecret keyring support': use_libsecret, -- 'FM radio support': enable_fm_radio,}, -+ 'FM radio support': enable_fm_radio, -+ 'Grilo support': enable_grilo, -+ }, - section: 'Plugins') - - configinc = include_directories('.') --- -2.35.1 - diff --git a/media-sound/rhythmbox/files/3.4.5-relax-meson-version-check.patch b/media-sound/rhythmbox/files/3.4.5-relax-meson-version-check.patch deleted file mode 100644 index 2843a4c0cabc..000000000000 --- a/media-sound/rhythmbox/files/3.4.5-relax-meson-version-check.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://github.com/GNOME/rhythmbox/commit/29a1627f1683aac358103710ffc1a51791951edd -https://bugs.gentoo.org/845006 ---- a/meson.build -+++ b/meson.build -@@ -3,10 +3,6 @@ project('rhythmbox', 'c', - meson_version: '>= 0.59.0', - default_options: ['c_std=gnu89']) - --if meson.version().version_compare('> 0.62.0') -- error('unsupported version of meson, please use 0.62') --endif -- - gnome = import('gnome') - i18n = import('i18n') - pkg = import('pkgconfig') -GitLab -From 0fe3a388fac73a5d4217aed510d65976850734c4 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 4 May 2022 10:23:16 +0200 -Subject: [PATCH 2/2] ci: Install latest meson - ---- a/.gitlab-ci.yml -+++ b/.gitlab-ci.yml -@@ -4,8 +4,6 @@ stages: - - test - - variables: -- MESON_VER: 0.62.0 -- - UBUNTU_DEPS: - build-essential - desktop-file-utils -@@ -64,7 +62,7 @@ before_script: - - export DEBIAN_FRONTEND=noninteractive - - apt-get update - - apt-get install -y $UBUNTU_DEPS -- - pip3 install meson==$MESON_VER -+ - pip3 install meson - - test: - stage: test -GitLab diff --git a/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild deleted file mode 100644 index d9e9ffb13091..000000000000 --- a/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -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" - -IUSE="cdr daap dbus gnome-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} ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" - -DEPEND=" - x11-libs/cairo - >=x11-libs/gdk-pixbuf-2.18:2 - >=dev-libs/glib-2.56.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[gtk] - >=net-libs/libsoup-2.42.0:2.4 - >=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-2.9.19:3.0 - >=media-plugins/gst-plugins-soup-1.4:1.0 - ) - gnome-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-libmms: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[python,${PYTHON_SINGLE_USEDEP}] - net-libs/libsoup:2.4[introspection] - x11-libs/gdk-pixbuf:2[introspection] - x11-libs/gtk+:3[introspection] - x11-libs/pango[introspection] - - dbus? ( sys-apps/dbus ) - gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) - ) - upnp-av? ( - >=media-libs/grilo-0.3:0.3 - >=media-plugins/grilo-plugins-0.3:0.3[upnp-av] - ) -" -BDEPEND=" - gtk-doc? ( dev-util/gtk-doc ) - >=dev-util/intltool-0.35 - dev-util/itstool - virtual/pkgconfig - test? ( dev-libs/check ) -" - -PATCHES=( - "${FILESDIR}/${PV}"-relax-meson-version-check.patch - "${FILESDIR}/${PV}"-build-don-t-use-feature.allowed-around-dependency-ch.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 gnome-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_use 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