From 4321b29b998da32c2b7bcfd0c7e3d397b26f86fb Mon Sep 17 00:00:00 2001 From: jane400 Date: Sun, 28 Jul 2024 13:18:53 +0200 Subject: [PATCH] temp/gnome-shell-mobile: upgrade to 46-mobile-0 (MR 5396) [ci:skip-build]: already built successfully in CI --- temp/gnome-shell-mobile/APKBUILD | 27 ++++++++----------- .../disable-telepathy-integration.patch | 17 ------------ temp/gnome-shell-mobile/gsh.patch | 3 +-- 3 files changed, 12 insertions(+), 35 deletions(-) delete mode 100644 temp/gnome-shell-mobile/disable-telepathy-integration.patch diff --git a/temp/gnome-shell-mobile/APKBUILD b/temp/gnome-shell-mobile/APKBUILD index bc74ad37c..ed59b06d3 100644 --- a/temp/gnome-shell-mobile/APKBUILD +++ b/temp/gnome-shell-mobile/APKBUILD @@ -1,7 +1,7 @@ # Forked from Alpine to add phone adaptivity patches pkgname=gnome-shell-mobile -pkgver=45_git20240610 +pkgver=46 pkgrel=0 pkgdesc="GNOME shell" url="https://wiki.gnome.org/Projects/GnomeShell" @@ -24,6 +24,7 @@ depends=" gstreamer ibus librsvg + mutter-mobile>=46 networkmanager-common tecla unzip @@ -47,7 +48,7 @@ makedepends=" libxml2-dev libxml2-utils meson - mutter-mobile-dev>=45_git20230905 + mutter-mobile-dev>=46 networkmanager-dev pipewire-dev polkit-dev @@ -71,21 +72,16 @@ subpackages=" $pkgname-schemas::noarch gnome-mobile-extensions-app:extensions_app:noarch " -_commit="b157a30ad43865e41e6cf5a632390d630b5a40df" -_gvc_commit="8e7a5a4c3e51007ce6579292642517e3d3eb9c50" -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 +_commit="46-mobile-0" +_gvc_commit="91f3f41490666a526ed78af744507d7ee1134323" +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 gsh.patch" -builddir="$srcdir/mobile-shell-$_commit" +builddir="$srcdir/gnome-shell-mobile-$_commit" options="!check" # Tests have circular dependency 'gnome-shell <-> gdm' # To make sure pmb_recommends installs the correct one _pmb_recommends="gnome-mobile-extensions-app" -# secfixes: -# 0: -# - CVE-2019-3820 - prepare() { default_prepare rm -rf "$builddir/subprojects/gvc" @@ -141,8 +137,7 @@ package() { } sha512sums=" -b2769404992877625893c8b6e401f499f17aa5b0f52fba8d7ccdfce1f6fc4531c375bec8f295409874e170f015fc605a0f0deb7a5e44f9a9ffbc476745e73044 mobile-shell-b157a30ad43865e41e6cf5a632390d630b5a40df.tar.gz -ebc6985afbda5ddebcda44d8b6732a9abc2d7249aff3adf7a76a90aa681590f830dcf2e5f3534a624adc32d1f0445e261ee149d65c221f733e0c33e0690a004d libgnome-volume-control-8e7a5a4c3e51007ce6579292642517e3d3eb9c50.tar.gz -2ca70115fab957fdf276b7f0772786e1afd56b0b22bcfd92f5b5f1d29676dc97c19cfb079434d0dbf7b459f1d133dbd8d1faa0d88f7b94846040a23856f951f8 disable-telepathy-integration.patch -dba79b94ab4bcf0db51aa4a19c5fb52f9dae05909fe13531fe9dc06d9db334ac3328bd4040484eac8ef851057ee471a28d86800aa2ae82eec7274f5f79b9146a gsh.patch +56ab61732f7d477af37347f2c1e5070ed4eab6b1e020f94014fdaf2e3c1d002d43830d28ff8227a9332b5f3be82eed9901fee4afce10c0c40e5e3fbff3d2e6b8 gnome-shell-mobile-46-mobile-0.tar.gz +c832e99bc56ae586734d468e4e1a17f107acc76076d07ba45c46359ba751d1e6abe6108e43730fdf1dd18153cfa9f374e3e81118ae4902f0974d5b5f54f8276b libgnome-volume-control-91f3f41490666a526ed78af744507d7ee1134323.tar.gz +ae4ac679bacd35948b44068e5a70407f473bd96986ee126abb1bdf066db5cbc2087a3ffae0b390286689cacbe8325870fd43663ba39f4f7543216e02bf083934 gsh.patch " diff --git a/temp/gnome-shell-mobile/disable-telepathy-integration.patch b/temp/gnome-shell-mobile/disable-telepathy-integration.patch deleted file mode 100644 index afce81904..000000000 --- a/temp/gnome-shell-mobile/disable-telepathy-integration.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream: No, this is on our telepathy being broken somehow. -Reason: This is a hotfix to not break everyone's GNOME Session over this. -Issue opened, see: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2733 - -diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js -index b4af438..109d324 100644 ---- a/js/ui/components/telepathyClient.js -+++ b/js/ui/components/telepathyClient.js -@@ -18,7 +18,7 @@ const MessageTray = imports.ui.messageTray; - const Params = imports.misc.params; - const Util = imports.misc.util; - --const HAVE_TP = Tp != null && Tpl != null; -+const HAVE_TP = false; - - // See Notification.appendMessage - var SCROLLBACK_IMMEDIATE_TIME = 3 * 60; // 3 minutes diff --git a/temp/gnome-shell-mobile/gsh.patch b/temp/gnome-shell-mobile/gsh.patch index 63b6bf045..4b631055c 100644 --- a/temp/gnome-shell-mobile/gsh.patch +++ b/temp/gnome-shell-mobile/gsh.patch @@ -4,7 +4,7 @@ Author: Daniel Kolesa Date: Sun Mar 19 19:11:00 2023 +0100 Disable 9bc89b821cf09195418f20225bbec39c0567d263 - + Even if we manually define _DYNAMIC, it does not work (segfaults somewhere in musl, coming from g_strsplit) and is pretty useless for our case anyway. @@ -24,4 +24,3 @@ index 8cccc0a..ef6408f 100644 #ifdef HAVE_EXE_INTROSPECTION #include #endif -