mirror of
https://github.com/chromebrew/chromebrew.git
synced 2026-01-09 15:37:56 -05:00
Update dbus and deps. — dbus libice libsm libx11 libxau (#12318)
* Update libice, libsm, libx11, libxau Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Remove keys from env hash if they are blank. (This fixes the libx11 build.) Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Add binaries and add dbus update Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Add libsm builds Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Adjust libice compatibility. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * dbus: Package File Update Run on linux/386 container. * Adjust linter handoff workflow. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * lint const.rb Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Adjust workflow to add reviewers. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Remove i686 libice manifest. Signed-off-by: Satadru Pramanik <satadru@gmail.com> --------- Signed-off-by: Satadru Pramanik <satadru@gmail.com> Co-authored-by: chromebrew-actions[bot] <chromebrew-actions[bot]@users.noreply.github.com>
This commit is contained in:
Satadru Pramanik, DO, MPH, MEng
committed by
GitHub
GitHub
parent
50736691b9
commit
f1b12b14e4
1
.github/workflows/Generate-PR.yml
vendored
1
.github/workflows/Generate-PR.yml
vendored
@@ -405,6 +405,7 @@ jobs:
|
||||
PR_NUMBER=$(gh pr create ${PR_DRAFT_FLAG} --reviewer chromebrew/active --title "$(echo "${{ inputs.pr_title || inputs.branch || github.ref_name }}" | sed -e "s/^'//" -e "s/'$//") — ${CHANGED_PACKAGES}" -F /tmp/pr.txt | rev | cut -d"/" -f1 | rev)
|
||||
else
|
||||
gh pr edit --title "$(echo "${{ inputs.pr_title || inputs.branch || github.ref_name }}" | sed -e "s/^'//" -e "s/'$//") — ${CHANGED_PACKAGES}" -F /tmp/pr.txt
|
||||
gh pr edit --add-reviewer chromebrew/active
|
||||
fi
|
||||
# Draft PRs can not be set to automerge.
|
||||
if [[ $DRAFT_PR == 'true' ]]; then
|
||||
|
||||
2
.github/workflows/Linter-Handoff.yml
vendored
2
.github/workflows/Linter-Handoff.yml
vendored
@@ -37,7 +37,7 @@ jobs:
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Update branch
|
||||
if: ${{ github.event.action != 'synchronize' }}
|
||||
if: ${{ github.event.action != 'synchronize' || !contains(github.ref_name, '/merge') }}
|
||||
run: |
|
||||
git fetch origin
|
||||
git checkout "${{ github.ref_name }}"
|
||||
|
||||
@@ -4,7 +4,7 @@ require 'etc'
|
||||
require 'open3'
|
||||
|
||||
OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0'
|
||||
CREW_VERSION ||= '1.63.8' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
|
||||
CREW_VERSION ||= '1.63.9' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
|
||||
|
||||
# Kernel architecture.
|
||||
KERN_ARCH ||= Etc.uname[:machine]
|
||||
@@ -250,7 +250,7 @@ CREW_ENV_OPTIONS_HASH ||=
|
||||
'FFLAGS' => CREW_COMMON_FLAGS,
|
||||
'LIBRARY_PATH' => CREW_GLIBC_INTERPRETER.nil? ? '' : "#{CREW_GLIBC_PREFIX}:#{CREW_LIB_PREFIX}",
|
||||
'LDFLAGS' => CREW_LINKER_FLAGS
|
||||
}
|
||||
}.reject { |_k, v| v == '' }
|
||||
end
|
||||
|
||||
# parse from hash to shell readable string
|
||||
@@ -263,7 +263,7 @@ CREW_ENV_FNO_LTO_OPTIONS_HASH ||= {
|
||||
'FFLAGS' => CREW_COMMON_FNO_LTO_FLAGS,
|
||||
'LIBRARY_PATH' => CREW_GLIBC_INTERPRETER.nil? ? '' : "#{CREW_GLIBC_PREFIX}:#{CREW_LIB_PREFIX}",
|
||||
'LDFLAGS' => CREW_FNO_LTO_LDFLAGS
|
||||
}
|
||||
}.reject { |_k, v| v == '' }
|
||||
# parse from hash to shell readable string
|
||||
CREW_ENV_FNO_LTO_OPTIONS ||= CREW_ENV_FNO_LTO_OPTIONS_HASH.map { |k, v| "#{k}=\"#{v}\"" }.join(' ')
|
||||
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
/usr/local/lib/libXau.so.6
|
||||
/usr/local/lib/libXau.so.6.0.0
|
||||
/usr/local/lib/pkgconfig/xau.pc
|
||||
/usr/local/share/man/man3/Xau.3.gz
|
||||
/usr/local/share/man/man3/XauDisposeAuth.3.gz
|
||||
/usr/local/share/man/man3/XauFileName.3.gz
|
||||
/usr/local/share/man/man3/XauGetAuthByAddr.3.gz
|
||||
/usr/local/share/man/man3/XauGetBestAuthByAddr.3.gz
|
||||
/usr/local/share/man/man3/XauLockAuth.3.gz
|
||||
/usr/local/share/man/man3/XauReadAuth.3.gz
|
||||
/usr/local/share/man/man3/XauUnlockAuth.3.gz
|
||||
/usr/local/share/man/man3/XauWriteAuth.3.gz
|
||||
/usr/local/share/man/man3/Xau.3.zst
|
||||
/usr/local/share/man/man3/XauDisposeAuth.3.zst
|
||||
/usr/local/share/man/man3/XauFileName.3.zst
|
||||
/usr/local/share/man/man3/XauGetAuthByAddr.3.zst
|
||||
/usr/local/share/man/man3/XauGetBestAuthByAddr.3.zst
|
||||
/usr/local/share/man/man3/XauLockAuth.3.zst
|
||||
/usr/local/share/man/man3/XauReadAuth.3.zst
|
||||
/usr/local/share/man/man3/XauUnlockAuth.3.zst
|
||||
/usr/local/share/man/man3/XauWriteAuth.3.zst
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
/usr/local/include/X11/ICE/ICE.h
|
||||
/usr/local/include/X11/ICE/ICEconn.h
|
||||
/usr/local/include/X11/ICE/ICElib.h
|
||||
/usr/local/include/X11/ICE/ICEmsg.h
|
||||
/usr/local/include/X11/ICE/ICEproto.h
|
||||
/usr/local/include/X11/ICE/ICEutil.h
|
||||
/usr/local/lib/libICE.a
|
||||
/usr/local/lib/libICE.la
|
||||
/usr/local/lib/libICE.so
|
||||
/usr/local/lib/libICE.so.6
|
||||
/usr/local/lib/libICE.so.6.3.0
|
||||
/usr/local/lib/pkgconfig/ice.pc
|
||||
/usr/local/share/doc/libICE/ICElib.xml
|
||||
/usr/local/share/doc/libICE/ice.xml
|
||||
@@ -5,12 +5,12 @@
|
||||
/usr/local/lib/libXau.so.6
|
||||
/usr/local/lib/libXau.so.6.0.0
|
||||
/usr/local/lib/pkgconfig/xau.pc
|
||||
/usr/local/share/man/man3/Xau.3.gz
|
||||
/usr/local/share/man/man3/XauDisposeAuth.3.gz
|
||||
/usr/local/share/man/man3/XauFileName.3.gz
|
||||
/usr/local/share/man/man3/XauGetAuthByAddr.3.gz
|
||||
/usr/local/share/man/man3/XauGetBestAuthByAddr.3.gz
|
||||
/usr/local/share/man/man3/XauLockAuth.3.gz
|
||||
/usr/local/share/man/man3/XauReadAuth.3.gz
|
||||
/usr/local/share/man/man3/XauUnlockAuth.3.gz
|
||||
/usr/local/share/man/man3/XauWriteAuth.3.gz
|
||||
/usr/local/share/man/man3/Xau.3.zst
|
||||
/usr/local/share/man/man3/XauDisposeAuth.3.zst
|
||||
/usr/local/share/man/man3/XauFileName.3.zst
|
||||
/usr/local/share/man/man3/XauGetAuthByAddr.3.zst
|
||||
/usr/local/share/man/man3/XauGetBestAuthByAddr.3.zst
|
||||
/usr/local/share/man/man3/XauLockAuth.3.zst
|
||||
/usr/local/share/man/man3/XauReadAuth.3.zst
|
||||
/usr/local/share/man/man3/XauUnlockAuth.3.zst
|
||||
/usr/local/share/man/man3/XauWriteAuth.3.zst
|
||||
|
||||
@@ -5,12 +5,12 @@
|
||||
/usr/local/lib64/libXau.so.6
|
||||
/usr/local/lib64/libXau.so.6.0.0
|
||||
/usr/local/lib64/pkgconfig/xau.pc
|
||||
/usr/local/share/man/man3/Xau.3.gz
|
||||
/usr/local/share/man/man3/XauDisposeAuth.3.gz
|
||||
/usr/local/share/man/man3/XauFileName.3.gz
|
||||
/usr/local/share/man/man3/XauGetAuthByAddr.3.gz
|
||||
/usr/local/share/man/man3/XauGetBestAuthByAddr.3.gz
|
||||
/usr/local/share/man/man3/XauLockAuth.3.gz
|
||||
/usr/local/share/man/man3/XauReadAuth.3.gz
|
||||
/usr/local/share/man/man3/XauUnlockAuth.3.gz
|
||||
/usr/local/share/man/man3/XauWriteAuth.3.gz
|
||||
/usr/local/share/man/man3/Xau.3.zst
|
||||
/usr/local/share/man/man3/XauDisposeAuth.3.zst
|
||||
/usr/local/share/man/man3/XauFileName.3.zst
|
||||
/usr/local/share/man/man3/XauGetAuthByAddr.3.zst
|
||||
/usr/local/share/man/man3/XauGetBestAuthByAddr.3.zst
|
||||
/usr/local/share/man/man3/XauLockAuth.3.zst
|
||||
/usr/local/share/man/man3/XauReadAuth.3.zst
|
||||
/usr/local/share/man/man3/XauUnlockAuth.3.zst
|
||||
/usr/local/share/man/man3/XauWriteAuth.3.zst
|
||||
|
||||
@@ -3,7 +3,7 @@ require 'buildsystems/meson'
|
||||
class Dbus < Meson
|
||||
description 'D-Bus is a message bus system, a simple way for applications to talk to one another.'
|
||||
homepage 'https://www.freedesktop.org/wiki/Software/dbus/'
|
||||
version '1.16.0'
|
||||
version '1.16.2'
|
||||
license 'Apache-2.0'
|
||||
compatibility 'all'
|
||||
source_url 'https://gitlab.freedesktop.org/dbus/dbus.git'
|
||||
@@ -11,10 +11,10 @@ class Dbus < Meson
|
||||
binary_compression 'tar.zst'
|
||||
|
||||
binary_sha256({
|
||||
aarch64: 'a59af1d22ad1a8c7124ad4c5eb123196d84c47040226d0556c969edc3a560d58',
|
||||
armv7l: 'a59af1d22ad1a8c7124ad4c5eb123196d84c47040226d0556c969edc3a560d58',
|
||||
i686: 'f55865c5c6f8ba1f2cc3651debc1e848d6f703adeabdce3125eac3b9684baa81',
|
||||
x86_64: 'c28c9fbda77f5125d6201cb164a8e94842fbaf32eec3a871b636e3ec239b3112'
|
||||
aarch64: '9ba0963aed2de17697928e7d3ce9527c684ec061216b815d7c1ceb99eac8ef3e',
|
||||
armv7l: '9ba0963aed2de17697928e7d3ce9527c684ec061216b815d7c1ceb99eac8ef3e',
|
||||
i686: 'c8c844aea251b77c0c476aa7057d51a28ae29484064515a2c84933a40530a486',
|
||||
x86_64: '35187f9b328840273764745c73d119b25ad19d355a58db9a439efa29e90315b5'
|
||||
})
|
||||
|
||||
depends_on 'expat' # R
|
||||
|
||||
@@ -1,37 +1,23 @@
|
||||
require 'package'
|
||||
require 'buildsystems/autotools'
|
||||
|
||||
class Libice < Package
|
||||
class Libice < Autotools
|
||||
description 'X.org X Inter Client Exchange Library'
|
||||
homepage 'https://www.x.org/wiki/'
|
||||
version '1.1.0'
|
||||
version '1.1.2'
|
||||
license 'X11'
|
||||
compatibility 'all'
|
||||
compatibility 'aarch64 armv7l x86_64'
|
||||
source_url 'https://gitlab.freedesktop.org/xorg/lib/libice.git'
|
||||
git_hashtag "libICE-#{version}"
|
||||
binary_compression 'tar.zst'
|
||||
|
||||
binary_sha256({
|
||||
aarch64: '98119ae9368b7d11644676afac7d66a220bc5329f41b236004e5c3f76e2ce7ec',
|
||||
armv7l: '98119ae9368b7d11644676afac7d66a220bc5329f41b236004e5c3f76e2ce7ec',
|
||||
i686: 'aa06dc806a8c3b32e8bcd401297d19bddf05689927842001be65cd66b0fc96b2',
|
||||
x86_64: '58bbc7896230e0d630360a6b4686b7c41f40f44f1477da31bff7cde929569752'
|
||||
aarch64: '69815ffd1178e0c19ad9f8a4d4b8fc7b34aeb09c7aaae0c4a8c70692fdc61fe1',
|
||||
armv7l: '69815ffd1178e0c19ad9f8a4d4b8fc7b34aeb09c7aaae0c4a8c70692fdc61fe1',
|
||||
x86_64: 'a476eef6ec924b373c9f3b68e4ec19ce35fd7b10b5c9c5381c464b5f0d46b78b'
|
||||
})
|
||||
|
||||
depends_on 'libxtrans' => :build
|
||||
depends_on 'libx11' => :build
|
||||
depends_on 'libbsd' # R
|
||||
depends_on 'glibc' # R
|
||||
depends_on 'libmd' # R
|
||||
|
||||
patchelf
|
||||
|
||||
def self.build
|
||||
system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh'
|
||||
system "./configure #{CREW_CONFIGURE_OPTIONS}"
|
||||
system 'make'
|
||||
end
|
||||
|
||||
def self.install
|
||||
system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
|
||||
end
|
||||
depends_on 'libbsd' # R
|
||||
depends_on 'libx11' => :build
|
||||
depends_on 'libxtrans' => :build
|
||||
end
|
||||
|
||||
@@ -3,23 +3,22 @@ require 'buildsystems/autotools'
|
||||
class Libsm < Autotools
|
||||
description 'X.org X Session Management Library'
|
||||
homepage 'https://www.x.org/wiki/'
|
||||
version '1.2.4-5edd20b'
|
||||
version '1.2.6'
|
||||
license 'MIT'
|
||||
compatibility 'aarch64 armv7l x86_64'
|
||||
source_url 'https://gitlab.freedesktop.org/xorg/lib/libsm.git'
|
||||
git_hashtag '5edd20b307ce70ccb14c360f1b94914c49544a24'
|
||||
git_hashtag "libSM-#{version}"
|
||||
binary_compression 'tar.zst'
|
||||
|
||||
binary_sha256({
|
||||
aarch64: '0bddd0de07a4a833a9b6ae2238eb549f5f012f6dfc0a79062551f39ca02c5ec8',
|
||||
armv7l: '0bddd0de07a4a833a9b6ae2238eb549f5f012f6dfc0a79062551f39ca02c5ec8',
|
||||
x86_64: '3177c18fbb37de01bb93cab3ee821a50987034e5fa146a48e6eb581ebb8cf773'
|
||||
aarch64: '63dbc08e85a3feaeffeb0e740aa04dc60a8cd0e64921dc082d3d5082224c301b',
|
||||
armv7l: '63dbc08e85a3feaeffeb0e740aa04dc60a8cd0e64921dc082d3d5082224c301b',
|
||||
x86_64: '99b718f764e99b76ffa64b8bc92a5d061a3d1d38a40148eae2546a1f61d80fe1'
|
||||
})
|
||||
|
||||
depends_on 'glibc' # R
|
||||
depends_on 'libbsd' # R
|
||||
depends_on 'libice' # R
|
||||
depends_on 'libmd' # R
|
||||
depends_on 'libx11' => :build
|
||||
depends_on 'libxtrans' => :build
|
||||
depends_on 'util_linux' # R
|
||||
|
||||
@@ -3,7 +3,7 @@ require 'buildsystems/autotools'
|
||||
class Libx11 < Autotools
|
||||
description 'C interface to the X window system'
|
||||
homepage 'https://x.org/wiki/'
|
||||
version '1.8.10'
|
||||
version '1.8.12'
|
||||
license 'X11'
|
||||
compatibility 'aarch64 armv7l x86_64'
|
||||
source_url 'https://gitlab.freedesktop.org/xorg/lib/libx11.git'
|
||||
@@ -11,14 +11,12 @@ class Libx11 < Autotools
|
||||
binary_compression 'tar.zst'
|
||||
|
||||
binary_sha256({
|
||||
aarch64: '3e992951cf49ed047e4ef45e45b87b640e5aafed4a0614543d7c6957613dd463',
|
||||
armv7l: '3e992951cf49ed047e4ef45e45b87b640e5aafed4a0614543d7c6957613dd463',
|
||||
x86_64: '55c2d33cc673cec976f9f628204da0f02e83a92aae0936a42a231df81d5dd05c'
|
||||
aarch64: '9d9aacc2ecc3e54fa78057498456e235304c4f11f2e834d4120961b69070b0ea',
|
||||
armv7l: '9d9aacc2ecc3e54fa78057498456e235304c4f11f2e834d4120961b69070b0ea',
|
||||
x86_64: '472ca926ca8cf52d5ee45b609c329e955630920a8116663d25d1dc38cf649c33'
|
||||
})
|
||||
|
||||
depends_on 'glibc' # R
|
||||
depends_on 'libbsd' # R
|
||||
depends_on 'libmd' # R
|
||||
depends_on 'libxau' # R
|
||||
depends_on 'libxcb' # R
|
||||
depends_on 'libxdmcp' # R
|
||||
|
||||
@@ -1,32 +1,22 @@
|
||||
require 'package'
|
||||
require 'buildsystems/autotools'
|
||||
|
||||
class Libxau < Package
|
||||
class Libxau < Autotools
|
||||
description 'xau library for libX11'
|
||||
homepage 'https://x.org/wiki/'
|
||||
version '1.0.10'
|
||||
version '1.0.12'
|
||||
license 'MIT'
|
||||
compatibility 'all'
|
||||
source_url 'https://www.x.org/archive/individual/lib/libXau-1.0.10.tar.xz'
|
||||
source_sha256 '8be6f292334d2f87e5b919c001e149a9fdc27005d6b3e053862ac6ebbf1a0c0a'
|
||||
source_url 'https://gitlab.freedesktop.org/xorg/lib/libxau.git'
|
||||
git_hashtag "libXau-#{version}"
|
||||
binary_compression 'tar.zst'
|
||||
|
||||
binary_sha256({
|
||||
aarch64: '3a16d88d627e0762f6218f80794921dff3aa84f5b04d3cafe9d4bca32220aa11',
|
||||
armv7l: '3a16d88d627e0762f6218f80794921dff3aa84f5b04d3cafe9d4bca32220aa11',
|
||||
i686: 'e3507ff2731ec3413951cd04221aeef7811174c4c7aaa6094201b255423bb43d',
|
||||
x86_64: '4220fa07f5da76d1021d1cdbda1e12eefb8e3c27fc5f0f999d8de8396a38f3e1'
|
||||
aarch64: 'd2d4b68dad1338995d5e858b83532a7329a4ffc99203ff0ba820ce022c6d4858',
|
||||
armv7l: 'd2d4b68dad1338995d5e858b83532a7329a4ffc99203ff0ba820ce022c6d4858',
|
||||
i686: 'c1f87fde13a850c3ccf7116d7d5648642eafd6b32047a9962ec08726b04f4d70',
|
||||
x86_64: '6adc15c51c5e1c26c9a1d728a2370a1578faba40a74cbee925a181d01f939aa6'
|
||||
})
|
||||
|
||||
depends_on 'xorg_proto'
|
||||
depends_on 'glibc' # R
|
||||
|
||||
def self.build
|
||||
system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh'
|
||||
system "./configure #{CREW_CONFIGURE_OPTIONS}"
|
||||
system 'make'
|
||||
end
|
||||
|
||||
def self.install
|
||||
system "make DESTDIR=#{CREW_DEST_DIR} install"
|
||||
end
|
||||
depends_on 'xorg_proto'
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user