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

This commit is contained in:
jane400 2024-07-28 12:55:15 +02:00 committed by Oliver Smith
parent d2bc34a5e6
commit c8fa59f985
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
4 changed files with 12 additions and 50 deletions

View file

@ -1,8 +1,8 @@
# Forked from Alpine to apply mobile adaptivity patches
pkgname=mutter-mobile
pkgver=45_git20230908
pkgrel=1
pkgver=46.0
pkgrel=0
pkgdesc="clutter-based window manager and compositor"
url="https://wiki.gnome.org/Projects/Mutter/"
# ricsv64: doesn't build currently:
@ -10,7 +10,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
@ -26,7 +26,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
@ -116,8 +114,6 @@ package() {
}
sha512sums="
715c3efbbf416a11ae0a723184d1e018d3679c876bc419f110da1200f9dad3b7719255ac81cca301cff55e16ba36578bc9906805599ff009faeebf9455f5bcb1 mobile-mutter-0f08f5aba4c9b5ac34b2d5711182d50b719d838e.tar.gz
6f21171bbd0ad0fc67cbaf5fb1478b22b482a9ae33b9328cc51a5dd31bcf7d95cd41e6cbbac21d3d8801cc064a62a64ae38ed7d0501ab605b861058c32f3bc30 fixudev-req.patch
b0f2fc36b6eeb7b49aed4a689c1a8d982d22f0b9d246c4c47ae950d5b06c5fe900ac5b0640a2d25ec97042a83138c51e87d878f74dc016774205cfc8bbf06f00 pcversion.patch
a9a82e945081480ae7ce59098aa3e46c87f5ea97481bd4c4933b3ef0a1757492ecb6e8453e8a2f74fb42edd51d39f76aaf9ef45ad8c52008acd6bbcbec219f83 version.patch
97de32571ca2aeeee4d213e085fc22d0c9f669ec8d24219a5a4205f21a2e0b261f8e6d042248262926df27e0530b7a0501922d1efde5278f8c23507909d1fa84 mutter-mobile-46-mobile-0.tar.gz
670927a5528f9fec4801b7dab8a377b7280c239acb1f7a9077647deef71119738deb958a94d4ce0a99d39b29eeab3b2505698f7d19b880bbcec9f5260202d3a6 pcversion.patch
"

View file

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

View file

@ -3,13 +3,12 @@ diff --git a/meson.build b/meson.build
index 3550496..15b9e7d 100644
--- a/meson.build
+++ b/meson.build
@@ -25,7 +25,7 @@ uprof_req = '>= 0.3'
pango_req = '>= 1.46.0'
@@ -26,7 +26,7 @@
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'
x11_req = '>= 1.7.0'
xcomposite_req = '>= 0.4'
xkbcommon_req = '>= 0.4.3'
libei_req = '>= 1.0.0'

View file

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