Commit b7677be1 authored by satmandu's avatar satmandu Committed by GitHub

xcb python3 incompatibility fix (#5257)

* xcb_proto -> 1.14.1

- tagged release with python3 fix

* Remove Python2 dep
parent 93ebede3
...@@ -3,26 +3,40 @@ require 'package' ...@@ -3,26 +3,40 @@ require 'package'
class Libxcb < Package class Libxcb < Package
description 'library for the X window system' description 'library for the X window system'
homepage 'https://x.org' homepage 'https://x.org'
version '1.14-1' version '1.14-2'
compatibility 'all' compatibility 'all'
source_url 'https://xcb.freedesktop.org/dist/libxcb-1.14.tar.xz' source_url 'https://xcb.freedesktop.org/dist/libxcb-1.14.tar.xz'
source_sha256 'a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34' source_sha256 'a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34'
depends_on 'python27' => :build binary_url({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libxcb-1.14-2-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libxcb-1.14-2-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/libxcb-1.14-2-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libxcb-1.14-2-chromeos-x86_64.tar.xz'
})
binary_sha256({
aarch64: '970a54ee26b5719351236de38fa8e714815f478fb76a53b07ed8458950f0e7e8',
armv7l: '970a54ee26b5719351236de38fa8e714815f478fb76a53b07ed8458950f0e7e8',
i686: '95447782172b761f15c728f2a5d0d99e7e34987ba069f0c788e225134e72eee9',
x86_64: 'b3d0f1ae99ab39ada872217c14bf137e7f77ff1f37c357408c649e19a152ec53'
})
depends_on 'xcb_proto' depends_on 'xcb_proto'
depends_on 'libxau' depends_on 'libxau'
depends_on 'pthread_stubs' depends_on 'pthread_stubs'
def self.build def self.build
system "env PYTHON=python2.7 \ system 'filefix'
./configure #{CREW_OPTIONS} \ system "env CFLAGS='-flto=auto' CXXFLAGS='-flto=auto' \
--enable-dri3 \ LDFLAGS='-flto=auto' \
--disable-xevie \ ./configure #{CREW_OPTIONS} \
--disable-devel-docs" --enable-dri3 \
system "make" --disable-xevie \
--disable-devel-docs"
system 'make'
end end
def self.install def self.install
system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
end end
end end
...@@ -3,26 +3,29 @@ require 'package' ...@@ -3,26 +3,29 @@ require 'package'
class Xcb_proto < Package class Xcb_proto < Package
description 'The protocols for the X window system provide extended functionality for communication between a X client and the server.' description 'The protocols for the X window system provide extended functionality for communication between a X client and the server.'
homepage 'https://x.org' homepage 'https://x.org'
version '1.14' version '1.14.1'
compatibility 'all' compatibility 'all'
source_url 'https://www.x.org/archive/individual/xcb/xcb-proto-1.14.tar.xz' source_url 'https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/archive/xcb-proto-1.14.1/xcbproto-xcb-proto-1.14.1.tar.bz2'
source_sha256 '186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605' source_sha256 '186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605'
binary_url ({ binary_url({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/xcb_proto-1.14-chromeos-armv7l.tar.xz', aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/xcb_proto-1.14.1-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/xcb_proto-1.14-chromeos-armv7l.tar.xz', armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/xcb_proto-1.14.1-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/xcb_proto-1.14-chromeos-i686.tar.xz', i686: 'https://dl.bintray.com/chromebrew/chromebrew/xcb_proto-1.14.1-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/xcb_proto-1.14-chromeos-x86_64.tar.xz', x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/xcb_proto-1.14.1-chromeos-x86_64.tar.xz'
}) })
binary_sha256 ({ binary_sha256({
aarch64: '5b8707e7904fcbc6cbbc2ca2c8fa87cad36c354eb1055e912ae127f5cfd4163c', aarch64: '44acc3a13eef02910837f702f2375cfe9b4ec84b29b21901dde05a20bb03cd5f',
armv7l: '5b8707e7904fcbc6cbbc2ca2c8fa87cad36c354eb1055e912ae127f5cfd4163c', armv7l: '44acc3a13eef02910837f702f2375cfe9b4ec84b29b21901dde05a20bb03cd5f',
i686: 'ecd7091cf0089fcb0b3b66c431a607e441cb9029d4e37f272ac548857b50b80a', i686: '43bd2fe4d681f2a13deef0eeb5b1e22850dc53c836613a18fe73f1c77267a03a',
x86_64: 'a4de2e1bdf7aacee5904d9854d365e87f87eff754fc8201341595788bd5bb686', x86_64: '6f7ccb0abc93a0b8156993ab46aa096bc087ae1c82eac33ef8924d7d69f3027f'
}) })
def self.build def self.build
system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}" system "env CFLAGS='-flto=auto' CXXFLAGS='-flto=auto' \
LDFLAGS='-flto=auto' \
./autogen.sh \
#{CREW_OPTIONS}"
system 'make' system 'make'
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment