mirror of
https://github.com/chromebrew/chromebrew.git
synced 2026-01-08 23:18:10 -05:00
Update wayland_protocols, fix wayland_info compat, have crew identify incompatible packages when throwing incompatibility error (#9754)
* update wayland_protocols, rename wayland_info and fix compat, have crew identify incompatible packages when throwing incompatibility error Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Revert naming changes Signed-off-by: Satadru Pramanik <satadru@gmail.com> * rebuild binaries Signed-off-by: Satadru Pramanik <satadru@gmail.com> * fixup packages.yaml Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Add fake package for wayland_utils Signed-off-by: Satadru Pramanik <satadru@gmail.com> --------- Signed-off-by: Satadru Pramanik <satadru@gmail.com>
This commit is contained in:
Satadru Pramanik, DO, MPH, MEng
committed by
GitHub
GitHub
parent
0f61f465ef
commit
3febdc1091
7
bin/crew
7
bin/crew
@@ -1195,9 +1195,10 @@ def resolve_dependencies
|
||||
# leave only dependency names (remove all package attributes returned by @pkg.get_deps_list)
|
||||
@dependencies.map!(&:keys).flatten!
|
||||
|
||||
# abort if we have incompatible dependencies
|
||||
abort "Some dependencies are not compatible with your device architecture (#{ARCH}). Unable to continue.".lightred if @dependencies.any? { |dep| !PackageUtils.compatible?(Package.load_package("#{CREW_PACKAGES_PATH}/#{dep}.rb")) }
|
||||
|
||||
# abort & identify incompatible dependencies.
|
||||
@dependencies.each do |dep|
|
||||
abort "Some dependencies e.g., #{dep}, are not compatible with your device architecture (#{ARCH}). Unable to continue.".lightred unless PackageUtils.compatible?(Package.load_package("#{CREW_PACKAGES_PATH}/#{dep}.rb"))
|
||||
end
|
||||
# leave only not installed packages in dependencies
|
||||
@dependencies.reject! { |dep_name| @device[:installed_packages].any? { |pkg| pkg[:name] == dep_name } }
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Defines common constants used in different parts of crew
|
||||
require 'etc'
|
||||
|
||||
CREW_VERSION = '1.47.6'
|
||||
CREW_VERSION = '1.47.7'
|
||||
|
||||
# kernel architecture
|
||||
KERN_ARCH = Etc.uname[:machine]
|
||||
|
||||
45
manifest/i686/w/wayland_protocols.filelist
Normal file
45
manifest/i686/w/wayland_protocols.filelist
Normal file
@@ -0,0 +1,45 @@
|
||||
/usr/local/share/pkgconfig/wayland-protocols.pc
|
||||
/usr/local/share/wayland-protocols/stable/linux-dmabuf/linux-dmabuf-v1.xml
|
||||
/usr/local/share/wayland-protocols/stable/presentation-time/presentation-time.xml
|
||||
/usr/local/share/wayland-protocols/stable/tablet/tablet-v2.xml
|
||||
/usr/local/share/wayland-protocols/stable/viewporter/viewporter.xml
|
||||
/usr/local/share/wayland-protocols/stable/xdg-shell/xdg-shell.xml
|
||||
/usr/local/share/wayland-protocols/staging/alpha-modifier/alpha-modifier-v1.xml
|
||||
/usr/local/share/wayland-protocols/staging/content-type/content-type-v1.xml
|
||||
/usr/local/share/wayland-protocols/staging/cursor-shape/cursor-shape-v1.xml
|
||||
/usr/local/share/wayland-protocols/staging/drm-lease/drm-lease-v1.xml
|
||||
/usr/local/share/wayland-protocols/staging/ext-foreign-toplevel-list/ext-foreign-toplevel-list-v1.xml
|
||||
/usr/local/share/wayland-protocols/staging/ext-idle-notify/ext-idle-notify-v1.xml
|
||||
/usr/local/share/wayland-protocols/staging/ext-session-lock/ext-session-lock-v1.xml
|
||||
/usr/local/share/wayland-protocols/staging/ext-transient-seat/ext-transient-seat-v1.xml
|
||||
/usr/local/share/wayland-protocols/staging/fractional-scale/fractional-scale-v1.xml
|
||||
/usr/local/share/wayland-protocols/staging/linux-drm-syncobj/linux-drm-syncobj-v1.xml
|
||||
/usr/local/share/wayland-protocols/staging/security-context/security-context-v1.xml
|
||||
/usr/local/share/wayland-protocols/staging/single-pixel-buffer/single-pixel-buffer-v1.xml
|
||||
/usr/local/share/wayland-protocols/staging/tearing-control/tearing-control-v1.xml
|
||||
/usr/local/share/wayland-protocols/staging/xdg-activation/xdg-activation-v1.xml
|
||||
/usr/local/share/wayland-protocols/staging/xdg-dialog/xdg-dialog-v1.xml
|
||||
/usr/local/share/wayland-protocols/staging/xdg-toplevel-drag/xdg-toplevel-drag-v1.xml
|
||||
/usr/local/share/wayland-protocols/staging/xwayland-shell/xwayland-shell-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/fullscreen-shell/fullscreen-shell-unstable-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/input-method/input-method-unstable-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/input-timestamps/input-timestamps-unstable-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/linux-explicit-synchronization/linux-explicit-synchronization-unstable-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/pointer-gestures/pointer-gestures-unstable-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/primary-selection/primary-selection-unstable-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/relative-pointer/relative-pointer-unstable-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/tablet/tablet-unstable-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/tablet/tablet-unstable-v2.xml
|
||||
/usr/local/share/wayland-protocols/unstable/text-input/text-input-unstable-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/text-input/text-input-unstable-v3.xml
|
||||
/usr/local/share/wayland-protocols/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/xdg-foreign/xdg-foreign-unstable-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml
|
||||
/usr/local/share/wayland-protocols/unstable/xdg-output/xdg-output-unstable-v1.xml
|
||||
/usr/local/share/wayland-protocols/unstable/xdg-shell/xdg-shell-unstable-v5.xml
|
||||
/usr/local/share/wayland-protocols/unstable/xdg-shell/xdg-shell-unstable-v6.xml
|
||||
/usr/local/share/wayland-protocols/unstable/xwayland-keyboard-grab/xwayland-keyboard-grab-unstable-v1.xml
|
||||
@@ -8,7 +8,7 @@ class Gdk_base < Package
|
||||
compatibility 'all'
|
||||
source_url 'SKIP'
|
||||
|
||||
depends_on 'wayland_info'
|
||||
depends_on 'wayland_info' # L
|
||||
|
||||
no_compile_needed
|
||||
|
||||
|
||||
@@ -1,21 +1,20 @@
|
||||
require 'buildsystems/meson'
|
||||
|
||||
class Wayland_info < Meson
|
||||
description 'wayland-info is a utility for displaying information about the Wayland protocols supported by a Wayland compositor.'
|
||||
description 'Provides wayland-info, a standalone version of the weston-info utility for displaying information about the Wayland protocols supported by a Wayland compositor.'
|
||||
homepage 'https://gitlab.freedesktop.org/wayland/wayland-utils'
|
||||
version '1.2.0'
|
||||
license 'MIT/Expat'
|
||||
compatibility 'all'
|
||||
min_glibc '2.34'
|
||||
source_url 'https://gitlab.freedesktop.org/wayland/wayland-utils.git'
|
||||
git_hashtag version
|
||||
binary_compression 'tar.zst'
|
||||
|
||||
binary_sha256({
|
||||
aarch64: 'fe9c7444babd95c443f4807a08a5f5441d7c0827f53e5c2a4a38fd083e6edec1',
|
||||
armv7l: 'fe9c7444babd95c443f4807a08a5f5441d7c0827f53e5c2a4a38fd083e6edec1',
|
||||
i686: '93adf54ced18ea647a10be36a96c1e2b369149d5d6a584b55d30818ab88ab479',
|
||||
x86_64: '74ab29066adc68ed529bee0f1e57314a9244b5d9bb2109c193c52ebf5a709851'
|
||||
aarch64: '2e9a0b23b60ad89d46a579661f88e92de74d23f0400b7b89c0873088255c64ba',
|
||||
armv7l: '2e9a0b23b60ad89d46a579661f88e92de74d23f0400b7b89c0873088255c64ba',
|
||||
i686: '8700677d65661f0c0264a628edf3b7d549973fea47a09ef079c6ccc9f1baacf7',
|
||||
x86_64: '3dd8ce56664f9affa0d56bf7c3a36f6d99b6f7a723edbc4694540b4df5624281'
|
||||
})
|
||||
|
||||
depends_on 'glibc' # R
|
||||
|
||||
@@ -3,17 +3,18 @@ require 'buildsystems/meson'
|
||||
class Wayland_protocols < Meson
|
||||
description 'Wayland is a protocol for a compositor to talk to its clients.'
|
||||
homepage 'https://wayland.freedesktop.org/'
|
||||
version '1.35'
|
||||
version '1.36'
|
||||
license 'MIT'
|
||||
compatibility 'x86_64 aarch64 armv7l'
|
||||
compatibility 'all'
|
||||
source_url 'https://gitlab.freedesktop.org/wayland/wayland-protocols.git'
|
||||
git_hashtag version
|
||||
binary_compression 'tar.zst'
|
||||
|
||||
binary_sha256({
|
||||
aarch64: 'efa077d40d08d1d63f9ee617c015fa82ad9505785902e6711eabc5a9c9cb33f1',
|
||||
armv7l: 'efa077d40d08d1d63f9ee617c015fa82ad9505785902e6711eabc5a9c9cb33f1',
|
||||
x86_64: 'd4cb8740a82798f2fc6e350261402befe96e7382efae253c46c5e1e8ad3a4fc2'
|
||||
i686: 'a2a0b604dc5d561f4a4707a7917141ab5495eccbaf6551d210609869523978aa',
|
||||
aarch64: '2deac94ce13d674e267185959a0b05e1dd478a08ac0b3af6d01df739ec085924',
|
||||
armv7l: '2deac94ce13d674e267185959a0b05e1dd478a08ac0b3af6d01df739ec085924',
|
||||
x86_64: 'e4e76a920bb7ba97f065e82a0ec3237d405db18614b48ec16c8489b4e831e943'
|
||||
})
|
||||
|
||||
depends_on 'wayland' # L
|
||||
|
||||
14
packages/wayland_utils.rb
Normal file
14
packages/wayland_utils.rb
Normal file
@@ -0,0 +1,14 @@
|
||||
require 'package'
|
||||
require_relative 'wayland_info'
|
||||
|
||||
class Wayland_utils < Package
|
||||
description Wayland_info.description
|
||||
homepage Wayland_info.homepage
|
||||
version Wayland_info.version
|
||||
license Wayland_info.license
|
||||
compatibility Wayland_info.compatibility
|
||||
|
||||
is_fake
|
||||
|
||||
depends_on 'wayland_info'
|
||||
end
|
||||
@@ -9023,7 +9023,7 @@ activity: high
|
||||
kind: url
|
||||
name: wayland_info
|
||||
url: https://gitlab.freedesktop.org/wayland/wayland-utils/-/tags
|
||||
activity: medium
|
||||
activity: low
|
||||
---
|
||||
kind: url
|
||||
name: wayland_protocols
|
||||
|
||||
Reference in New Issue
Block a user