snlavaise/pmaports-rtwo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnome: Update libgnome-volume-control

Browse Source 
In order to fix crashes with new Pipewire releases like 1.4.10.

While on it, do some minor cleanups to make the files more similar.

See:
https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/merge_requests/31
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/4048

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7851>
This commit is contained in:
Robert Mader
2026-01-26 20:12:45 +01:00
committed by The Friendly Merge Bot
parent ef58926d5e
commit 1fba9931e2
5 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extra-repos/systemd/gnome-settings-daemon-mobile/APKBUILD
+10 -6
View File
@@ -5,7 +5,7 @@ maintainer="Newbyte <newbyte@postmarketos.org>"
pkgname=gnome-settings-daemon-mobile pkgname=gnome-settings-daemon-mobile
_pkgver=48.0 _pkgver=48.0
pkgver=9999$_pkgver pkgver=9999$_pkgver
pkgrel=0 pkgrel=1
pkgdesc="GNOME settings daemon" pkgdesc="GNOME settings daemon"
url="https://gitlab.gnome.org/verdre/gnome-settings-daemon-mobile" url="https://gitlab.gnome.org/verdre/gnome-settings-daemon-mobile"
# armhf: pmb#2618 # armhf: pmb#2618
@@ -30,8 +30,8 @@ depends_dev="
nss-dev nss-dev
pango-dev pango-dev
polkit-dev polkit-dev
systemd-dev
pulseaudio-dev pulseaudio-dev
systemd-dev
upower-dev upower-dev
" "
makedepends=" makedepends="
@@ -52,11 +52,15 @@ makedepends="
# py3-gobject3 # py3-gobject3
# umockdev-dev # umockdev-dev
# " # "
subpackages="$pkgname-dev $pkgname-lang $pkgname-systemd" subpackages="
$pkgname-dev
$pkgname-lang
$pkgname-systemd
"
_commit=48.mobile.0 _commit=48.mobile.0
_gvc_commit="91f3f41490666a526ed78af744507d7ee1134323" _gvc_commit="47c47a423ff2f55bb038d92517e4782cf051496a"
source="gnome-settings-daemon-mobile-$_commit.tar.gz::https://gitlab.gnome.org/verdre/gnome-settings-daemon-mobile/-/archive/$_commit/gnome-settings-daemon-mobile-$_commit.tar.gz source="gnome-settings-daemon-mobile-$_commit.tar.gz::https://gitlab.gnome.org/verdre/gnome-settings-daemon-mobile/-/archive/$_commit/gnome-settings-daemon-mobile-$_commit.tar.gz
libgnome-volume-control-$_gvc_commit.tar.gz::https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_gvc_commit/gnome-shell-$_gvc_commit.tar.gz https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_gvc_commit/libgnome-volume-control-$_gvc_commit.tar.gz
pcver.patch pcver.patch
" "
builddir="$srcdir/$pkgname-$_commit" builddir="$srcdir/$pkgname-$_commit"
@@ -96,6 +100,6 @@ package() {
sha512sums=" sha512sums="
a09224513481df755e8461bdedb4c3a933a840c67ae9cd1efbb0bf42f0b7eb711d8d963d32c8e010491ac5e881c1152296c0c0d2454876e0048fe3e9af1be1e4 gnome-settings-daemon-mobile-48.mobile.0.tar.gz a09224513481df755e8461bdedb4c3a933a840c67ae9cd1efbb0bf42f0b7eb711d8d963d32c8e010491ac5e881c1152296c0c0d2454876e0048fe3e9af1be1e4 gnome-settings-daemon-mobile-48.mobile.0.tar.gz
c832e99bc56ae586734d468e4e1a17f107acc76076d07ba45c46359ba751d1e6abe6108e43730fdf1dd18153cfa9f374e3e81118ae4902f0974d5b5f54f8276b libgnome-volume-control-91f3f41490666a526ed78af744507d7ee1134323.tar.gz f1575dd86772e4bad9357f0322b2ba396478ec45a691c072c4ff98c299d8814aaaf0386fb90f883b3862f88495a07177453ac0fb163ce2b17eb7bb5e65ca5d6c libgnome-volume-control-47c47a423ff2f55bb038d92517e4782cf051496a.tar.gz
8639f116d56710eb204091fde66c250349f1d3f01951afc5218a59b53125320347fdefd432d19470ca00e105473640946d7ad0b620ae1162ab67f7d13653c987 pcver.patch 8639f116d56710eb204091fde66c250349f1d3f01951afc5218a59b53125320347fdefd432d19470ca00e105473640946d7ad0b620ae1162ab67f7d13653c987 pcver.patch
" "
extra-repos/systemd/gnome-settings-daemon/APKBUILD
+7 -2
View File
@@ -5,7 +5,7 @@ maintainer="Newbyte <newbyte@postmarketos.org>"
pkgname=gnome-settings-daemon pkgname=gnome-settings-daemon
_pkgver=48.1 _pkgver=48.1
pkgver=9999$_pkgver pkgver=9999$_pkgver
pkgrel=0 pkgrel=1
pkgdesc="GNOME settings daemon" pkgdesc="GNOME settings daemon"
url="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" url="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
# armhf: pmb#2618 # armhf: pmb#2618
@@ -30,6 +30,7 @@ depends_dev="
pango-dev pango-dev
polkit-dev polkit-dev
pulseaudio-dev pulseaudio-dev
systemd-dev
upower-dev upower-dev
" "
makedepends=" makedepends="
@@ -42,7 +43,6 @@ makedepends="
gtk+3.0-dev gtk+3.0-dev
libxml2-utils libxml2-utils
meson meson
systemd-dev
" "
# checkdepends=" # checkdepends="
# gnome-session # gnome-session
@@ -56,11 +56,15 @@ subpackages="
$pkgname-lang $pkgname-lang
$pkgname-systemd $pkgname-systemd
" "
_gvc_commit="47c47a423ff2f55bb038d92517e4782cf051496a"
source="https://download.gnome.org/sources/gnome-settings-daemon/${_pkgver%.*}/gnome-settings-daemon-$_pkgver.tar.xz source="https://download.gnome.org/sources/gnome-settings-daemon/${_pkgver%.*}/gnome-settings-daemon-$_pkgver.tar.xz
https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_gvc_commit/libgnome-volume-control-$_gvc_commit.tar.gz
" "
builddir="$srcdir/gnome-settings-daemon-$_pkgver" builddir="$srcdir/gnome-settings-daemon-$_pkgver"
build() { build() {
rm -rf "$builddir/subprojects/gvc"
mv "$srcdir/libgnome-volume-control-$_gvc_commit" $builddir/subprojects/gvc
abuild-meson \ abuild-meson \
-Db_lto=true \ -Db_lto=true \
-Dsystemd=true \ -Dsystemd=true \
@@ -78,4 +82,5 @@ package() {
sha512sums=" sha512sums="
b4ce4fe5a2a6b9dcdc3a82f4460488b39adcb56e7345079d9558506146202d234562cfaa522b77d1eb0d468121a5aed5cec42983a78abc2fe0946dd78dc2bc40 gnome-settings-daemon-48.1.tar.xz b4ce4fe5a2a6b9dcdc3a82f4460488b39adcb56e7345079d9558506146202d234562cfaa522b77d1eb0d468121a5aed5cec42983a78abc2fe0946dd78dc2bc40 gnome-settings-daemon-48.1.tar.xz
f1575dd86772e4bad9357f0322b2ba396478ec45a691c072c4ff98c299d8814aaaf0386fb90f883b3862f88495a07177453ac0fb163ce2b17eb7bb5e65ca5d6c libgnome-volume-control-47c47a423ff2f55bb038d92517e4782cf051496a.tar.gz
" "
extra-repos/systemd/gnome-shell-mobile/APKBUILD
+4 -4
View File
@@ -5,7 +5,7 @@ maintainer="Newbyte <newbyte@postmarketos.org>"
pkgname=gnome-shell-mobile pkgname=gnome-shell-mobile
_pkgver=48.0 _pkgver=48.0
pkgver=9999$_pkgver pkgver=9999$_pkgver
pkgrel=0 pkgrel=1
pkgdesc="GNOME shell mobile" pkgdesc="GNOME shell mobile"
url="https://wiki.gnome.org/Projects/GnomeShell" url="https://wiki.gnome.org/Projects/GnomeShell"
# gjs / riscv64: mutter-mobile # gjs / riscv64: mutter-mobile
@@ -77,9 +77,9 @@ subpackages="
gnome-mobile-extensions-app:extensions_app:noarch gnome-mobile-extensions-app:extensions_app:noarch
" "
_commit="48.mobile.0" _commit="48.mobile.0"
_gvc_commit="5f9768a2eac29c1ed56f1fbb449a77a3523683b6" _gvc_commit="47c47a423ff2f55bb038d92517e4782cf051496a"
source="gnome-shell-mobile-$_commit.tar.gz::https://gitlab.gnome.org/verdre/gnome-shell-mobile/-/archive/$_commit/gnome-shell-mobile-$_commit.tar.gz source="gnome-shell-mobile-$_commit.tar.gz::https://gitlab.gnome.org/verdre/gnome-shell-mobile/-/archive/$_commit/gnome-shell-mobile-$_commit.tar.gz
libgnome-volume-control-$_gvc_commit.tar.gz::https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_gvc_commit/gnome-shell-$_gvc_commit.tar.gz https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_gvc_commit/libgnome-volume-control-$_gvc_commit.tar.gz
gsh.patch gsh.patch
pcver.patch pcver.patch
gjs-1.85.90-girepository.patch gjs-1.85.90-girepository.patch
@@ -146,7 +146,7 @@ package() {
sha512sums=" sha512sums="
01a4beb195f48a7ce00a50453695ccc10c7a00fcda81428bf1bb07aacef70a14ffed8124faa50ac98d601d4d43f291c2cd48835bdb79d5e8e751677d877a6953 gnome-shell-mobile-48.mobile.0.tar.gz 01a4beb195f48a7ce00a50453695ccc10c7a00fcda81428bf1bb07aacef70a14ffed8124faa50ac98d601d4d43f291c2cd48835bdb79d5e8e751677d877a6953 gnome-shell-mobile-48.mobile.0.tar.gz
ef6a103ddca784db35648acd11a423a9d65173c597c6463a572834827c9812bb1be5c8113d93a28ea99ca017dd1655b8eaf417a30b6b9085677baf373395aac1 libgnome-volume-control-5f9768a2eac29c1ed56f1fbb449a77a3523683b6.tar.gz f1575dd86772e4bad9357f0322b2ba396478ec45a691c072c4ff98c299d8814aaaf0386fb90f883b3862f88495a07177453ac0fb163ce2b17eb7bb5e65ca5d6c libgnome-volume-control-47c47a423ff2f55bb038d92517e4782cf051496a.tar.gz
40cafbd0da2f2a40ff9e9db1026179d52a3b296a81fa43a98e433c0919800f0ec5231fcad32d523b8f01b8f7c0205dce1332e48493b0101ad02dae9469ac3de0 gsh.patch 40cafbd0da2f2a40ff9e9db1026179d52a3b296a81fa43a98e433c0919800f0ec5231fcad32d523b8f01b8f7c0205dce1332e48493b0101ad02dae9469ac3de0 gsh.patch
0503440b547b78859c3bb87a66308899bcf33cc0b543e04e9c865904ff7fb86b10b66594c37a1726828ee1a497b0e034150be8cf1a9fbd06c59809619f6a31c8 pcver.patch 0503440b547b78859c3bb87a66308899bcf33cc0b543e04e9c865904ff7fb86b10b66594c37a1726828ee1a497b0e034150be8cf1a9fbd06c59809619f6a31c8 pcver.patch
7d1bd0a60ee389c8fbc830ac573235ac1053fe44e8c249d32fb34427d9a1c0129444d781d311a6474d5e0b97897a14a52013a3aec0c85c120b8b525b835378bb gjs-1.85.90-girepository.patch 7d1bd0a60ee389c8fbc830ac573235ac1053fe44e8c249d32fb34427d9a1c0129444d781d311a6474d5e0b97897a14a52013a3aec0c85c120b8b525b835378bb gjs-1.85.90-girepository.patch
temp/gnome-settings-daemon-mobile/APKBUILD
+4 -4
View File
@@ -3,7 +3,7 @@
maintainer="Newbyte <newbyte@postmarketos.org>" maintainer="Newbyte <newbyte@postmarketos.org>"
pkgname=gnome-settings-daemon-mobile pkgname=gnome-settings-daemon-mobile
pkgver=48.0 pkgver=48.0
pkgrel=3 pkgrel=4
pkgdesc="GNOME settings daemon" pkgdesc="GNOME settings daemon"
url="https://gitlab.gnome.org/verdre/gnome-settings-daemon-mobile" url="https://gitlab.gnome.org/verdre/gnome-settings-daemon-mobile"
arch="all" arch="all"
@@ -50,9 +50,9 @@ checkdepends="
" "
subpackages="$pkgname-dev $pkgname-lang" subpackages="$pkgname-dev $pkgname-lang"
_commit=48.mobile.0 _commit=48.mobile.0
_gvc_commit="91f3f41490666a526ed78af744507d7ee1134323" _gvc_commit="47c47a423ff2f55bb038d92517e4782cf051496a"
source="gnome-settings-daemon-mobile-$_commit.tar.gz::https://gitlab.gnome.org/verdre/gnome-settings-daemon-mobile/-/archive/$_commit/gnome-settings-daemon-mobile-$_commit.tar.gz source="gnome-settings-daemon-mobile-$_commit.tar.gz::https://gitlab.gnome.org/verdre/gnome-settings-daemon-mobile/-/archive/$_commit/gnome-settings-daemon-mobile-$_commit.tar.gz
libgnome-volume-control-$_gvc_commit.tar.gz::https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_gvc_commit/gnome-shell-$_gvc_commit.tar.gz https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_gvc_commit/libgnome-volume-control-$_gvc_commit.tar.gz
pcver.patch pcver.patch
" "
builddir="$srcdir/gnome-settings-daemon-mobile-$_commit" builddir="$srcdir/gnome-settings-daemon-mobile-$_commit"
@@ -90,6 +90,6 @@ lang() {
sha512sums=" sha512sums="
a09224513481df755e8461bdedb4c3a933a840c67ae9cd1efbb0bf42f0b7eb711d8d963d32c8e010491ac5e881c1152296c0c0d2454876e0048fe3e9af1be1e4 gnome-settings-daemon-mobile-48.mobile.0.tar.gz a09224513481df755e8461bdedb4c3a933a840c67ae9cd1efbb0bf42f0b7eb711d8d963d32c8e010491ac5e881c1152296c0c0d2454876e0048fe3e9af1be1e4 gnome-settings-daemon-mobile-48.mobile.0.tar.gz
c832e99bc56ae586734d468e4e1a17f107acc76076d07ba45c46359ba751d1e6abe6108e43730fdf1dd18153cfa9f374e3e81118ae4902f0974d5b5f54f8276b libgnome-volume-control-91f3f41490666a526ed78af744507d7ee1134323.tar.gz f1575dd86772e4bad9357f0322b2ba396478ec45a691c072c4ff98c299d8814aaaf0386fb90f883b3862f88495a07177453ac0fb163ce2b17eb7bb5e65ca5d6c libgnome-volume-control-47c47a423ff2f55bb038d92517e4782cf051496a.tar.gz
8639f116d56710eb204091fde66c250349f1d3f01951afc5218a59b53125320347fdefd432d19470ca00e105473640946d7ad0b620ae1162ab67f7d13653c987 pcver.patch 8639f116d56710eb204091fde66c250349f1d3f01951afc5218a59b53125320347fdefd432d19470ca00e105473640946d7ad0b620ae1162ab67f7d13653c987 pcver.patch
" "
temp/gnome-shell-mobile/APKBUILD
+4 -4
View File
@@ -4,7 +4,7 @@
maintainer="Newbyte <newbyte@postmarketos.org>" maintainer="Newbyte <newbyte@postmarketos.org>"
pkgname=gnome-shell-mobile pkgname=gnome-shell-mobile
pkgver=48.0 pkgver=48.0
pkgrel=4 pkgrel=5
pkgdesc="GNOME shell" pkgdesc="GNOME shell"
url="https://wiki.gnome.org/Projects/GnomeShell" url="https://wiki.gnome.org/Projects/GnomeShell"
# gjs / riscv64: mutter-mobile # gjs / riscv64: mutter-mobile
@@ -74,9 +74,9 @@ subpackages="
gnome-mobile-extensions-app:extensions_app:noarch gnome-mobile-extensions-app:extensions_app:noarch
" "
_commit="48.mobile.0" _commit="48.mobile.0"
_gvc_commit="5f9768a2eac29c1ed56f1fbb449a77a3523683b6" _gvc_commit="47c47a423ff2f55bb038d92517e4782cf051496a"
source="gnome-shell-mobile-$_commit.tar.gz::https://gitlab.gnome.org/verdre/gnome-shell-mobile/-/archive/$_commit/gnome-shell-mobile-$_commit.tar.gz source="gnome-shell-mobile-$_commit.tar.gz::https://gitlab.gnome.org/verdre/gnome-shell-mobile/-/archive/$_commit/gnome-shell-mobile-$_commit.tar.gz
libgnome-volume-control-$_gvc_commit.tar.gz::https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_gvc_commit/libgnome-volume-control-$_gvc_commit.tar.gz https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_gvc_commit/libgnome-volume-control-$_gvc_commit.tar.gz
gsh.patch gsh.patch
pcver.patch pcver.patch
gjs-1.85.90-girepository.patch gjs-1.85.90-girepository.patch
@@ -138,7 +138,7 @@ package() {
sha512sums=" sha512sums="
01a4beb195f48a7ce00a50453695ccc10c7a00fcda81428bf1bb07aacef70a14ffed8124faa50ac98d601d4d43f291c2cd48835bdb79d5e8e751677d877a6953 gnome-shell-mobile-48.mobile.0.tar.gz 01a4beb195f48a7ce00a50453695ccc10c7a00fcda81428bf1bb07aacef70a14ffed8124faa50ac98d601d4d43f291c2cd48835bdb79d5e8e751677d877a6953 gnome-shell-mobile-48.mobile.0.tar.gz
ef6a103ddca784db35648acd11a423a9d65173c597c6463a572834827c9812bb1be5c8113d93a28ea99ca017dd1655b8eaf417a30b6b9085677baf373395aac1 libgnome-volume-control-5f9768a2eac29c1ed56f1fbb449a77a3523683b6.tar.gz f1575dd86772e4bad9357f0322b2ba396478ec45a691c072c4ff98c299d8814aaaf0386fb90f883b3862f88495a07177453ac0fb163ce2b17eb7bb5e65ca5d6c libgnome-volume-control-47c47a423ff2f55bb038d92517e4782cf051496a.tar.gz
ae4ac679bacd35948b44068e5a70407f473bd96986ee126abb1bdf066db5cbc2087a3ffae0b390286689cacbe8325870fd43663ba39f4f7543216e02bf083934 gsh.patch ae4ac679bacd35948b44068e5a70407f473bd96986ee126abb1bdf066db5cbc2087a3ffae0b390286689cacbe8325870fd43663ba39f4f7543216e02bf083934 gsh.patch
0503440b547b78859c3bb87a66308899bcf33cc0b543e04e9c865904ff7fb86b10b66594c37a1726828ee1a497b0e034150be8cf1a9fbd06c59809619f6a31c8 pcver.patch 0503440b547b78859c3bb87a66308899bcf33cc0b543e04e9c865904ff7fb86b10b66594c37a1726828ee1a497b0e034150be8cf1a9fbd06c59809619f6a31c8 pcver.patch
7d1bd0a60ee389c8fbc830ac573235ac1053fe44e8c249d32fb34427d9a1c0129444d781d311a6474d5e0b97897a14a52013a3aec0c85c120b8b525b835378bb gjs-1.85.90-girepository.patch 7d1bd0a60ee389c8fbc830ac573235ac1053fe44e8c249d32fb34427d9a1c0129444d781d311a6474d5e0b97897a14a52013a3aec0c85c120b8b525b835378bb gjs-1.85.90-girepository.patch