From f8ed65aeaf14ebda7edc0f9d4f71913e984f32a3 Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Wed, 17 Mar 2021 16:28:54 -0400 Subject: [PATCH 1/5] Xwayland 21.1.0 --- packages/xwayland.rb | 91 ++++++++++---------------------------------- 1 file changed, 20 insertions(+), 71 deletions(-) diff --git a/packages/xwayland.rb b/packages/xwayland.rb index bd68897f8..430373df2 100644 --- a/packages/xwayland.rb +++ b/packages/xwayland.rb @@ -3,42 +3,38 @@ require 'package' class Xwayland < Package description 'X server configured to work with weston or sommelier' homepage 'https://x.org' - @_ver = '1.20.10' - version @_ver + '-3' + @_ver = '21.1.0' + version @_ver compatibility 'all' - source_url "https://github.com/freedesktop/xorg-xserver/archive/xorg-server-#{@_ver}.tar.gz" - source_sha256 '499d2b79fdf78e2e06b0c17a4d735fe25ba9d44f689e06a7e82612c35083c4ad' + source_url "https://xorg.freedesktop.org/archive/individual/xserver/xwayland-#{@_ver}.tar.xz" + source_sha256 '8a71c3e8b95c43bb91bc3d7a4ff9075456a0cfe297721dbc8d4a76cf241d82fb' - binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-3-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-3-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-3-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-3-chromeos-x86_64.tar.xz', + binary_url({ + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-21.1.0-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-21.1.0-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-21.1.0-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-21.1.0-chromeos-x86_64.tar.xz' }) - binary_sha256 ({ - aarch64: 'ac87ced50d92c75f578bd5738b81012b46bbcf4721c8b3c8074cb2963ca64d5c', - armv7l: 'ac87ced50d92c75f578bd5738b81012b46bbcf4721c8b3c8074cb2963ca64d5c', - i686: 'bdc936c7d24301256867aeb17200c669a424adeb9f009aeb602f205c228d5cf9', - x86_64: 'd20e78d4a44203eeeb7d6c3d33e7d50d777eb9a8016370f064f29a5b6be64e91', + binary_sha256({ + aarch64: 'c6951e26f866c161171598257d8f56ee94ca180d2d3dfb45d92871be230050eb', + armv7l: 'c6951e26f866c161171598257d8f56ee94ca180d2d3dfb45d92871be230050eb', + i686: 'aec35c04079a6187f9e637d09715bbea03343dded024672693cf6f49c21bd180', + x86_64: '584edc98ad46aa38da43d5174d533e4407b68f5f8fe7608a98bbcba72912c3e4' }) depends_on 'libepoxy' - depends_on 'xorg_proto' depends_on 'libxtrans' depends_on 'libxkbfile' depends_on 'wayland' depends_on 'eudev' depends_on 'libxfont' depends_on 'libbsd' - depends_on 'nettle' - depends_on 'libtirpc' depends_on 'pixman' depends_on 'graphite' depends_on 'libxkbcommon' depends_on 'libunwind' depends_on 'font_util' depends_on 'xorg_lib' - depends_on 'libtirpc' depends_on 'font_util' depends_on 'libbsd' depends_on 'dbus' @@ -46,52 +42,14 @@ class Xwayland < Package depends_on 'xkbcomp' depends_on 'glproto' depends_on 'mesa' - # Patches are from Google xwayland overlay at https://source.chromium.org/chromiumos/chromiumos/codesearch/+/master:src/third_party/chromiumos-overlay/x11-base/xwayland/files/ - - def self.patch - url_patch1 = "https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/067ac4b5060c16e6687a97cbb4bcdbaf5a0b5639/x11-base/xwayland/files/0001-Eliminate-conflict-with-X11-Xlib.h-with-khronos-eglp.patch?format=TEXT" - uri_patch1 = URI.parse url_patch1 - filename_patch1 = 'patch1_base64' - sha256sum_patch1 = '16f5d5d1986daf07b4e0f01eb0e68b53d8ef301d169f3cc9493158c8b4987f16' - puts "Downloading patch1".yellow - system('curl', '-s', '--insecure', '-L', '-#', url_patch1, '-o', filename_patch1) - abort 'Checksum mismatch. :/ Try again.'.lightred unless - Digest::SHA256.hexdigest( File.read( filename_patch1 ) ) == sha256sum_patch1 - puts "patch1 archive downloaded".lightgreen - system 'base64 --decode patch1_base64 > patch1' - system 'patch -p 1 < patch1' - url_patch2 = "https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/067ac4b5060c16e6687a97cbb4bcdbaf5a0b5639/x11-base/xwayland/files/0001-xwayland-Fall-back-to-gbm_bo_create-if-no-modifiers-.patch?format=TEXT" - uri_patch2 = URI.parse url_patch2 - filename_patch2 = 'patch2_base64' - sha256sum_patch2 = 'd44bfca0e26ca06892b37b12faca2a6756cdc2455aac36ac7607bfa188856b35' - puts "Downloading patch2".yellow - system('curl', '-s', '--insecure', '-L', '-#', url_patch2, '-o', filename_patch2) - abort 'Checksum mismatch. :/ Try again.'.lightred unless - Digest::SHA256.hexdigest( File.read( filename_patch2 ) ) == sha256sum_patch2 - puts "patch2 archive downloaded".lightgreen - system 'base64 --decode patch2_base64 > patch2' - system 'patch -p 1 < patch2' - - url_patch3 = "https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/067ac4b5060c16e6687a97cbb4bcdbaf5a0b5639/x11-base/xwayland/files/0001-xwayland-sysmacros.patch?format=TEXT" - uri_patch3 = URI.parse url_patch3 - filename_patch3 = 'patch3_base64' - sha256sum_patch3 = 'b66eb66cc8023ab2170db91e4d6038dca99b814addfcb0977d30479a2e514ab8' - puts "Downloading patch3".yellow - system('curl', '-s', '--insecure', '-L', '-#', url_patch3, '-o', filename_patch3) - abort 'Checksum mismatch. :/ Try again.'.lightred unless - Digest::SHA256.hexdigest( File.read( filename_patch3 ) ) == sha256sum_patch3 - puts "patch3 archive downloaded".lightgreen - system 'base64 --decode patch3_base64 > patch3' - system 'patch -F 10 --force -p 1 < patch3' - end case ARCH - when 'armv7l', 'aarch64' - PEER_CMD_PREFIX='/lib/ld-linux-armhf.so.3' - when 'i686' - PEER_CMD_PREFIX='/lib/ld-linux-i686.so.2' - when 'x86_64' - PEER_CMD_PREFIX='/lib64/ld-linux-x86-64.so.2' + when 'armv7l', 'aarch64' + PEER_CMD_PREFIX = '/lib/ld-linux-armhf.so.3'.freeze + when 'i686' + PEER_CMD_PREFIX = '/lib/ld-linux-i686.so.2'.freeze + when 'x86_64' + PEER_CMD_PREFIX = '/lib64/ld-linux-x86-64.so.2'.freeze end def self.build @@ -100,17 +58,8 @@ class Xwayland < Package -Db_asneeded=false \ -Dipv6=true \ -Dxvfb=true \ - -Dxnest=true \ -Dxcsecurity=true \ - -Dxorg=true \ - -Dxephyr=false \ - -Dxwayland=true \ -Dglamor=true \ - -Dudev=true \ - -Dxwin=false \ - -Dsystemd_logind=false \ - -Dint10=false \ - -Dlog_dir=#{CREW_PREFIX}/var/log \ build" system 'meson configure build' system 'ninja -C build' From f3f7e56004e9cc337826af0de6985d91254ccd0a Mon Sep 17 00:00:00 2001 From: satmandu Date: Wed, 17 Mar 2021 17:49:30 -0400 Subject: [PATCH 2/5] clean up depends --- packages/xwayland.rb | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/packages/xwayland.rb b/packages/xwayland.rb index 430373df2..cd97091e8 100644 --- a/packages/xwayland.rb +++ b/packages/xwayland.rb @@ -22,26 +22,24 @@ class Xwayland < Package x86_64: '584edc98ad46aa38da43d5174d533e4407b68f5f8fe7608a98bbcba72912c3e4' }) - depends_on 'libepoxy' - depends_on 'libxtrans' - depends_on 'libxkbfile' - depends_on 'wayland' - depends_on 'eudev' - depends_on 'libxfont' - depends_on 'libbsd' - depends_on 'pixman' - depends_on 'graphite' - depends_on 'libxkbcommon' - depends_on 'libunwind' - depends_on 'font_util' - depends_on 'xorg_lib' - depends_on 'font_util' - depends_on 'libbsd' depends_on 'dbus' - depends_on 'lzma' => :build - depends_on 'xkbcomp' + depends_on 'eudev' + depends_on 'font_util' depends_on 'glproto' + depends_on 'graphite' + depends_on 'libbsd' + depends_on 'libepoxy' + depends_on 'libunwind' + depends_on 'libxfont' + depends_on 'libxkbcommon' + depends_on 'libxkbfile' + depends_on 'libxtrans' + depends_on 'lzma' => :build depends_on 'mesa' + depends_on 'pixman' + depends_on 'wayland' + depends_on 'xkbcomp' + depends_on 'xorg_lib' case ARCH when 'armv7l', 'aarch64' From 3260431d0d7dc461d1738eccc6defc7504e2b9d2 Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Thu, 18 Mar 2021 12:11:08 -0400 Subject: [PATCH 3/5] fix moreutils deps --- packages/moreutils.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/moreutils.rb b/packages/moreutils.rb index 99ef9c39b..44cefc020 100644 --- a/packages/moreutils.rb +++ b/packages/moreutils.rb @@ -22,8 +22,8 @@ class Moreutils < Package x86_64: '55222b8e4293e548f812542fa7447e5420c1b7098c0ae481e1f0a0357dd84ed9', }) - depends_on 'docbook_xml' - depends_on 'libxslt' + depends_on 'docbook_xml' => :build + depends_on 'libxslt' => :build def self.build system "sed -i 's,PREFIX?=/usr,PREFIX?=#{CREW_PREFIX},' Makefile" From c0efc64654a9cd435b9e3be2e20d6e14f9596c05 Mon Sep 17 00:00:00 2001 From: saltedcoffii <55339220+saltedcoffii@users.noreply.github.com> Date: Thu, 18 Mar 2021 14:41:52 -0400 Subject: [PATCH 4/5] [Fix Package] autossh --- packages/autossh.rb | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/packages/autossh.rb b/packages/autossh.rb index e1de01314..b9cb6acf8 100644 --- a/packages/autossh.rb +++ b/packages/autossh.rb @@ -1,32 +1,21 @@ require 'package' class Autossh < Package - description 'The purpose of autossh is to start an SSH connection, monitor it, and restart it if necessary.' - homepage 'http://www.harding.motd.ca/autossh' - # No releases available so the only option is to use the master branch + description 'Automatically restart SSH sessions and tunnels' + homepage 'https://www.harding.motd.ca/autossh/' + version '1.4g' compatibility 'all' - version '9c72d3b' - source_url 'https://github.com/jonhiggs/autossh/archive/9c72d3b6f77bfe2ad57844128ea46019fecb7fdb.tar.gz' - source_sha256 '39497e1ccd80f781282e8f6387bb3ae5b1501807a39aeced95e8be57c3778cba' - - binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/autossh-9c72d3b-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/autossh-9c72d3b-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/autossh-9c72d3b-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/autossh-9c72d3b-chromeos-x86_64.tar.xz', - }) - binary_sha256 ({ - aarch64: 'd988e2b17d8c06773f099b8c6eb8db198de32af1a7fe2dfc39acd30b83e27db4', - armv7l: 'd988e2b17d8c06773f099b8c6eb8db198de32af1a7fe2dfc39acd30b83e27db4', - i686: 'd74acb98fc939fba9aaebf4993639ee3d9f11417ac6184ed1f57a88d4db56214', - x86_64: '48eda7fb01e8818fad3c0d4d9e3fb9f1b294fa26fe71b41c17e04dd11b3fa043', - }) + source_url 'https://www.harding.motd.ca/autossh/autossh-1.4g.tgz' + source_sha256 '5fc3cee3361ca1615af862364c480593171d0c54ec156de79fc421e31ae21277' + depends_on 'openssh' + def self.build - system "./configure --prefix=#{CREW_PREFIX}" + system "./configure #{CREW_OPTIONS} \ + --with-ssh=$(which ssh)" system "make" end - + def self.install system "mkdir -p #{CREW_DEST_PREFIX}/bin" system "mkdir -p #{CREW_DEST_PREFIX}/share/doc/autossh" From 2e83cf26f83af7dd25739e013ea6e95cbdbd8c95 Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Thu, 18 Mar 2021 15:51:51 -0400 Subject: [PATCH 5/5] add readline dep to libxml2 --- packages/libxml2.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/libxml2.rb b/packages/libxml2.rb index 1429cdaac..2e936874f 100644 --- a/packages/libxml2.rb +++ b/packages/libxml2.rb @@ -22,6 +22,7 @@ class Libxml2 < Package }) depends_on 'zlibpkg' + depends_on 'readline' def self.patch # Fix encoding.c:1961:31: error: ‘TRUE’ undeclared (first use in this function)