systemd: upgrade gnome shell and mutter mobile to 46 (MR 5363) (MR 5563)
Upgrade to 46-mobile-0 [ci:skip-build]: already built successfully in CI
This commit is contained in:
Caleb Connolly
Oliver Smith
parent
4cb3bc64e8
commit
3caf2b8cd0
9 changed files with 28 additions and 97 deletions
|
|
@ -1,10 +1,10 @@
|
|||
# Forked from Alpine to add phone adaptivity patches and systemd!
|
||||
|
||||
pkgname=gnome-shell-mobile
|
||||
pkgver=99945_git20240610
|
||||
_pkgver=45_git20240610
|
||||
pkgver=99946.0
|
||||
_pkgver=46.0
|
||||
pkgrel=0
|
||||
pkgdesc="GNOME shell"
|
||||
pkgdesc="GNOME shell mobile"
|
||||
url="https://wiki.gnome.org/Projects/GnomeShell"
|
||||
# gjs / riscv64: mutter-mobile
|
||||
arch="all !armhf !s390x !riscv64"
|
||||
|
|
@ -50,7 +50,7 @@ makedepends="
|
|||
libxml2-dev
|
||||
libxml2-utils
|
||||
meson
|
||||
mutter-mobile-dev>=45_git20230905
|
||||
mutter-mobile-dev>=99946.0
|
||||
networkmanager-dev
|
||||
pipewire-dev
|
||||
polkit-dev
|
||||
|
|
@ -74,16 +74,13 @@ subpackages="
|
|||
$pkgname-schemas::noarch
|
||||
gnome-mobile-extensions-app:extensions_app:noarch
|
||||
"
|
||||
_commit="3a352e95bf540d663f35554ee2de5dcd1ff408bc"
|
||||
_commit="46-mobile-0"
|
||||
_gvc_commit="8e7a5a4c3e51007ce6579292642517e3d3eb9c50"
|
||||
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
|
||||
disable-telepathy-integration.patch
|
||||
gsh.patch
|
||||
gnome-shell-uclamp.sh
|
||||
uclamp-override.conf
|
||||
"
|
||||
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"
|
||||
|
|
@ -143,17 +140,10 @@ package() {
|
|||
|
||||
# owned by postmarketos-hidden-desktop-entries
|
||||
rm $pkgdir/usr/share/applications/org.gnome.Extensions.desktop
|
||||
|
||||
install -Dm755 "$srcdir/gnome-shell-uclamp.sh" "$pkgdir/usr/libexec/gnome-shell-uclamp"
|
||||
install -Dm644 "$srcdir/uclamp-override.conf" \
|
||||
"$pkgdir/etc/systemd/user/org.gnome.Shell@.service.d/override.conf"
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
036961581d1837fbd224448cf901780988264e8f0a0493607fc7c9649aec732f48e2a217d603eda744c10925865e3f8eb624c6519bb5ba63e00298f983959b74 mobile-shell-3a352e95bf540d663f35554ee2de5dcd1ff408bc.tar.gz
|
||||
56ab61732f7d477af37347f2c1e5070ed4eab6b1e020f94014fdaf2e3c1d002d43830d28ff8227a9332b5f3be82eed9901fee4afce10c0c40e5e3fbff3d2e6b8 gnome-shell-mobile-46-mobile-0.tar.gz
|
||||
ebc6985afbda5ddebcda44d8b6732a9abc2d7249aff3adf7a76a90aa681590f830dcf2e5f3534a624adc32d1f0445e261ee149d65c221f733e0c33e0690a004d libgnome-volume-control-8e7a5a4c3e51007ce6579292642517e3d3eb9c50.tar.gz
|
||||
2ca70115fab957fdf276b7f0772786e1afd56b0b22bcfd92f5b5f1d29676dc97c19cfb079434d0dbf7b459f1d133dbd8d1faa0d88f7b94846040a23856f951f8 disable-telepathy-integration.patch
|
||||
dba79b94ab4bcf0db51aa4a19c5fb52f9dae05909fe13531fe9dc06d9db334ac3328bd4040484eac8ef851057ee471a28d86800aa2ae82eec7274f5f79b9146a gsh.patch
|
||||
545d584307ee90894525a75b7c2b99c4e05d7f903dd2181509ca0c04c5711b50a539c2f1263a8dfe26380cf121817ff2eaecac38f4fc2d0bdde5629d73f7ee0c gnome-shell-uclamp.sh
|
||||
71ac6a8694ddcda211ff4060a55c374ae5b8eb7c3cd2a057b6eccac2c83b87bac18e09fda1d572054357d7f2e6e57b79f80a6a3cebeca75335931e1676011055 uclamp-override.conf
|
||||
40cafbd0da2f2a40ff9e9db1026179d52a3b296a81fa43a98e433c0919800f0ec5231fcad32d523b8f01b8f7c0205dce1332e48493b0101ad02dae9469ac3de0 gsh.patch
|
||||
"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#!/usr/bin/sh
|
||||
|
||||
sleep 5
|
||||
uclampset --pid $(pidof gnome-shell) -m 900 2>&1 >/dev/null || true
|
||||
|
||||
echo "Configured gnome-shell uclamp..."
|
||||
|
|
@ -13,15 +13,16 @@ diff --git a/src/main.c b/src/main.c
|
|||
index 8cccc0a..ef6408f 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -19,6 +19,10 @@
|
||||
@@ -20,8 +20,12 @@
|
||||
#include <meta/prefs.h>
|
||||
#include <atk-bridge.h>
|
||||
#include <link.h>
|
||||
|
||||
|
||||
+#ifdef HAVE_EXE_INTROSPECTION
|
||||
+#undef HAVE_EXE_INTROSPECTION
|
||||
+#endif
|
||||
+
|
||||
#ifdef HAVE_EXE_INTROSPECTION
|
||||
#include <dlfcn.h>
|
||||
#include <elf.h>
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
[Service]
|
||||
ExecStartPost=-/usr/libexec/gnome-shell-uclamp
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
# Forked from Alpine to apply mobile adaptivity patches
|
||||
|
||||
pkgname=mutter-mobile
|
||||
pkgver=99945_git20230908
|
||||
_pkgver=45_git20230908
|
||||
pkgver=99946.0
|
||||
_pkgver=46.0
|
||||
pkgrel=1
|
||||
pkgdesc="clutter-based window manager and compositor"
|
||||
url="https://wiki.gnome.org/Projects/Mutter/"
|
||||
|
|
@ -11,7 +11,7 @@ url="https://wiki.gnome.org/Projects/Mutter/"
|
|||
arch="all !riscv64"
|
||||
license="GPL-2.0-or-later"
|
||||
depends="
|
||||
gnome-settings-daemon
|
||||
gnome-settings-daemon-mobile
|
||||
gsettings-desktop-schemas
|
||||
mutter-mobile-schemas
|
||||
xkeyboard-config
|
||||
|
|
@ -27,7 +27,7 @@ makedepends="
|
|||
gdk-pixbuf-dev
|
||||
glib-dev
|
||||
gnome-desktop-dev
|
||||
gnome-settings-daemon-dev
|
||||
gnome-settings-daemon-mobile-dev
|
||||
gobject-introspection-dev
|
||||
graphene-dev
|
||||
gtk+3.0-dev
|
||||
|
|
@ -67,13 +67,11 @@ 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="0f08f5aba4c9b5ac34b2d5711182d50b719d838e"
|
||||
source="mobile-mutter-$_commit.tar.gz::https://gitlab.gnome.org/verdre/mobile-mutter/-/archive/$_commit/mobile-mutter-$_commit.tar.gz
|
||||
fixudev-req.patch
|
||||
_commit="46-mobile-0"
|
||||
source="mutter-mobile-$_commit.tar.gz::https://gitlab.gnome.org/verdre/mutter-mobile/-/archive/$_commit/mutter-mobile-$_commit.tar.gz
|
||||
pcversion.patch
|
||||
version.patch
|
||||
"
|
||||
builddir="$srcdir/mobile-mutter-$_commit"
|
||||
builddir="$srcdir/mutter-mobile-$_commit"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
|
|
@ -122,8 +120,6 @@ package() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
715c3efbbf416a11ae0a723184d1e018d3679c876bc419f110da1200f9dad3b7719255ac81cca301cff55e16ba36578bc9906805599ff009faeebf9455f5bcb1 mobile-mutter-0f08f5aba4c9b5ac34b2d5711182d50b719d838e.tar.gz
|
||||
6f21171bbd0ad0fc67cbaf5fb1478b22b482a9ae33b9328cc51a5dd31bcf7d95cd41e6cbbac21d3d8801cc064a62a64ae38ed7d0501ab605b861058c32f3bc30 fixudev-req.patch
|
||||
bb46a4692aaff0c9e6092d1ba80d19b336035e983f0f20a437a586757bc2530860f50fbd46b09f73e88f0dd80ea7188d1df467b8f762918717785e618b6e9c4b pcversion.patch
|
||||
a9a82e945081480ae7ce59098aa3e46c87f5ea97481bd4c4933b3ef0a1757492ecb6e8453e8a2f74fb42edd51d39f76aaf9ef45ad8c52008acd6bbcbec219f83 version.patch
|
||||
97de32571ca2aeeee4d213e085fc22d0c9f669ec8d24219a5a4205f21a2e0b261f8e6d042248262926df27e0530b7a0501922d1efde5278f8c23507909d1fa84 mutter-mobile-46-mobile-0.tar.gz
|
||||
2f2379d1f6676c69ba182d008d44c3d216ba5044af56352c785f4c34d17aeb0ac98a539827371d06ade7c2b42b06f916753c736167d2d89c0053b0a0e738c5d5 pcversion.patch
|
||||
"
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
Apparently the version limit is only required for systemd udev, it works
|
||||
just fine with our version of eudev.
|
||||
|
||||
diff --git meson.build meson.build
|
||||
index dc210e6..6e080ca 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -168,7 +168,7 @@ endif
|
||||
|
||||
have_libgudev = get_option('udev')
|
||||
if have_libgudev
|
||||
- libudev_dep = dependency('libudev', version: udev_req)
|
||||
+ libudev_dep = dependency('libudev')
|
||||
gudev_dep = dependency('gudev-1.0', version: gudev_req)
|
||||
endif
|
||||
|
||||
|
|
@ -1,14 +1,16 @@
|
|||
apk-tools 2.12.10 fails with this in a .pc depends file
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 3550496..15b9e7d 100644
|
||||
index e29c5001bcad..3f21f10cf49a 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -25,7 +25,7 @@ uprof_req = '>= 0.3'
|
||||
@@ -25,9 +25,9 @@ gdk_pixbuf_req = '>= 2.0'
|
||||
pango_req = '>= 1.46.0'
|
||||
cairo_req = '>= 1.10.0'
|
||||
pangocairo_req = '>= 1.20'
|
||||
pixman_req = '>= 0.42'
|
||||
-gsettings_desktop_schemas_req = '>= 40.alpha'
|
||||
+gsettings_desktop_schemas_req = '>= 40'
|
||||
json_glib_req = '>= 0.12.0'
|
||||
+gsettings_desktop_schemas_req = '>= 40_alpha'
|
||||
x11_req = '>= 1.7.0'
|
||||
xcomposite_req = '>= 0.4'
|
||||
xkbcommon_req = '>= 0.4.3'
|
||||
xfixes_req = '>= 6'
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
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'
|
||||
Loading…
Add table
Add a link
Reference in a new issue