diff --git a/common/shlibs b/common/shlibs index ae5c6f05c07..fe0fe43e281 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3506,7 +3506,6 @@ libhandy-1.so.0 libhandy1-0.90.0_1 libadwaita-1.so.0 libadwaita-1.0.0alpha2_1 libswitchboard-2.0.so.0 switchboard-2.3.2_1 libcodecore.so.0 libio.elementary.code-3.0_1 -libio.elementary.music-core.so.0 libio.elementary.music-5.0_1 libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1 libpantheon-files-widgets.so.6 libio.elementary.files-6.0.0_1 libwlroots.so.9 wlroots0.14-0.14.1_1 diff --git a/srcpkgs/io.elementary.music/patches/hardcode-theme.patch b/srcpkgs/io.elementary.music/patches/hardcode-theme.patch new file mode 100644 index 00000000000..0fcdde329eb --- /dev/null +++ b/srcpkgs/io.elementary.music/patches/hardcode-theme.patch @@ -0,0 +1,42 @@ +https://github.com/elementary/music/pull/723 + +From 4e22268d38574e56eb3b42ae201c99cc98b510db Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Danielle=20For=C3=A9?= +Date: Wed, 10 Aug 2022 11:28:23 -0700 +Subject: [PATCH] Application: hard code gtk styles (#723) + +--- + src/Application.vala | 3 +++ + src/MainWindow.vala | 5 ----- + 2 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/src/Application.vala b/src/Application.vala +index a0ddc7c64..84ec0f8cb 100644 +--- a/src/Application.vala ++++ b/src/Application.vala +@@ -74,6 +74,9 @@ public class Music.Application : Gtk.Application { + var granite_settings = Granite.Settings.get_default (); + var gtk_settings = Gtk.Settings.get_default (); + ++ gtk_settings.gtk_icon_theme_name = "elementary"; ++ gtk_settings.gtk_theme_name = "io.elementary.stylesheet.orange"; ++ + gtk_settings.gtk_application_prefer_dark_theme = ( + granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK + ); +diff --git a/src/MainWindow.vala b/src/MainWindow.vala +index b7536ef3e..4d1be9fbb 100644 +--- a/src/MainWindow.vala ++++ b/src/MainWindow.vala +@@ -11,11 +11,6 @@ public class Music.MainWindow : Gtk.ApplicationWindow { + construct { + var playback_manager = PlaybackManager.get_default (); + +- var css_provider = new Gtk.CssProvider (); +- css_provider.load_from_data ("@define-color accent_color @ORANGE_500;".data); +- +- Gtk.StyleContext.add_provider_for_display (Gdk.Display.get_default (), css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); +- + var start_window_controls = new Gtk.WindowControls (Gtk.PackType.START) { + hexpand = true + }; diff --git a/srcpkgs/io.elementary.music/patches/meson-0.61.patch b/srcpkgs/io.elementary.music/patches/meson-0.61.patch deleted file mode 100644 index 17393cc5aa0..00000000000 --- a/srcpkgs/io.elementary.music/patches/meson-0.61.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/data/meson.build -+++ b/data/meson.build -@@ -27,7 +27,6 @@ install_data( - - i18n = import('i18n') - desktop_file = i18n.merge_file( -- 'desktop', - input: meson.project_name() + '.desktop.in', - output: meson.project_name() + '.desktop', - install: true, -@@ -37,7 +36,6 @@ desktop_file = i18n.merge_file( - ) - - appdata_file = i18n.merge_file( -- 'appdata', - input: meson.project_name() + '.appdata.xml.in', - output: meson.project_name() + '.appdata.xml', - install: true, diff --git a/srcpkgs/io.elementary.music/template b/srcpkgs/io.elementary.music/template index 3ef8c156863..1d5cd4e382d 100644 --- a/srcpkgs/io.elementary.music/template +++ b/srcpkgs/io.elementary.music/template @@ -1,37 +1,27 @@ # Template file for 'io.elementary.music' pkgname=io.elementary.music -version=5.1.1 +version=7.0.0 revision=1 wrksrc="music-${version}" build_style=meson -configure_args="-Dbuild-plugins=true -Dplugins=audioplayer,cdrom,ipod" -hostmakedepends="vala desktop-file-utils gettext pkg-config AppStream glib-devel" -makedepends="taglib-devel granite-devel vala-devel gtk+3-devel libgee08-devel - clutter-gtk-devel dbus-glib-devel libgda-devel libgpod-devel libxml2-devel - json-glib-devel libnotify-devel libsoup-devel zeitgeist-devel libpeas-devel - libhandy1-devel" +hostmakedepends="vala pkg-config gettext glib-devel" +makedepends="gtk4-devel granite7-devel gst-plugins-base1-devel" +depends="io.elementary.icons io.elementary.stylesheet" short_desc="Music player and library designed for elementary OS" maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/elementary/music" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=35e97ec496327b4eb388308168711bf9f8e976a857eb97bca21805f83abf9d15 +distfiles="https://github.com/elementary/music/archive/refs/tags/${version}.tar.gz" +checksum=5bd4f4f748f922ecb5bf1e2354a3725f5e41ba73b72b016f189f45a85fb29df7 libio.elementary.music_package() { - short_desc+=" - library" - pkg_install() { - vmove "usr/lib/*.so.*" - } + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - transitional dummy package" + build_style=meta } + libio.elementary.music-devel_package() { - short_desc+=" - library development files" - depends="libio.elementary.music>=${version} granite-devel - gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libglib-devel - libpeas-devel libhandy1-devel" - pkg_install() { - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - vmove usr/include - vmove usr/share/vala - } + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - transitional dummy package" + build_style=meta }