temp/gnome-shell-mobile: upgrade to 46-mobile-0 (MR 5396)

[ci:skip-build]: already built successfully in CI
This commit is contained in:
jane400 2024-07-28 13:18:53 +02:00 committed by Oliver Smith
parent c8fa59f985
commit 4321b29b99
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
3 changed files with 12 additions and 35 deletions

View file

@ -1,7 +1,7 @@
# Forked from Alpine to add phone adaptivity patches # Forked from Alpine to add phone adaptivity patches
pkgname=gnome-shell-mobile pkgname=gnome-shell-mobile
pkgver=45_git20240610 pkgver=46
pkgrel=0 pkgrel=0
pkgdesc="GNOME shell" pkgdesc="GNOME shell"
url="https://wiki.gnome.org/Projects/GnomeShell" url="https://wiki.gnome.org/Projects/GnomeShell"
@ -24,6 +24,7 @@ depends="
gstreamer gstreamer
ibus ibus
librsvg librsvg
mutter-mobile>=46
networkmanager-common networkmanager-common
tecla tecla
unzip unzip
@ -47,7 +48,7 @@ makedepends="
libxml2-dev libxml2-dev
libxml2-utils libxml2-utils
meson meson
mutter-mobile-dev>=45_git20230905 mutter-mobile-dev>=46
networkmanager-dev networkmanager-dev
pipewire-dev pipewire-dev
polkit-dev polkit-dev
@ -71,21 +72,16 @@ subpackages="
$pkgname-schemas::noarch $pkgname-schemas::noarch
gnome-mobile-extensions-app:extensions_app:noarch gnome-mobile-extensions-app:extensions_app:noarch
" "
_commit="b157a30ad43865e41e6cf5a632390d630b5a40df" _commit="46-mobile-0"
_gvc_commit="8e7a5a4c3e51007ce6579292642517e3d3eb9c50" _gvc_commit="91f3f41490666a526ed78af744507d7ee1134323"
source="mobile-shell-$_commit.tar.gz::https://gitlab.gnome.org/verdre/mobile-shell/-/archive/$_commit/mobile-shell-$_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 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
disable-telepathy-integration.patch
gsh.patch" gsh.patch"
builddir="$srcdir/mobile-shell-$_commit" builddir="$srcdir/gnome-shell-mobile-$_commit"
options="!check" # Tests have circular dependency 'gnome-shell <-> gdm' options="!check" # Tests have circular dependency 'gnome-shell <-> gdm'
# To make sure pmb_recommends installs the correct one # To make sure pmb_recommends installs the correct one
_pmb_recommends="gnome-mobile-extensions-app" _pmb_recommends="gnome-mobile-extensions-app"
# secfixes:
# 0:
# - CVE-2019-3820
prepare() { prepare() {
default_prepare default_prepare
rm -rf "$builddir/subprojects/gvc" rm -rf "$builddir/subprojects/gvc"
@ -141,8 +137,7 @@ package() {
} }
sha512sums=" sha512sums="
b2769404992877625893c8b6e401f499f17aa5b0f52fba8d7ccdfce1f6fc4531c375bec8f295409874e170f015fc605a0f0deb7a5e44f9a9ffbc476745e73044 mobile-shell-b157a30ad43865e41e6cf5a632390d630b5a40df.tar.gz 56ab61732f7d477af37347f2c1e5070ed4eab6b1e020f94014fdaf2e3c1d002d43830d28ff8227a9332b5f3be82eed9901fee4afce10c0c40e5e3fbff3d2e6b8 gnome-shell-mobile-46-mobile-0.tar.gz
ebc6985afbda5ddebcda44d8b6732a9abc2d7249aff3adf7a76a90aa681590f830dcf2e5f3534a624adc32d1f0445e261ee149d65c221f733e0c33e0690a004d libgnome-volume-control-8e7a5a4c3e51007ce6579292642517e3d3eb9c50.tar.gz c832e99bc56ae586734d468e4e1a17f107acc76076d07ba45c46359ba751d1e6abe6108e43730fdf1dd18153cfa9f374e3e81118ae4902f0974d5b5f54f8276b libgnome-volume-control-91f3f41490666a526ed78af744507d7ee1134323.tar.gz
2ca70115fab957fdf276b7f0772786e1afd56b0b22bcfd92f5b5f1d29676dc97c19cfb079434d0dbf7b459f1d133dbd8d1faa0d88f7b94846040a23856f951f8 disable-telepathy-integration.patch ae4ac679bacd35948b44068e5a70407f473bd96986ee126abb1bdf066db5cbc2087a3ffae0b390286689cacbe8325870fd43663ba39f4f7543216e02bf083934 gsh.patch
dba79b94ab4bcf0db51aa4a19c5fb52f9dae05909fe13531fe9dc06d9db334ac3328bd4040484eac8ef851057ee471a28d86800aa2ae82eec7274f5f79b9146a gsh.patch
" "

View file

@ -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

View file

@ -4,7 +4,7 @@ Author: Daniel Kolesa <daniel@octaforge.org>
Date: Sun Mar 19 19:11:00 2023 +0100 Date: Sun Mar 19 19:11:00 2023 +0100
Disable 9bc89b821cf09195418f20225bbec39c0567d263 Disable 9bc89b821cf09195418f20225bbec39c0567d263
Even if we manually define _DYNAMIC, it does not work (segfaults Even if we manually define _DYNAMIC, it does not work (segfaults
somewhere in musl, coming from g_strsplit) and is pretty useless somewhere in musl, coming from g_strsplit) and is pretty useless
for our case anyway. for our case anyway.
@ -24,4 +24,3 @@ index 8cccc0a..ef6408f 100644
#ifdef HAVE_EXE_INTROSPECTION #ifdef HAVE_EXE_INTROSPECTION
#include <elf.h> #include <elf.h>
#endif #endif