From 0e1091ab171ea79ebf0d8edf2d785ca2af2c3833 Mon Sep 17 00:00:00 2001 From: Nafis Date: Sat, 4 Apr 2020 08:45:06 +0600 Subject: [PATCH] rhythmbox: update to 3.4.4. --- .../rhythmbox/patches/fix-missing-icons.patch | 74 +++++++++++++++++++ srcpkgs/rhythmbox/template | 12 +-- 2 files changed, 81 insertions(+), 5 deletions(-) create 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 new file mode 100644 index 00000000000..f86a1b6b2c4 --- /dev/null +++ b/srcpkgs/rhythmbox/patches/fix-missing-icons.patch @@ -0,0 +1,74 @@ +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 +--- lib/rb-stock-icons.c ++++ 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 +--- shell/main.c ++++ 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 +--- shell/rb-application.c ++++ 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 2d374269383..fa352591ba4 100644 --- a/srcpkgs/rhythmbox/template +++ b/srcpkgs/rhythmbox/template @@ -1,6 +1,6 @@ # Template file for 'rhythmbox' pkgname=rhythmbox -version=3.4.3 +version=3.4.4 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --with-gudev @@ -13,14 +13,16 @@ makedepends="gtk+3-devel libsoup-gnome-devel totem-pl-parser-devel gst-plugins-base1-devel clutter-gtk-devel python3-devel python-gobject-devel libdmapsharing-devel" depends="gir-freedesktop desktop-file-utils hicolor-icon-theme" -pycompile_version="$py3_ver" -pycompile_dirs="/usr/lib/rhythmbox/plugins /usr/lib/rhythmbox/sample-plugins" short_desc="GNOME integrated music management application" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://www.rhythmbox.org" distfiles="${GNOME_SITE}/${pkgname}/${version::3}/${pkgname}-${version}.tar.xz" -checksum=fdc1c0c9dca689dea1872da28a7be30a1d5b12e6dda1b4b51c62d79deeb1a3fb +checksum=ee0eb0d7d7bdf696ac9471b19ff3bea3240d63b6cb8a134bf632054af8665d90 + +pycompile_version="$py3_ver" +pycompile_dirs="/usr/lib/rhythmbox/plugins /usr/lib/rhythmbox/sample-plugins" + build_options="gir" if [ -z "$CROSS_BUILD" ]; then