From 39052ac0784cf6b60fc2a825da6758d0d87d22ea Mon Sep 17 00:00:00 2001 From: Niko Date: Mon, 4 Sep 2023 20:18:58 +0000 Subject: [PATCH] temp/gnome-shell-mobile: upgrade to 45_git20230908 (MR 4371) [ci:skip-build]: already built successfully in CI --- temp/gnome-shell-mobile/APKBUILD | 14 +++++++------- temp/mutter-mobile/APKBUILD | 17 ++++++++++------- temp/mutter-mobile/pcversion.patch | 1 + temp/mutter-mobile/version.patch | 17 +++++++++++++++++ 4 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 temp/mutter-mobile/version.patch diff --git a/temp/gnome-shell-mobile/APKBUILD b/temp/gnome-shell-mobile/APKBUILD index 90b463ec8..725fa44fb 100644 --- a/temp/gnome-shell-mobile/APKBUILD +++ b/temp/gnome-shell-mobile/APKBUILD @@ -1,8 +1,8 @@ # Forked from Alpine to add phone adaptivity patches pkgname=gnome-shell-mobile -pkgver=44_git20230405 -pkgrel=2 +pkgver=45_git20230908 +pkgrel=0 pkgdesc="GNOME shell" url="https://wiki.gnome.org/Projects/GnomeShell" arch="all !armhf !s390x !riscv64" # gjs / riscv64: mutter-mobile @@ -45,7 +45,7 @@ makedepends=" libxml2-dev libxml2-utils meson - mutter-mobile-dev>=44_git20230405 + mutter-mobile-dev>=45_git20230905 networkmanager-dev pipewire-dev polkit-dev @@ -62,13 +62,13 @@ checkdepends=" # gdm is also needed but introduces circular dep provides="gnome-shell=$pkgver-r$pkgrel" subpackages="$pkgname-dbg $pkgname-doc $pkgname-lang $pkgname-schemas::noarch" -_commit="7244a2d0ba30ff4927da14f2611db0dc777c668b" +_commit="df3f6b4c512d2f181e86ff7f6b1646ce7b907344" _gvc_commit="8e7a5a4c3e51007ce6579292642517e3d3eb9c50" -source="gnome-shell-$_commit.tar.gz::https://gitlab.gnome.org/verdre/gnome-shell/-/archive/$_commit/gnome-shell-$_commit.tar.gz +source="mobile-shell-$_commit.tar.gz::https://gitlab.gnome.org/verdre/mobile-shell/-/archive/$_commit/mobile-shell-$_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 disable-telepathy-integration.patch gsh.patch" -builddir="$srcdir/gnome-shell-$_commit" +builddir="$srcdir/mobile-shell-$_commit" options="!check" # Tests have circular dependency 'gnome-shell <-> gdm' # secfixes: @@ -117,7 +117,7 @@ package() { } sha512sums=" -3165e8994444eae5409cbe6e74b31b866816f86a5adda809d61390f407ee676938d31da149d2a04b0a9eb52c25d4ba10d276ad867ab53bd470ce6d59d3d273a4 gnome-shell-7244a2d0ba30ff4927da14f2611db0dc777c668b.tar.gz +f7445d29006496865f9ea9d70efd1e2f1be1886b97bdd09bb5b000db6b576200d076178050527e920837dc416b1803851cb7d33e8024fc99acecdcc4c73816dd mobile-shell-df3f6b4c512d2f181e86ff7f6b1646ce7b907344.tar.gz ebc6985afbda5ddebcda44d8b6732a9abc2d7249aff3adf7a76a90aa681590f830dcf2e5f3534a624adc32d1f0445e261ee149d65c221f733e0c33e0690a004d libgnome-volume-control-8e7a5a4c3e51007ce6579292642517e3d3eb9c50.tar.gz 2ca70115fab957fdf276b7f0772786e1afd56b0b22bcfd92f5b5f1d29676dc97c19cfb079434d0dbf7b459f1d133dbd8d1faa0d88f7b94846040a23856f951f8 disable-telepathy-integration.patch dba79b94ab4bcf0db51aa4a19c5fb52f9dae05909fe13531fe9dc06d9db334ac3328bd4040484eac8ef851057ee471a28d86800aa2ae82eec7274f5f79b9146a gsh.patch diff --git a/temp/mutter-mobile/APKBUILD b/temp/mutter-mobile/APKBUILD index 3a48b7f26..93eb67631 100644 --- a/temp/mutter-mobile/APKBUILD +++ b/temp/mutter-mobile/APKBUILD @@ -1,8 +1,8 @@ # Forked from Alpine to apply mobile adaptivity patches pkgname=mutter-mobile -pkgver=44_git20230405 -pkgrel=1 +pkgver=45_git20230908 +pkgrel=0 pkgdesc="clutter-based window manager and compositor" url="https://wiki.gnome.org/Projects/Mutter/" # ricsv64: doesn't build currently: @@ -53,6 +53,7 @@ makedepends=" libxrandr-dev libxrender-dev libxtst-dev + libei-dev mesa-dev meson pango-dev @@ -65,12 +66,13 @@ makedepends=" options="!check" # Can't be run with release builds provides="mutter=$pkgver-r$pkgrel" subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-lang $pkgname-schemas::noarch" -_commit="780aadd4ed77ca6a8312acb3ab13decdb5b6d569" -source="mutter-$_commit.tar.gz::https://gitlab.gnome.org/verdre/mutter/-/archive/$_commit/mutter-$_commit.tar.gz +_commit="0f08f5aba4c9b5ac34b2d5711182d50b719d838e" +source="mobile-mutter-$_commit.tar.gz::https://gitlab.gnome.org/verdre/mobile-mutter/-/archive/$_commit/mobile-mutter-$_commit.tar.gz fixudev-req.patch pcversion.patch + version.patch " -builddir="$srcdir/mutter-$_commit" +builddir="$srcdir/mobile-mutter-$_commit" prepare() { default_prepare @@ -113,7 +115,8 @@ package() { } sha512sums=" -74f795fe187244c892eee97010c524e6b27651ed42e4cc68ff387e4ccbe65a6947a87eb7f633862996251f4aa023422e3e7088e70d8ecb8056dd9ff67d52131a mutter-780aadd4ed77ca6a8312acb3ab13decdb5b6d569.tar.gz +715c3efbbf416a11ae0a723184d1e018d3679c876bc419f110da1200f9dad3b7719255ac81cca301cff55e16ba36578bc9906805599ff009faeebf9455f5bcb1 mobile-mutter-0f08f5aba4c9b5ac34b2d5711182d50b719d838e.tar.gz 6f21171bbd0ad0fc67cbaf5fb1478b22b482a9ae33b9328cc51a5dd31bcf7d95cd41e6cbbac21d3d8801cc064a62a64ae38ed7d0501ab605b861058c32f3bc30 fixudev-req.patch -bb46a4692aaff0c9e6092d1ba80d19b336035e983f0f20a437a586757bc2530860f50fbd46b09f73e88f0dd80ea7188d1df467b8f762918717785e618b6e9c4b pcversion.patch +b0f2fc36b6eeb7b49aed4a689c1a8d982d22f0b9d246c4c47ae950d5b06c5fe900ac5b0640a2d25ec97042a83138c51e87d878f74dc016774205cfc8bbf06f00 pcversion.patch +a9a82e945081480ae7ce59098aa3e46c87f5ea97481bd4c4933b3ef0a1757492ecb6e8453e8a2f74fb42edd51d39f76aaf9ef45ad8c52008acd6bbcbec219f83 version.patch " diff --git a/temp/mutter-mobile/pcversion.patch b/temp/mutter-mobile/pcversion.patch index d6b3f32f8..7faea06a9 100644 --- a/temp/mutter-mobile/pcversion.patch +++ b/temp/mutter-mobile/pcversion.patch @@ -12,3 +12,4 @@ index 3550496..15b9e7d 100644 json_glib_req = '>= 0.12.0' xcomposite_req = '>= 0.4' xkbcommon_req = '>= 0.4.3' + libei_req = '>= 1.0.0' diff --git a/temp/mutter-mobile/version.patch b/temp/mutter-mobile/version.patch new file mode 100644 index 000000000..7fc2b946d --- /dev/null +++ b/temp/mutter-mobile/version.patch @@ -0,0 +1,17 @@ +diff --git a/meson.build b/meson.build +index 80e1fc70e..1a3ca564f 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,10 +1,10 @@ + project('mutter', 'c', +- version: '45.rc', ++ version: '45_rc', + meson_version: '>= 0.60.0', + license: 'GPLv2+' + ) + +-split_version = meson.project_version().split('.') ++split_version = meson.project_version().split('_') + + # API version, bump each development cycle + libmutter_api_version = '13'