* [PR PATCH] io.elementary.{music,stylesheet,icons}: update to 7.0.0, granite7
@ 2022-09-10 20:51 paper42
2022-09-10 21:23 ` [PR PATCH] [Updated] " paper42
2022-09-11 14:35 ` [PR PATCH] [Merged]: " paper42
0 siblings, 2 replies; 3+ messages in thread
From: paper42 @ 2022-09-10 20:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1616 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages granite7
https://github.com/void-linux/void-packages/pull/39219
io.elementary.{music,stylesheet,icons}: update to 7.0.0, granite7
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
For elementary-music I imported a patch from upstream (in the main branch, not in a release yet) that forces the GTK style to elementary. Otherwise icons and the application style is wrong.
granite7 is a separate new package because many applications still use granite (6) and granite7 uses GTK4 instead of GTK3
cc @CameronNemo
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39219.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-granite7-39219.patch --]
[-- Type: text/x-diff, Size: 10711 bytes --]
From 695489e6fdb24e03e46d929f7487defe8b8e9cc4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 10 Sep 2022 22:10:59 +0200
Subject: [PATCH 1/4] New package: granite7-7.0.0
---
common/shlibs | 1 +
srcpkgs/granite7-devel | 1 +
srcpkgs/granite7/template | 28 ++++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/granite7-devel
create mode 100644 srcpkgs/granite7/template
diff --git a/common/shlibs b/common/shlibs
index de889fceaf6c..15d58b2de5b8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1193,6 +1193,7 @@ libconfig.so.11 libconfig-1.7.1_1
libopusfile.so.0 opusfile-0.12_2
libopusurl.so.0 opusfile-0.12_2
libopusenc.so.0 libopusenc-0.2_1
+libgranite-7.so.7 granite7-7.0.0_1
libgranite.so.6 granite-6.2.0_1
libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1
librlog.so.5 librlog-1.4_1
diff --git a/srcpkgs/granite7-devel b/srcpkgs/granite7-devel
new file mode 120000
index 000000000000..26532a65c2f9
--- /dev/null
+++ b/srcpkgs/granite7-devel
@@ -0,0 +1 @@
+granite7
\ No newline at end of file
diff --git a/srcpkgs/granite7/template b/srcpkgs/granite7/template
new file mode 100644
index 000000000000..368f8b84c4b1
--- /dev/null
+++ b/srcpkgs/granite7/template
@@ -0,0 +1,28 @@
+# Template file for 'granite7'
+pkgname=granite7
+version=7.0.0
+revision=1
+build_style=meson
+build_helper="gir"
+wrksrc="granite-${version}"
+hostmakedepends="pkg-config gettext vala"
+makedepends="gtk4-devel libgee08-devel"
+depends="hicolor-icon-theme"
+short_desc="GTK4 widget library for elementary OS"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/elementary/granite"
+distfiles="https://github.com/elementary/granite/archive/refs/tags/${version}.tar.gz"
+checksum=b3e77a1ca954d68f074cfad08ec65db12a56a80460e3c031c41d9f900f0314e3
+
+granite7-devel_package() {
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ vmove usr/share/vala
+ vmove usr/share/gir-1.0
+ }
+}
From d5aa6ba4cfe8a7fc4e6c4005a021ecc87fe50b24 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 10 Sep 2022 22:40:18 +0200
Subject: [PATCH 2/4] io.elementary.icons: update to 7.0.0.
---
srcpkgs/io.elementary.icons/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/io.elementary.icons/template b/srcpkgs/io.elementary.icons/template
index 1e1945d0bb73..f3dfd5e18079 100644
--- a/srcpkgs/io.elementary.icons/template
+++ b/srcpkgs/io.elementary.icons/template
@@ -1,6 +1,6 @@
# Template file for 'io.elementary.icons'
pkgname=io.elementary.icons
-version=6.1.0
+version=7.0.0
revision=1
wrksrc="icons-${version}"
build_style=meson
@@ -12,7 +12,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/icons"
distfiles="https://github.com/elementary/icons/archive/${version}.tar.gz"
-checksum=bab0f638a60d7a28bf269f4a11346b28495a819e3f516403a7e0bb880c441c2f
+checksum=3fc69e15939303b252be53a136650632763d856ad47b699b31ddc9bd3763f2e5
post_install() {
# How did that get there?
From 9afc5c7d4c45093ef554d541ae43e681c3adce54 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 10 Sep 2022 22:40:21 +0200
Subject: [PATCH 3/4] io.elementary.stylesheet: update to 7.0.0.
---
srcpkgs/io.elementary.stylesheet/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/io.elementary.stylesheet/template b/srcpkgs/io.elementary.stylesheet/template
index 618ac82dda0c..162fe7e00811 100644
--- a/srcpkgs/io.elementary.stylesheet/template
+++ b/srcpkgs/io.elementary.stylesheet/template
@@ -1,6 +1,6 @@
# Template file for 'io.elementary.stylesheet'
pkgname=io.elementary.stylesheet
-version=6.1.1
+version=7.0.0
revision=1
wrksrc="stylesheet-${version}"
build_style=meson
@@ -9,5 +9,5 @@ short_desc="GTK Stylesheet for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/stylesheet"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b8432a0a06944065a35eadf582043022a174d5ffa88bc0ee4e86b969688ed23e
+distfiles="https://github.com/elementary/stylesheet/archive/refs/tags/${version}.tar.gz"
+checksum=3856dbfa9f11a837c299dd53b0e4f8941f1ddafc9f0ec3d2d57e0deed8f2e7e3
From a6b6d2eb2411a809120e93243a842f4625b442b9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 10 Sep 2022 21:58:44 +0200
Subject: [PATCH 4/4] io.elementary.music: update to 7.0.0.
---
common/shlibs | 1 -
.../patches/hardcode-theme.patch | 42 +++++++++++++++++++
.../patches/meson-0.61.patch | 18 --------
srcpkgs/io.elementary.music/template | 36 ++++++----------
4 files changed, 55 insertions(+), 42 deletions(-)
create mode 100644 srcpkgs/io.elementary.music/patches/hardcode-theme.patch
delete mode 100644 srcpkgs/io.elementary.music/patches/meson-0.61.patch
diff --git a/common/shlibs b/common/shlibs
index 15d58b2de5b8..5dd87000a298 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 000000000000..0fcdde329eb0
--- /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?= <danielle@elementary.io>
+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 17393cc5aa07..000000000000
--- 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 3ef8c1568630..77c415b04db0 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"
+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 <cnemo@tutanota.com>"
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
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] io.elementary.{music,stylesheet,icons}: update to 7.0.0, granite7
2022-09-10 20:51 [PR PATCH] io.elementary.{music,stylesheet,icons}: update to 7.0.0, granite7 paper42
@ 2022-09-10 21:23 ` paper42
2022-09-11 14:35 ` [PR PATCH] [Merged]: " paper42
1 sibling, 0 replies; 3+ messages in thread
From: paper42 @ 2022-09-10 21:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1621 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages granite7
https://github.com/void-linux/void-packages/pull/39219
io.elementary.{music,stylesheet,icons}: update to 7.0.0, granite7
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
For elementary-music I imported a patch from upstream (in the main branch, not in a release yet) that forces the GTK style to elementary. Otherwise icons and the application style is wrong.
granite7 is a separate new package because many applications still use granite (6) and granite7 uses GTK4 instead of GTK3
cc @CameronNemo
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39219.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-granite7-39219.patch --]
[-- Type: text/x-diff, Size: 10722 bytes --]
From 278f07855e2c76be91b731fdda9f38b2143bd078 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 10 Sep 2022 22:10:59 +0200
Subject: [PATCH 1/4] New package: granite7-7.0.0
---
common/shlibs | 1 +
srcpkgs/granite7-devel | 1 +
srcpkgs/granite7/template | 28 ++++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
create mode 120000 srcpkgs/granite7-devel
create mode 100644 srcpkgs/granite7/template
diff --git a/common/shlibs b/common/shlibs
index de889fceaf6c..15d58b2de5b8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1193,6 +1193,7 @@ libconfig.so.11 libconfig-1.7.1_1
libopusfile.so.0 opusfile-0.12_2
libopusurl.so.0 opusfile-0.12_2
libopusenc.so.0 libopusenc-0.2_1
+libgranite-7.so.7 granite7-7.0.0_1
libgranite.so.6 granite-6.2.0_1
libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1
librlog.so.5 librlog-1.4_1
diff --git a/srcpkgs/granite7-devel b/srcpkgs/granite7-devel
new file mode 120000
index 000000000000..26532a65c2f9
--- /dev/null
+++ b/srcpkgs/granite7-devel
@@ -0,0 +1 @@
+granite7
\ No newline at end of file
diff --git a/srcpkgs/granite7/template b/srcpkgs/granite7/template
new file mode 100644
index 000000000000..dcd3dd0ebc54
--- /dev/null
+++ b/srcpkgs/granite7/template
@@ -0,0 +1,28 @@
+# Template file for 'granite7'
+pkgname=granite7
+version=7.0.0
+revision=1
+wrksrc="granite-${version}"
+build_style=meson
+build_helper="gir"
+hostmakedepends="pkg-config gettext vala"
+makedepends="gtk4-devel libgee08-devel"
+depends="hicolor-icon-theme"
+short_desc="GTK4 widget library for elementary OS"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/elementary/granite"
+distfiles="https://github.com/elementary/granite/archive/refs/tags/${version}.tar.gz"
+checksum=b3e77a1ca954d68f074cfad08ec65db12a56a80460e3c031c41d9f900f0314e3
+
+granite7-devel_package() {
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ vmove usr/share/vala
+ vmove usr/share/gir-1.0
+ }
+}
From 9a5fa53b472a61059412f3083979cdea0322a5eb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 10 Sep 2022 22:40:18 +0200
Subject: [PATCH 2/4] io.elementary.icons: update to 7.0.0.
---
srcpkgs/io.elementary.icons/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/io.elementary.icons/template b/srcpkgs/io.elementary.icons/template
index 1e1945d0bb73..f3dfd5e18079 100644
--- a/srcpkgs/io.elementary.icons/template
+++ b/srcpkgs/io.elementary.icons/template
@@ -1,6 +1,6 @@
# Template file for 'io.elementary.icons'
pkgname=io.elementary.icons
-version=6.1.0
+version=7.0.0
revision=1
wrksrc="icons-${version}"
build_style=meson
@@ -12,7 +12,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/icons"
distfiles="https://github.com/elementary/icons/archive/${version}.tar.gz"
-checksum=bab0f638a60d7a28bf269f4a11346b28495a819e3f516403a7e0bb880c441c2f
+checksum=3fc69e15939303b252be53a136650632763d856ad47b699b31ddc9bd3763f2e5
post_install() {
# How did that get there?
From 2f1a9170a7a63fbdcd929d1139f0dd2c7d28b1cf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 10 Sep 2022 22:40:21 +0200
Subject: [PATCH 3/4] io.elementary.stylesheet: update to 7.0.0.
---
srcpkgs/io.elementary.stylesheet/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/io.elementary.stylesheet/template b/srcpkgs/io.elementary.stylesheet/template
index 618ac82dda0c..162fe7e00811 100644
--- a/srcpkgs/io.elementary.stylesheet/template
+++ b/srcpkgs/io.elementary.stylesheet/template
@@ -1,6 +1,6 @@
# Template file for 'io.elementary.stylesheet'
pkgname=io.elementary.stylesheet
-version=6.1.1
+version=7.0.0
revision=1
wrksrc="stylesheet-${version}"
build_style=meson
@@ -9,5 +9,5 @@ short_desc="GTK Stylesheet for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/stylesheet"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b8432a0a06944065a35eadf582043022a174d5ffa88bc0ee4e86b969688ed23e
+distfiles="https://github.com/elementary/stylesheet/archive/refs/tags/${version}.tar.gz"
+checksum=3856dbfa9f11a837c299dd53b0e4f8941f1ddafc9f0ec3d2d57e0deed8f2e7e3
From 6675b9dd9e63a5699a6d8d56dd30eb182abedc11 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 10 Sep 2022 21:58:44 +0200
Subject: [PATCH 4/4] io.elementary.music: update to 7.0.0.
---
common/shlibs | 1 -
.../patches/hardcode-theme.patch | 42 +++++++++++++++++++
.../patches/meson-0.61.patch | 18 --------
srcpkgs/io.elementary.music/template | 36 ++++++----------
4 files changed, 55 insertions(+), 42 deletions(-)
create mode 100644 srcpkgs/io.elementary.music/patches/hardcode-theme.patch
delete mode 100644 srcpkgs/io.elementary.music/patches/meson-0.61.patch
diff --git a/common/shlibs b/common/shlibs
index 15d58b2de5b8..5dd87000a298 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 000000000000..0fcdde329eb0
--- /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?= <danielle@elementary.io>
+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 17393cc5aa07..000000000000
--- 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 3ef8c1568630..1d5cd4e382df 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 <cnemo@tutanota.com>"
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
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: io.elementary.{music,stylesheet,icons}: update to 7.0.0, granite7
2022-09-10 20:51 [PR PATCH] io.elementary.{music,stylesheet,icons}: update to 7.0.0, granite7 paper42
2022-09-10 21:23 ` [PR PATCH] [Updated] " paper42
@ 2022-09-11 14:35 ` paper42
1 sibling, 0 replies; 3+ messages in thread
From: paper42 @ 2022-09-11 14:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1464 bytes --]
There's a merged pull request on the void-packages repository
io.elementary.{music,stylesheet,icons}: update to 7.0.0, granite7
https://github.com/void-linux/void-packages/pull/39219
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
For elementary-music I imported a patch from upstream (in the main branch, not in a release yet) that forces the GTK style to elementary. Otherwise icons and the application style is wrong.
granite7 is a separate new package because many applications still use granite (6) and granite7 uses GTK4 instead of GTK3
cc @CameronNemo
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-11 14:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-10 20:51 [PR PATCH] io.elementary.{music,stylesheet,icons}: update to 7.0.0, granite7 paper42
2022-09-10 21:23 ` [PR PATCH] [Updated] " paper42
2022-09-11 14:35 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).