From 0c8f2437d596b13d5bbdf1eda9a1b9d3ea8dc2f7 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Fri, 19 Apr 2024 17:54:15 -0700 Subject: [PATCH] rhythmbox: update to 3.4.7. --- .../rhythmbox/patches/fix-missing-icons.patch | 74 ------------------- srcpkgs/rhythmbox/template | 38 +++------- 2 files changed, 11 insertions(+), 101 deletions(-) delete mode 100644 srcpkgs/rhythmbox/patches/fix-missing-icons.patch diff --git a/srcpkgs/rhythmbox/patches/fix-missing-icons.patch b/srcpkgs/rhythmbox/patches/fix-missing-icons.patch deleted file mode 100644 index 21cb1cf248d926..00000000000000 --- a/srcpkgs/rhythmbox/patches/fix-missing-icons.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 829ba7f6807f6da409fe266e8d027654ae1c179b Mon Sep 17 00:00:00 2001 -From: crvi -Date: Thu, 20 Feb 2020 18:36:23 +0530 -Subject: [PATCH 1/2] update app icon name - -Fixes: #1775 ---- - lib/rb-stock-icons.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git lib/rb-stock-icons.c lib/rb-stock-icons.c -index cf52c7a38..cbc221a7d 100644 ---- a/lib/rb-stock-icons.c -+++ b/lib/rb-stock-icons.c -@@ -37,7 +37,7 @@ - #include "rb-file-helpers.h" - #include "rb-stock-icons.h" - --const char RB_APP_ICON[] = "rhythmbox"; -+const char RB_APP_ICON[] = "org.gnome.Rhythmbox"; - const char RB_STOCK_SET_STAR[] = "rhythmbox-set-star"; - const char RB_STOCK_UNSET_STAR[] = "rhythmbox-unset-star"; - const char RB_STOCK_NO_STAR[] = "rhythmbox-no-star"; --- -2.24.1 - - -From b2c73c7efe28eefb89388bfe3dd0bc55a91a0bf4 Mon Sep 17 00:00:00 2001 -From: crvi -Date: Thu, 20 Feb 2020 18:39:23 +0530 -Subject: [PATCH 2/2] use RB_APP_ICON instead of hardcoding icon names - ---- - shell/main.c | 3 ++- - shell/rb-application.c | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git shell/main.c shell/main.c -index 5060f6545..7170f29d5 100644 ---- a/shell/main.c -+++ b/shell/main.c -@@ -45,6 +45,7 @@ - #include "rb-util.h" - #include "rb-debug.h" - #include "rb-application.h" -+#include "rb-stock-icons.h" - - int - main (int argc, char **argv) -@@ -76,7 +77,7 @@ main (int argc, char **argv) - #endif - - g_set_application_name (_("Rhythmbox")); -- gtk_window_set_default_icon_name ("rhythmbox"); -+ gtk_window_set_default_icon_name (RB_APP_ICON); - - #if defined(USE_UNINSTALLED_DIRS) - g_irepository_prepend_search_path (SHARE_UNINSTALLED_BUILDDIR "/../bindings/gi"); -diff --git shell/rb-application.c shell/rb-application.c -index 37afb36fb..8492bb03b 100644 ---- a/shell/rb-application.c -+++ b/shell/rb-application.c -@@ -205,7 +205,7 @@ about_action_cb (GSimpleAction *action, GVariant *parameters, gpointer user_data - "authors", (const char **) authors, - "documenters", (const char **) documenters, - "translator-credits", strcmp (translator_credits, "translator-credits") != 0 ? translator_credits : NULL, -- "logo-icon-name", "rhythmbox", -+ "logo-icon-name", RB_APP_ICON, - NULL); - g_string_free (comment, TRUE); - g_free (license_trans); --- -2.24.1 - diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template index 4a2508c722921d..f18c138010cccc 100644 --- a/srcpkgs/rhythmbox/template +++ b/srcpkgs/rhythmbox/template @@ -1,27 +1,25 @@ # Template file for 'rhythmbox' pkgname=rhythmbox -version=3.4.4 -revision=7 -build_style=gnu-configure +version=3.4.7 +revision=1 +build_style=meson build_helper=gir -configure_args="--disable-static --with-gudev --without-hal - $(vopt_if gir --enable-vala) - ac_cv_strftime_supports_E_O=yes" -hostmakedepends="pkg-config intltool itstool glib-devel python3-setuptools - $(vopt_if gir 'gobject-introspection vala')" -makedepends="gtk+3-devel libsoup-gnome-devel totem-pl-parser-devel +configure_args="-Dgudev=enabled $(vopt_feature gir plugins_vala)" +hostmakedepends="pkg-config gettext itstool glib-devel + gtk-update-icon-cache desktop-file-utils $(vopt_if gir 'gobject-introspection vala')" +makedepends="gtk+3-devel libsoup3-devel totem-pl-parser-devel json-glib-devel libgudev-devel libdiscid-devel vala-devel libmtp-devel avahi-glib-libs-devel libpeas-devel $(vopt_if brasero brasero-devel) libnotify-devel tdb-devel libsecret-devel libSM-devel grilo-devel gst-plugins-base1-devel clutter-gtk-devel python3-devel python3-gobject-devel libdmapsharing-devel" -depends="gir-freedesktop desktop-file-utils hicolor-icon-theme" +depends="desktop-file-utils hicolor-icon-theme" short_desc="GNOME integrated music management application" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.rhythmbox.org" -distfiles="${GNOME_SITE}/${pkgname}/${version::3}/${pkgname}-${version}.tar.xz" -checksum=ee0eb0d7d7bdf696ac9471b19ff3bea3240d63b6cb8a134bf632054af8665d90 +distfiles="${GNOME_SITE}/rhythmbox/${version::3}/rhythmbox-${version}.tar.xz" +checksum=2f6d56c13fc1a64c534f500788fb482936ce547b343ed90c67de1f2bce0cfa7e python_version=3 pycompile_dirs="/usr/lib/rhythmbox/plugins /usr/lib/rhythmbox/sample-plugins" @@ -30,26 +28,13 @@ build_options="gir brasero" desc_option_brasero="Enable CD burning support" build_options_default="gir" -post_extract() { - # The py-compile helper uses the imp module, removed in Python 3.12; - # besides, we don't want the module pre-compiled anyway, so just drop it - : > py-compile - cat > py-compile <<-'EOF' - #!/bin/sh - : "$@" - EOF -} - -pre_build() { - export GIR_EXTRA_LIBS_PATH="$wrksrc/shell/.libs" -} - librhythmbox_package() { short_desc+=" - shared library" pkg_install() { vmove "usr/lib/*.so.*" } } + rhythmbox-devel_package() { depends="gtk+3-devel librhythmbox-${version}_${revision}" short_desc+=" - development files" @@ -59,7 +44,6 @@ rhythmbox-devel_package() { if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi - vmove usr/share/gtk-doc vmove "usr/lib/*.so" } }