x_updates — xa => 2.4.1,xauth => 1.1.4,xbitmaps => 1.1.3,xcb_util_cursor => 0.1.5,xcb_util_image => 0.4.1,xcb_util_keysyms => 0.4.1,xcb_util_renderutil => 0.3.10,xcb_util_wm => 0.4.2,xcb_util_xrm => 1.3-2 (#12460)

* More X updates Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Adjust xbitmaps source Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Add xcb_util_image build Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Adjust xauth source Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Adjust xauth build and version detection. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Add gperf Signed-off-by: Satadru Pramanik <satadru@gmail.com> * x_updates: Build Run on linux/386. * x_updates: Package File Update Run on linux/386 container. * x_updates: Package File Update Run on linux/amd64 container. * x_updates: Package File Update Run on linux/arm/v7 container. * Add more xcb updates Signed-off-by: Satadru Pramanik <satadru@gmail.com> * x_updates: Package File Update Run on linux/386 container. * Updte xcb_util_xrm Signed-off-by: Satadru Pramanik <satadru@gmail.com> * x_updates: Package File Update Run on linux/arm/v7 container. * fix typo Signed-off-by: Satadru Pramanik <satadru@gmail.com> * remove filelist Signed-off-by: Satadru Pramanik <satadru@gmail.com> --------- Signed-off-by: Satadru Pramanik <satadru@gmail.com> Co-authored-by: Satadru Pramanik <satadru@gmail.com> Co-authored-by: satmandu <satmandu@users.noreply.github.com>
2026-01-10 07:57:59 -05:00 · 2025-08-14 20:30:43 -05:00
parent 311939079a
commit 8117f22bb4
16 changed files with 133 additions and 197 deletions
--- a/lib/const.rb
+++ b/lib/const.rb
@@ -4,7 +4,7 @@ require 'etc'
 require 'open3'

 OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0'
-CREW_VERSION ||= '1.64.4' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
+CREW_VERSION ||= '1.64.5' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION

 # Kernel architecture.
 KERN_ARCH ||= Etc.uname[:machine]
@@ -190,7 +190,8 @@ unless defined?(CREW_ANITYA_PACKAGE_NAME_MAPPINGS)
    { pkg_name: 'cf', anitya_pkg: 'cf', comments: 'Prefer to Github' },
    { pkg_name: 'cvs', anitya_pkg: 'cvs-stable', comments: '' },
    { pkg_name: 'py3_atspi', anitya_pkg: 'pyatspi', comments: '' },
-    { pkg_name: 'signal_desktop', anitya_pkg: 'signal', comments: '' }
+    { pkg_name: 'signal_desktop', anitya_pkg: 'signal', comments: '' },
+    { pkg_name: 'xauth', anitya_pkg: 'xorg-x11-xauth', comments: '' }
  ].to_h { |h| [h[:pkg_name], h[:anitya_pkg]] }
 end

--- a/manifest/armv7l/x/xa.filelist
+++ b/manifest/armv7l/x/xa.filelist
@@ -4,9 +4,9 @@
 /usr/local/bin/reloc65
 /usr/local/bin/uncpk
 /usr/local/bin/xa
-/usr/local/share/man/man1/file65.1.gz
-/usr/local/share/man/man1/ldo65.1.gz
-/usr/local/share/man/man1/printcbm.1.gz
-/usr/local/share/man/man1/reloc65.1.gz
-/usr/local/share/man/man1/uncpk.1.gz
-/usr/local/share/man/man1/xa.1.gz
+/usr/local/share/man/man1/file65.1.zst
+/usr/local/share/man/man1/ldo65.1.zst
+/usr/local/share/man/man1/printcbm.1.zst
+/usr/local/share/man/man1/reloc65.1.zst
+/usr/local/share/man/man1/uncpk.1.zst
+/usr/local/share/man/man1/xa.1.zst
--- a/manifest/armv7l/x/xauth.filelist
+++ b/manifest/armv7l/x/xauth.filelist
@@ -1,2 +1,2 @@
 /usr/local/bin/xauth
-/usr/local/share/man/man1/xauth.1.gz
+/usr/local/share/man/man1/xauth.1.zst
--- a/manifest/i686/x/xa.filelist
+++ b/manifest/i686/x/xa.filelist
@@ -4,9 +4,9 @@
 /usr/local/bin/reloc65
 /usr/local/bin/uncpk
 /usr/local/bin/xa
-/usr/local/share/man/man1/file65.1.gz
-/usr/local/share/man/man1/ldo65.1.gz
-/usr/local/share/man/man1/printcbm.1.gz
-/usr/local/share/man/man1/reloc65.1.gz
-/usr/local/share/man/man1/uncpk.1.gz
-/usr/local/share/man/man1/xa.1.gz
+/usr/local/share/man/man1/file65.1.zst
+/usr/local/share/man/man1/ldo65.1.zst
+/usr/local/share/man/man1/printcbm.1.zst
+/usr/local/share/man/man1/reloc65.1.zst
+/usr/local/share/man/man1/uncpk.1.zst
+/usr/local/share/man/man1/xa.1.zst
--- a/manifest/i686/x/xcb_util_xrm.filelist
+++ b/manifest/i686/x/xcb_util_xrm.filelist
@@ -1,7 +0,0 @@
-/usr/local/include/xcb/xcb_xrm.h
-/usr/local/lib/libxcb-xrm.a
-/usr/local/lib/libxcb-xrm.la
-/usr/local/lib/libxcb-xrm.so
-/usr/local/lib/libxcb-xrm.so.0
-/usr/local/lib/libxcb-xrm.so.0.0.0
-/usr/local/lib/pkgconfig/xcb-xrm.pc
--- a/manifest/x86_64/x/xa.filelist
+++ b/manifest/x86_64/x/xa.filelist
@@ -4,9 +4,9 @@
 /usr/local/bin/reloc65
 /usr/local/bin/uncpk
 /usr/local/bin/xa
-/usr/local/share/man/man1/file65.1.gz
-/usr/local/share/man/man1/ldo65.1.gz
-/usr/local/share/man/man1/printcbm.1.gz
-/usr/local/share/man/man1/reloc65.1.gz
-/usr/local/share/man/man1/uncpk.1.gz
-/usr/local/share/man/man1/xa.1.gz
+/usr/local/share/man/man1/file65.1.zst
+/usr/local/share/man/man1/ldo65.1.zst
+/usr/local/share/man/man1/printcbm.1.zst
+/usr/local/share/man/man1/reloc65.1.zst
+/usr/local/share/man/man1/uncpk.1.zst
+/usr/local/share/man/man1/xa.1.zst
--- a/manifest/x86_64/x/xauth.filelist
+++ b/manifest/x86_64/x/xauth.filelist
@@ -1,2 +1,2 @@
 /usr/local/bin/xauth
-/usr/local/share/man/man1/xauth.1.gz
+/usr/local/share/man/man1/xauth.1.zst
--- a/packages/xa.rb
+++ b/packages/xa.rb
@@ -3,18 +3,18 @@ require 'package'
 class Xa < Package
  description 'xa is a high-speed, two-pass portable cross-assembler.'
  homepage 'https://www.floodgap.com/retrotech/xa/'
-  version '2.3.11'
+  version '2.4.1'
  license 'GPL-2'
  compatibility 'all'
-  source_url 'https://www.floodgap.com/retrotech/xa/dists/xa-2.3.11.tar.gz'
+  source_url "https://www.floodgap.com/retrotech/xa/dists/xa-#{version}.tar.gz"
  source_sha256 '32f2164c99e305218e992970856dd8e2309b5cb6ac4758d7b2afe3bfebc9012d'
-  binary_compression 'tar.xz'
+  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: '4e9da9aa44ec5d58c597d5f3fcbba2ba3786002e0da6adebe381c4c70f90cda6',
-     armv7l: '4e9da9aa44ec5d58c597d5f3fcbba2ba3786002e0da6adebe381c4c70f90cda6',
-       i686: '9b60a965368eb960b9d06fd80c47be53e30b3a622c966b20a0f7eb04ae051e70',
-     x86_64: '8ea3b2dd25b9b6af9401c653e84ea67c1ba7ce2228d9d8e83d6ab8e3732893d7'
+    aarch64: '6655914025fa35b6e2a626e1779407a3f894510c8e2c766fbccba67afdbccc3e',
+     armv7l: '6655914025fa35b6e2a626e1779407a3f894510c8e2c766fbccba67afdbccc3e',
+       i686: '91fa492bf0232bbd54e1d38d0b87d253e64a0ca0da702034b4c59140408258b1',
+     x86_64: 'd36c75469a74c8f02dbe12ad6be6f47cadfc5f24fc22367ecf108fefae1b5254'
  })

  def self.patch
--- a/packages/xauth.rb
+++ b/packages/xauth.rb
@@ -1,19 +1,19 @@
-require 'package'
+require 'buildsystems/autotools'

-class Xauth < Package
+class Xauth < Autotools
  description 'X authority file utility'
  homepage 'https://www.x.org/archive/X11R6.8.1/doc/xauth.1.html'
-  version '1.1.2'
+  version '1.1.4'
  license 'MIT-with-advertising'
  compatibility 'aarch64 armv7l x86_64'
-  source_url 'https://www.x.org/releases/individual/app/xauth-1.1.2.tar.xz'
-  source_sha256 '78ba6afd19536ced1dddb3276cba6e9555a211b468a06f95f6a97c62ff8ee200'
+  source_url 'https://gitlab.freedesktop.org/xorg/app/xauth.git'
+  git_hashtag "xauth-#{version}"
  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: '45f2927b7cdcb468a7b1bfa5a686033152c82102761556a21c54ad4cca1f7496',
-     armv7l: '45f2927b7cdcb468a7b1bfa5a686033152c82102761556a21c54ad4cca1f7496',
-     x86_64: 'ff7990530301e1a63dd79a7ef7d67c152acbce582204f77eb2c29bb0bc8b53c7'
+    aarch64: '562e0d8445ab4be079b36ea1182a8f02159f9b9e2fea68ca2408021fb7d84323',
+     armv7l: '562e0d8445ab4be079b36ea1182a8f02159f9b9e2fea68ca2408021fb7d84323',
+     x86_64: '4891ea00bf649cd7d9e85f63f8270ae81788f32691720f6a69edb8c3ec61a913'
  })

  depends_on 'libx11' # R
@@ -22,16 +22,8 @@ class Xauth < Package
  depends_on 'libxmu' # R
  depends_on 'glibc' # R

-  def self.build
-    system "./configure #{CREW_CONFIGURE_OPTIONS} \
-           --enable-ipv6 \
+  autotools_configure_options '--enable-ipv6 \
           --enable-tcp-transport \
           --enable-unix-transport \
-           --enable-local-transport"
-    system 'make'
-  end
-
-  def self.install
-    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
-  end
+           --enable-local-transport'
 end
--- a/packages/xbitmaps.rb
+++ b/packages/xbitmaps.rb
@@ -1,30 +1,21 @@
-require 'package'
+require 'buildsystems/autotools'

-class Xbitmaps < Package
+class Xbitmaps < Autotools
  description 'The xbitmaps package contains bitmap images used by multiple applications built in Xorg chapter.'
  homepage 'https://www.x.org/wiki/'
-  version '1.1.1'
+  version '1.1.3'
  license 'MIT'
  compatibility 'all'
-  source_url 'https://www.x.org/pub/individual/data/xbitmaps-1.1.1.tar.bz2'
-  source_sha256 '3671b034356bbc4d32d052808cf646c940ec8b2d1913adac51b1453e41aa1e9d'
-  binary_compression 'tar.xz'
+  source_url 'https://gitlab.freedesktop.org/xorg/data/bitmaps.git'
+  git_hashtag "xbitmaps-#{version}"
+  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: 'f593f78a6db4cf69e97da6a07e954971a8623164799161bca5fd7e717085720d',
-     armv7l: 'f593f78a6db4cf69e97da6a07e954971a8623164799161bca5fd7e717085720d',
-       i686: 'c02b3e780b87551954cf975020a5065a8277f935f769b5d56fe80b8ccfd8b50d',
-     x86_64: '161b342836f77df11606c5fa965b38912022d108569313d504a0bc5d1bce4c16'
+    aarch64: 'b0a13a0a16e121c1d62ead9a064f08ba95239fc1d560296e116525707b654667',
+     armv7l: 'b0a13a0a16e121c1d62ead9a064f08ba95239fc1d560296e116525707b654667',
+       i686: '7b1d1167e9eb2f328403d601ac8c5528e342f1564378ff1baeb2e4f93fb32c83',
+     x86_64: 'd277b2d353dfa8efc9be26faa44a149bb33024cd130bca495c0d9a176ce7c3e2'
  })

  depends_on 'xorg_macros' => :build
-
-  def self.build
-    system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}"
-    system 'make'
-  end
-
-  def self.install
-    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
-  end
 end
--- a/packages/xcb_util_cursor.rb
+++ b/packages/xcb_util_cursor.rb
@@ -1,40 +1,30 @@
-require 'package'
+require 'buildsystems/autotools'

-class Xcb_util_cursor < Package
+class Xcb_util_cursor < Autotools
  description 'The xcb-util-cursor package provides a module that implements the XCB cursor library. It is a the XCB replacement for libXcursor.'
  homepage 'https://xcb.freedesktop.org/'
-  version '0.1.4'
+  version '0.1.5'
  license 'MIT-with-advertising'
  compatibility 'all'
-  source_url 'https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.4.tar.xz'
-  source_sha256 '28dcfe90bcab7b3561abe0dd58eb6832aa9cc77cfe42fcdfa4ebe20d605231fb'
+  source_url 'https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor.git'
+  git_hashtag "xcb-util-cursor-#{version}"
  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: '6024a6c057f93b6f2fb41607cd4b94ce5d790dc0dec95c16279c0461f6d9c8b0',
-     armv7l: '6024a6c057f93b6f2fb41607cd4b94ce5d790dc0dec95c16279c0461f6d9c8b0',
-       i686: '2e8232bf927297a009da0171ed1a456294c74f1104f99b8fe71aae2bcb904529',
-     x86_64: '0b93d9946e1c41c3fc77c638a76d17d314593ccaa938b0898f57c02076b8c6c5'
+    aarch64: '318d1c11c6e9bc645b9cacc2625e499cd10fd000c41db9b0698d814948133514',
+     armv7l: '318d1c11c6e9bc645b9cacc2625e499cd10fd000c41db9b0698d814948133514',
+       i686: 'a2beef88e82efe8e8904db22d6298b5da7a2c7687ef2e6e91b2ec7aea95821bd',
+     x86_64: 'b9bc0bea5efb9fba07368c41d971b0839e0a87cc8e29d5b135d7151c7dd35afd'
  })

-  depends_on 'xcb_util'
-  depends_on 'm4'
-  depends_on 'xcb_util_renderutil'
-  depends_on 'xcb_util_image'
  depends_on 'glibc' # R
+  depends_on 'gperf' => :build
  depends_on 'libbsd' # R
-  depends_on 'libmd' # R
  depends_on 'libxau' # R
  depends_on 'libxcb' # R
  depends_on 'libxdmcp' # 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 'm4'
+  depends_on 'xcb_util'
+  depends_on 'xcb_util_image'
+  depends_on 'xcb_util_renderutil'
 end
--- a/packages/xcb_util_image.rb
+++ b/packages/xcb_util_image.rb
@@ -1,30 +1,25 @@
-require 'package'
+require 'buildsystems/autotools'

-class Xcb_util_image < Package
+class Xcb_util_image < Autotools
  description 'The xcb-util-image package provides additional extensions to the XCB library.'
  homepage 'https://xcb.freedesktop.org/'
-  version '0.4.0-1'
+  version '0.4.1'
  compatibility 'all'
  license 'MIT-with-advertising'
-  source_url 'https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2'
-  source_sha256 '2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc'
-  binary_compression 'tpxz'
+  source_url 'https://gitlab.freedesktop.org/xorg/lib/libxcb-image.git'
+  git_hashtag "xcb-util-image-#{version}"
+  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: '5b98d3f85937bfe7f272b7ab39406ee4a645c583a0792fded18e74a82603769e',
-     armv7l: '5b98d3f85937bfe7f272b7ab39406ee4a645c583a0792fded18e74a82603769e',
-       i686: '8f539e6fa5753bc8bef0d873fd0a12a66e8a17fd5b61bf94b75b0268e567fe1e',
-     x86_64: 'f6934d3b2cf842afb62fa1b421a29260a8fbb2be5567977661552c4a3d43d941'
+    aarch64: 'c0277e43aa81434f869327be52541f88672ad33d468d2fcb1801cf76e7204468',
+     armv7l: 'c0277e43aa81434f869327be52541f88672ad33d468d2fcb1801cf76e7204468',
+       i686: 'd89423a977f7d80ac85d7ee25cd3f6ed85c5fb740560a9e748df68f0a02c5191',
+     x86_64: '2a88f98ad97aa0ff5e237dde4b820ce58120c327633c5c56d4549d23afe965e8'
  })

-  depends_on 'xcb_util'
-
-  def self.build
-    system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}"
-    system 'make'
-  end
-
-  def self.install
-    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
-  end
+  depends_on 'glibc' # R
+  depends_on 'libbsd' # R
+  depends_on 'libxau' # R
+  depends_on 'libxcb' # R
+  depends_on 'xcb_util' => :build
 end
--- a/packages/xcb_util_keysyms.rb
+++ b/packages/xcb_util_keysyms.rb
@@ -1,30 +1,23 @@
-require 'package'
+require 'buildsystems/autotools'

-class Xcb_util_keysyms < Package
+class Xcb_util_keysyms < Autotools
  description 'The xcb-util-keysyms package contains a library for handling standard X key constants and conversion to/from keycodes.'
  homepage 'https://xcb.freedesktop.org/'
-  version '0.4.0-1'
+  version '0.4.1'
  compatibility 'all'
  license 'MIT-with-advertising'
-  source_url 'https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2'
-  source_sha256 '0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9'
-  binary_compression 'tpxz'
+  source_url 'https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms.git'
+  git_hashtag "xcb-util-keysyms-#{version}"
+  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: 'dc00e514a928a196fde0c698810b2f6b63b83e29e680d489d50c049aafb8ad18',
-     armv7l: 'dc00e514a928a196fde0c698810b2f6b63b83e29e680d489d50c049aafb8ad18',
-       i686: '5469ba85929b5eb6c0726049f5e298d531ce3b7a522ea4b8d2c1eac0d8c97913',
-     x86_64: 'a5eef2ec3f6258191bfd5284f7b5fd4f2b60dcc5e40df7fff4ebc29c5e2266e8'
+    aarch64: '2e1aab68b9fc16c6bbdde2a96a88c4d70e4f95ca7c7c6bad64999a4c381582fe',
+     armv7l: '2e1aab68b9fc16c6bbdde2a96a88c4d70e4f95ca7c7c6bad64999a4c381582fe',
+       i686: 'e0564edbf2534623934a840c8500b7df660b25f91196d548f9c7c199a0196793',
+     x86_64: 'a8905397714291fcfd8d8efd81fcd17dea59e8ae41a83da850754c2b16ed4737'
  })

-  depends_on 'libxcb'
-
-  def self.build
-    system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}"
-    system 'make'
-  end
-
-  def self.install
-    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
-  end
+  depends_on 'glibc' # R
+  depends_on 'libbsd' # R
+  depends_on 'libxau' # R
 end
--- a/packages/xcb_util_renderutil.rb
+++ b/packages/xcb_util_renderutil.rb
@@ -1,30 +1,23 @@
-require 'package'
+require 'buildsystems/autotools'

-class Xcb_util_renderutil < Package
+class Xcb_util_renderutil < Autotools
  description 'The xcb-util-renderutil package provides additional extensions to the XCB library'
  homepage 'https://xcb.freedesktop.org/'
-  version '0.3.9-1'
+  version '0.3.10'
  compatibility 'all'
  license 'MIT-with-advertising'
-  source_url 'https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2'
-  source_sha256 'c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b'
-  binary_compression 'tpxz'
+  source_url 'https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util.git'
+  git_hashtag "xcb-util-renderutil-#{version}"
+  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: '1129f723592633bc655e902f5a8715294fbb16b68de40e9113735cf1f24dc618',
-     armv7l: '1129f723592633bc655e902f5a8715294fbb16b68de40e9113735cf1f24dc618',
-       i686: '4100d5c0a01b165790d6993cd6bcc1e73b9e3ff6e2e7f5c09b3ac9425cf2bc59',
-     x86_64: 'ffe1a614f538c63b4665b044c3ffe335f6fcf0331d850f8e10307ffa7ed24a2e'
+    aarch64: '8bef0641c124c63ab43a5258fff69061d5c29215dba6435f6bd198a0f962f9a6',
+     armv7l: '8bef0641c124c63ab43a5258fff69061d5c29215dba6435f6bd198a0f962f9a6',
+       i686: 'd58020baa86070d0ba6cf6299d2b19cfd7660182781a7dcf703a2b905dd86031',
+     x86_64: '5d656eec964bedb059c208b15a069027d3921795c2e1cc2f219b7fd4e09536c4'
  })

-  depends_on 'libxcb'
-
-  def self.build
-    system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}"
-    system 'make'
-  end
-
-  def self.install
-    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
-  end
+  depends_on 'glibc' # R
+  depends_on 'libbsd' # R
+  depends_on 'libxau' # R
 end
--- a/packages/xcb_util_wm.rb
+++ b/packages/xcb_util_wm.rb
@@ -1,31 +1,23 @@
-require 'package'
+require 'buildsystems/autotools'

-class Xcb_util_wm < Package
+class Xcb_util_wm < Autotools
  description 'The xcb-util-wm package contains libraries which provide client and window-manager helpers for EWMH and ICCCM.'
  homepage 'https://xcb.freedesktop.org/'
-  version '0.4.1-1'
+  version '0.4.2'
  compatibility 'all'
  license 'MIT-with-advertising'
-  source_url 'https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2'
-  source_sha256 '28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f'
-  binary_compression 'tpxz'
+  source_url 'https://gitlab.freedesktop.org/xorg/lib/libxcb-wm.git'
+  git_hashtag "xcb-util-wm-#{version}"
+  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: '860d613c9e5ddb61f6cc91f1a12a3c31733e7c489de988b904708ae557e092d5',
-     armv7l: '860d613c9e5ddb61f6cc91f1a12a3c31733e7c489de988b904708ae557e092d5',
-       i686: 'c30f8f2da2d2493e53929556390ef1e140ac53e6e785c30a1ecc7adb4c26dfb6',
-     x86_64: '2db848479b901c4a9cdb59723ad1f96c549707c9edd7975c1620bf1e96307615'
+    aarch64: 'cd3f107f18b447d79b5b93d7ad040ff1fb9d111266749c2a95d7e01e533143fb',
+     armv7l: 'cd3f107f18b447d79b5b93d7ad040ff1fb9d111266749c2a95d7e01e533143fb',
+       i686: '5eeaccb04005b786d69e21f1edab01616e1875e3e617a9e7567da2e0d509db21',
+     x86_64: '927bb5dc470f70d8fbe5d2f690470ad15e13458ab8254c3e7e15df2c40385bf2'
  })

-  depends_on 'libxcb'
-  depends_on 'm4'
-
-  def self.build
-    system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}"
-    system 'make'
-  end
-
-  def self.install
-    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
-  end
+  depends_on 'glibc' # R
+  depends_on 'libbsd' # R
+  depends_on 'libxau' # R
 end
--- a/packages/xcb_util_xrm.rb
+++ b/packages/xcb_util_xrm.rb
@@ -1,28 +1,24 @@
-require 'package'
+require 'buildsystems/autotools'

-class Xcb_util_xrm < Package
+class Xcb_util_xrm < Autotools
  description 'XCB utility functions for the X resource manager'
  homepage 'https://github.com/Airblader/xcb-util-xrm'
-  version '1.3-1'
-  compatibility 'all'
+  version '1.3-2'
+  compatibility 'aarch64 armv7l x86_64'
  license 'MIT-with-advertising'
-  source_url 'https://github.com/Airblader/xcb-util-xrm/releases/download/v1.3/xcb-util-xrm-1.3.tar.bz2'
-  source_sha256 '301cf33701207ea8782d49f4cb6404abd8f2d64e16f242017fd720be7c900c85'
-  binary_compression 'tpxz'
+  source_url 'https://github.com/Airblader/xcb-util-xrm.git'
+  git_hashtag "v#{version.split('-').first}"
+  binary_compression 'tar.zst'

  binary_sha256({
-    aarch64: '70cdd52679ee61272c4f07bcc1bc75132512415004011e67dc844ca26c22e5e6',
-     armv7l: '70cdd52679ee61272c4f07bcc1bc75132512415004011e67dc844ca26c22e5e6',
-       i686: '85e432baec61c1092613482a57fba8b4e159458680c09e28e3239213b375d579',
-     x86_64: 'f0915ed1d530e21c0e75d8807189ce5e4adc7205e4469d47d418e490266ef277'
+    aarch64: '95e5da6b9813e3395a3ee77aa34e47c966dc77e3f035b409fa09c862272db963',
+     armv7l: '95e5da6b9813e3395a3ee77aa34e47c966dc77e3f035b409fa09c862272db963',
+     x86_64: '0fba4c6710557d350cb45cecea726084294835f1b3c7e1887487e594d83a9aec'
  })

-  def self.build
-    system "./configure #{CREW_CONFIGURE_OPTIONS}"
-    system 'make'
-  end
-
-  def self.install
-    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
-  end
+  depends_on 'glibc' # R
+  depends_on 'libbsd' # R
+  depends_on 'libx11' => :build
+  depends_on 'libxau' # R
+  depends_on 'libxcb' # R
 end