From 7fd65ee3a02f0125100090c8bce7677c4ab58859 Mon Sep 17 00:00:00 2001
From: supechicken <73414985+supechicken@users.noreply.github.com>
Date: Tue, 1 Dec 2020 23:15:24 +0800
Subject: [PATCH] Update packages (Update packages list on comment) (#4564)

* Update `xclock` `twm` `xterm` `powershell`

* Update `skype` and `screenfetch`

Fixes #4564

* Removed /dev/null

* New Package: bash

* Use https and mirror

* Use  #{CREW_OPTIONS}

* Update xterm.rb

* Add `bash` to `buildessential` as a dependency

* Replace system default bash

* Update `mpfr`

* #{CREW_VERSION} don't work on cloudready

* Update bash.rb

* Update `wine`

* Update mc

* Update opera.rb

* Update nano.rb

* Update gsettings_desktop_schemas.rb

* Update gsettings_desktop_schemas.rb, use meson

* Fix syntax error

* Add dependencies to `wine`

* Remove bash from buildessential.rb

* Update screenfetch.rb

* Update powershell.rb

* Update mpfr.rb

* Remove dependencies duplicate with core packages

* Update twm, use  #{CREW_OPTIONS}

* Update xclock, use  #{CREW_OPTIONS}

* Add --prefix

* Add ffmpeg dependency

* Delete mpfr.rb

* Left mpfr.rb untouch

* Add #{CREW_OPTIONS}, tested on x86_64

* Update Opera

* fix CREW_OPTIONS

* Update wine.rb

* Update bash.rb

* Remove core dependencies
---
 packages/bash.rb                      | 28 ++++++++++++++
 packages/buildessential.rb            |  2 +-
 packages/gsettings_desktop_schemas.rb | 33 +++++-----------
 packages/mc.rb                        | 26 +++----------
 packages/nano.rb                      | 19 ++-------
 packages/opera.rb                     |  2 +-
 packages/powershell.rb                | 12 +++---
 packages/screenfetch.rb               | 21 ++--------
 packages/skype.rb                     | 20 ++++------
 packages/twm.rb                       | 20 ++--------
 packages/wine.rb                      | 34 ++++++++++-------
 packages/xclock.rb                    | 20 ++--------
 packages/xterm.rb                     | 55 +++++++++++----------------
 13 files changed, 115 insertions(+), 177 deletions(-)
 create mode 100644 packages/bash.rb

diff --git a/packages/bash.rb b/packages/bash.rb
new file mode 100644
index 000000000..a1e490e3e
--- /dev/null
+++ b/packages/bash.rb
@@ -0,0 +1,28 @@
+require 'package'
+
+class Bash < Package
+  description 'The Bourne Again SHell'
+  homepage 'https://www.gnu.org/software/bash/'
+  version '5.1-rc2'
+  compatibility 'all'
+  source_url 'https://ftpmirror.gnu.org/bash/bash-5.1-rc2.tar.gz'
+  source_sha256 'f3274290260e2c74a2ec61606cc932cc0e093028d55c779cf2c7907bdb60abc0'
+
+  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"
+     FileUtils.ln_s "#{CREW_PREFIX}/bin/bash", "#{CREW_DEST_PREFIX}/bin/sh"
+  end
+  
+  def self.postinstall
+    puts
+    puts "To complete the installation, execute the following:".lightblue
+    puts "echo '# Make newer version of bash startup automatically' >> ~/.bashrc".lightblue
+    puts "echo '#{CREW_PREFIX}/bin/sh' >> ~/.bashrc".lightblue
+    puts "source ~/.bashrc".lightblue
+  end
+end
diff --git a/packages/buildessential.rb b/packages/buildessential.rb
index 5b2a93098..075bd5ce2 100644
--- a/packages/buildessential.rb
+++ b/packages/buildessential.rb
@@ -8,9 +8,9 @@ class Buildessential < Package
 
   is_fake
 
+
   #install first to get ldconfig
   depends_on 'glibc'
-  
   depends_on 'gcc10'
   depends_on 'gcc_tools'
   depends_on 'linuxheaders'
diff --git a/packages/gsettings_desktop_schemas.rb b/packages/gsettings_desktop_schemas.rb
index 8824f02b9..72b95d77a 100644
--- a/packages/gsettings_desktop_schemas.rb
+++ b/packages/gsettings_desktop_schemas.rb
@@ -3,23 +3,10 @@ require 'package'
 class Gsettings_desktop_schemas < Package
   description 'Collection of GSettings schemas for GNOME desktop.'
   homepage 'https://git.gnome.org/browse/gsettings-desktop-schemas'
-  version '3.28.0'
+  version '3.38.0'
   compatibility 'all'
-  source_url 'https://github.com/GNOME/gsettings-desktop-schemas/archive/3.28.0.tar.gz'
-  source_sha256 '7e816d73a6a206c470adaf94a5a713e7f7d1b50f97615d017d19dfdd1e23394d'
-
-  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/gsettings_desktop_schemas-3.28.0-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/gsettings_desktop_schemas-3.28.0-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/gsettings_desktop_schemas-3.28.0-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/gsettings_desktop_schemas-3.28.0-chromeos-x86_64.tar.xz',
-  })
-  binary_sha256 ({
-    aarch64: 'de624dd7458ac173f505dca408ca47c02a78ab71aecdcd2246b7779f823f763e',
-     armv7l: 'de624dd7458ac173f505dca408ca47c02a78ab71aecdcd2246b7779f823f763e',
-       i686: '31c292efcca1f8aa253be2d85a5686d0c0e59e793dfd8505c9e71b661bcc5593',
-     x86_64: 'ff3bcf36058e651fe7662433fb961d9c1dc1f8db5ab17c11788ee4c3c26c99f2',
-  })
+  source_url 'https://github.com/GNOME/gsettings-desktop-schemas/archive/3.38.0.tar.gz'
+  source_sha256 'b808bd285ac7176f2e9e3a8763c3913121ab9f109d2988c70e3f1f8e742a630d'
 
   depends_on 'gnome_common'
   depends_on 'glib'
@@ -27,20 +14,18 @@ class Gsettings_desktop_schemas < Package
 
   def self.build
     system "sed -i -r 's:\"(/system):\"/org/gnome\1:g' schemas/*.in"
-    system "./autogen.sh"
-    system "./configure",
-           "--prefix=#{CREW_PREFIX}",
-           "--libdir=#{CREW_LIB_PREFIX}"
-    system "make"
+    ENV['CFLAGS'] = "-fuse-ld=lld"
+    ENV['CXXFLAGS'] = "-fuse-ld=lld"
+    system "meson #{CREW_MESON_OPTIONS}"
+    system "meson compile -C builddir"
+    
   end
 
   def self.install
-    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" # the steps required to install the package
+    system "DESTDIR=#{CREW_DEST_DIR} meson install -C builddir"
   end
 
   def self.postinstall
-    # The package is installed using a “DESTDIR” method, #{CREW_PREFIX}/share/glib-2.0/schemas/gschemas.compiled was not updated/created.
-    # Generate gschemas.compiled
     system "glib-compile-schemas #{CREW_PREFIX}/share/glib-2.0/schemas"
   end
 
diff --git a/packages/mc.rb b/packages/mc.rb
index b4693b26e..176c8b0e6 100644
--- a/packages/mc.rb
+++ b/packages/mc.rb
@@ -3,33 +3,19 @@ require 'package'
 class Mc < Package
   description 'GNU Midnight Commander is a visual file manager'
   homepage 'http://midnight-commander.org/'
-  version '4.8.20'
+  version '4.8.25'
   compatibility 'all'
-  source_url 'https://github.com/MidnightCommander/mc/archive/4.8.20.tar.gz'
-  source_sha256 'f6d6aebc5ab835f0593b9c30debb39bec05c8073a486aed661e09da3ebe488f9'
+  source_url 'https://github.com/MidnightCommander/mc/archive/4.8.25.tar.gz'
+  source_sha256 '8a4aa1556a528fbe9140c47aa3d0665155187468a17c3b80a824de5fcbbebae1'
 
-  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/mc-4.8.20-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/mc-4.8.20-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/mc-4.8.20-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/mc-4.8.20-chromeos-x86_64.tar.xz',
-  })
-  binary_sha256 ({
-    aarch64: 'd0b53981a6e2912f5cc18baf81c6044c51f85e3bf358b20c7b1a5601848c341d',
-     armv7l: 'd0b53981a6e2912f5cc18baf81c6044c51f85e3bf358b20c7b1a5601848c341d',
-       i686: '4d22ce2993375f766acf5b1dd4e0ffc1001882b57358526f3e23d7647c9cd238',
-     x86_64: '8b89fc714399ac3bac0b920c972574471273c7bd4dd3ca46175f18a6e02a6c98',
-  })
-
-  depends_on 'automake' => :build
-  depends_on 'libtool' => :build
   depends_on 'glib' => :build
   depends_on 'aspell'
-  depends_on 'slang'
+    
+ENV['LIBS'] = "-ldl -lssl -lcrypto"
 
   def self.build
     system './autogen.sh'
-    system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}"
+    system "./configure #{CREW_OPTIONS}"
     system 'make'
   end
 
diff --git a/packages/nano.rb b/packages/nano.rb
index 50fab7cbc..aed4d2e36 100644
--- a/packages/nano.rb
+++ b/packages/nano.rb
@@ -3,23 +3,10 @@ require 'package'
 class Nano < Package
   description 'Nano\'s ANOther editor, an enhanced free Pico clone.'
   homepage 'https://www.nano-editor.org/'
-  version '4.4'
+  version '5.3'
   compatibility 'all'
-  source_url 'https://www.nano-editor.org/dist/v4/nano-4.4.tar.xz'
-  source_sha256 '2af222e0354848ffaa3af31b5cd0a77917e9cb7742cd073d762f3c32f0f582c7'
-
-  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/nano-4.4-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/nano-4.4-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/nano-4.4-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/nano-4.4-chromeos-x86_64.tar.xz',
-  })
-  binary_sha256 ({
-    aarch64: 'd90750f2218b77a4ddaf02915c8d06ff4f32868273a2709eb2906949c9bea3c6',
-     armv7l: 'd90750f2218b77a4ddaf02915c8d06ff4f32868273a2709eb2906949c9bea3c6',
-       i686: '61e9a1790d99f2f8edcceea2bd10ae8a092166e4da9f648ff1a1083360f9bdda',
-     x86_64: '29e8f79fa4e1d93a14373249036428859d7a2e80c319854bb2266f441634a1a6',
-  })
+  source_url 'https://www.nano-editor.org/dist/v5/nano-5.3.tar.xz'
+  source_sha256 'c5c1cbcf622d9a96b6030d66409ed12b204e8bc01ef5e6554ebbe6fb1d734352'
 
   depends_on 'xdg_base'
 
diff --git a/packages/opera.rb b/packages/opera.rb
index a91fb16b7..aa5f5cb14 100644
--- a/packages/opera.rb
+++ b/packages/opera.rb
@@ -3,7 +3,7 @@ require 'package'
 class Opera < Package
   description "Opera isn't just a browser. It's an awesome browser."
   homepage 'https://www.opera.com/'
-  version '72.0.3815.207'
+  version '72.0.3815.400'
   compatibility 'x86_64'
   case ARCH
   when 'x86_64'
diff --git a/packages/powershell.rb b/packages/powershell.rb
index f8a0d5870..8a04cc178 100644
--- a/packages/powershell.rb
+++ b/packages/powershell.rb
@@ -3,15 +3,15 @@ require 'package'
 class Powershell < Package
   description 'Powershell is a cross-platform, task-based command-line shell and scripting language that helps rapidly automate tasks that manage operating systems and processes'
   homepage 'https://docs.microsoft.com/en-us/powershell/'
-  version '7.0.2'
+  version '7.0.3'
   compatibility 'aarch64,armv7l,x86_64'
   case ARCH
-  when 'aarch64', 'armv7l'
-    source_url 'https://github.com/PowerShell/PowerShell/releases/download/v7.0.2/powershell-7.0.2-linux-arm32.tar.gz'
-    source_sha256 '3f884c8eb97cbf28402d5ee5c64c50c556c87779f08a7eb01062c5b7567f9246'
+  when 'armv7l', 'aarch64'
+    source_url 'https://github.com/PowerShell/PowerShell/releases/download/v7.0.3/powershell-7.0.3-linux-arm32.tar.gz'
+    source_sha256 'fe6da9f90fd5026c4ab446a31f565144342a8d507a73d428305bc36c1ad92644'
   when 'x86_64'
-    source_url 'https://github.com/PowerShell/PowerShell/releases/download/v7.0.2/powershell-7.0.2-linux-x64.tar.gz'
-    source_sha256 'e7e458a32c51c6ce43647b8a0eb7fbd9da1b67850c18e389f0eef7c7109891fb'
+    source_url 'https://github.com/PowerShell/PowerShell/releases/download/v7.0.3/powershell-7.0.3-linux-x64.tar.gz'
+    source_sha256 'a9c023940c77a96a9f5135309e44c93ed627983bb1a66ecf5beb42bbba54ead6'
   end
 
   case ARCH
diff --git a/packages/screenfetch.rb b/packages/screenfetch.rb
index 5e989723a..24d716fa1 100644
--- a/packages/screenfetch.rb
+++ b/packages/screenfetch.rb
@@ -3,23 +3,10 @@ require 'package'
 class Screenfetch < Package
   description 'Fetches system/theme information in terminal for Linux desktop screenshots.'
   homepage 'https://github.com/KittyKatt/screenFetch'
-  version '3.9.0'
+  version '3.9.1'
   compatibility 'all'
-  source_url 'https://github.com/KittyKatt/screenFetch/archive/v3.9.0.tar.gz'
-  source_sha256 'd6df4ef7763f9761d818c878465d78ef701b71002a50d4f150f65a31cc1bea37'
-
-  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/screenfetch-3.9.0-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/screenfetch-3.9.0-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/screenfetch-3.9.0-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/screenfetch-3.9.0-chromeos-x86_64.tar.xz',
-  })
-  binary_sha256 ({
-    aarch64: '1a4f6205d1b5404524cd23242ebe476fb11074b72974908bd4e7250a35a3209b',
-     armv7l: '1a4f6205d1b5404524cd23242ebe476fb11074b72974908bd4e7250a35a3209b',
-       i686: 'f59b9a43ca298cdddfaba8fc7be3e0c4f2b172ff4c27e32e2879cafe0621cfd6',
-     x86_64: 'f91a00be5514342fb734eb55ef5448f0da5c7d31538e04721f114c94625bfa15',
-  })
+  source_url 'https://github.com/KittyKatt/screenFetch/archive/v3.9.1.tar.gz'
+  source_sha256 'aa97dcd2a8576ae18de6c16c19744aae1573a3da7541af4b98a91930a30a3178'
 
   depends_on 'bc'
 
@@ -27,7 +14,7 @@ class Screenfetch < Package
   end
 
   def self.install
-    system "install -D screenfetch-dev #{CREW_DEST_PREFIX}/bin/screenfetch"
+    system "install -Dm755 screenfetch-dev #{CREW_DEST_PREFIX}/bin/screenfetch"
     system "install -D screenfetch.1 #{CREW_DEST_PREFIX}/man/man1/screenfetch.1"
   end
 end
diff --git a/packages/skype.rb b/packages/skype.rb
index 3e4d5e3e6..e553786c3 100644
--- a/packages/skype.rb
+++ b/packages/skype.rb
@@ -2,8 +2,8 @@ require 'package'
 
 class Skype < Package
   description 'Skype is a telecommunications application that specializes in providing video chat and voice calls between devices'
-  homepage 'https://www.skype.com/en/'
-  version '8.56.0.103'
+  homepage 'https://www.skype.com/'
+  version '8.65.0.78'
   compatibility 'x86_64'
   case ARCH
   when 'x86_64'
@@ -14,24 +14,18 @@ class Skype < Package
     depends_on 'sommelier'
   end
 
-  binary_url ({
-    x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/skype-8.56.0.103-chromeos-x86_64.tar.xz',
-  })
-  binary_sha256 ({
-    x86_64: '1670a0c74ac08b224034aefbd27f3d03b89529e7168dc84ac095944a1aa93736',
-  })
-
   def self.build
-    system 'wget https://go.skype.com/skypeforlinux-64.deb'
-    abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read('skypeforlinux-64.deb') ) == '20b1b1b85c76cac9d224dccf5748cf21f954fe1a36c98fd5a7aa13d8448a1e07'
-    system 'alien -tc skypeforlinux-64.deb'
+    system 'curl https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.65.0.78_amd64.deb -#o skype.deb'
+    puts "Archive downloaded".lightgreen
+    abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest( File.read('skype.deb') ) == '9026f043697d7d0783e7232701a868229d9a91e91dc0ae86509732c1c7bf0c13'
+    system 'alien -tc skype.deb'
     system "tar xvf skypeforlinux-#{version}.tgz"
   end
 
   def self.install
     FileUtils.mkdir_p "#{CREW_DEST_PREFIX}"
-    FileUtils.mv 'usr/bin/skypeforlinux', 'usr/bin/skype'
     FileUtils.mv 'usr/bin', "#{CREW_DEST_PREFIX}"
     FileUtils.mv 'usr/share', "#{CREW_DEST_PREFIX}"
+    FileUtils.ln_s "#{CREW_PREFIX}/bin/skypeforlinux", "#{CREW_DEST_PREFIX}/bin/skype"
   end
 end
diff --git a/packages/twm.rb b/packages/twm.rb
index 4de35f7b4..e53d61d57 100644
--- a/packages/twm.rb
+++ b/packages/twm.rb
@@ -3,28 +3,16 @@ require 'package'
 class Twm < Package
   description 'The twm package contains a very minimal window manager.'
   homepage 'http://www.linuxfromscratch.org/blfs/view/svn/x/twm.html'
-  version '1.0.10'
+  version '1.0.11'
   compatibility 'all'
-  source_url 'https://www.x.org/pub/individual/app/twm-1.0.10.tar.bz2'
-  source_sha256 '6449eadca16ce0f0d900605b0cc020b95f40619261b7beccfb46bcc1836445d7'
+  source_url 'https://www.x.org/pub/individual/app/twm-1.0.11.tar.xz'
+  source_sha256 'f4e8a842dec410e79741f25ed4dfac09df080835d0bba2e3983b5914569b68c7'
 
-  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/twm-1.0.10-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/twm-1.0.10-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/twm-1.0.10-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/twm-1.0.10-chromeos-x86_64.tar.xz',
-  })
-  binary_sha256 ({
-    aarch64: 'e5b66bf042c287bf844da9a0ac2cff8c0af7d679ddcb83bea15b4b9a580534bf',
-     armv7l: 'e5b66bf042c287bf844da9a0ac2cff8c0af7d679ddcb83bea15b4b9a580534bf',
-       i686: '3abf216bc7c9a2e8f8f43ea263c46fe6c7e366d37e6195ac256c0123de5ce37c',
-     x86_64: '2db77d9f08c7c9090e7bc663b00f4c052442addd01fd614220603ec555e16af9',
-  })
 
   depends_on 'xorg_server'
 
   def self.build
-    system "./configure", "--prefix=#{CREW_PREFIX}", "--libdir=#{CREW_LIB_PREFIX}"
+    system "./configure  #{CREW_OPTIONS}"
     system 'make'
   end
 
diff --git a/packages/wine.rb b/packages/wine.rb
index 55fd77fd0..afb713400 100644
--- a/packages/wine.rb
+++ b/packages/wine.rb
@@ -5,28 +5,34 @@ class Wine < Package
   description 'Wine (originally an acronym for "Wine Is Not an Emulator") is a compatibility layer capable of running Windows applications on several POSIX-compliant operating systems, such as Linux, macOS, & BSD.'
   homepage 'https://www.winehq.org/'
   compatibility 'all'
-  version '3.13'
-  source_url 'https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz'
-  source_sha256 '0785d74852232c1f6e07ac081875e92219a4428ddcc8931632fcf1924941bbd4'
+  version '5.0.2-stable'
+  source_url 'https://dl.winehq.org/wine/source/5.0/wine-5.0.2.tar.xz'
+  source_sha256 'c2c284f470874b35228327c3972bc29c3a9d8d98abd71dbf81c288b8642becbc'
 
-  binary_url ({
-  })
-  binary_sha256 ({
-  })
-
-  depends_on 'bison'
-  depends_on 'sommelier'
-  depends_on 'flex'
   depends_on 'freetype'
+  depends_on 'glib'
+  depends_on 'libgphoto'
+  depends_on 'libxext'
+  depends_on 'eudev'
+  depends_on 'gstreamer'
+  depends_on 'lcms'
+  depends_on 'openldap'
+  depends_on 'libpcap'
+  depends_on 'apulse'
+  depends_on 'pulseaudio'
+  depends_on 'mpg123'
+  depends_on 'ffmpeg'
+  depends_on 'sommelier'
+
 
   def self.build
     case ARCH
     when "i686", "armv7l", "aarch64"
-      system "./configure"
+      system "./configure #{CREW_OPTIONS}"
     when "x86_64"
-      system "./configure --enable-win64"
+      system "./configure #{CREW_OPTIONS} --enable-win64 --without-freetype"
     else
-      abort 'Error getting your device configuration.'.lightred
+      abort 'Error getting your device configuration. :/'.lightred
     end
     system 'make'
   end
diff --git a/packages/xclock.rb b/packages/xclock.rb
index 6a8eca3e5..c20a29c2f 100644
--- a/packages/xclock.rb
+++ b/packages/xclock.rb
@@ -3,28 +3,16 @@ require 'package'
 class Xclock < Package
   description 'The xclock package contains a simple clock application which is used in the default xinit configuration.'
   homepage 'https://www.x.org/archive/X11R6.8.1/doc/xclock.1.html'
-  version '1.0.7'
+  version '1.0.9'
   compatibility 'all'
-  source_url 'https://www.x.org/pub/individual/app/xclock-1.0.7.tar.bz2'
-  source_sha256 '23ceeca94e3e20a6c26a703ac7f789066d4517f8d2cb717ae7cb28a617d97dd0'
+  source_url 'https://www.x.org/pub/individual/app/xclock-1.0.9.tar.bz2'
+  source_sha256 'cf461fb2c6f2ac42c54d8429ee2010fdb9a1442a370adfbfe8a7bfaf33c123bb'
 
-  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/xclock-1.0.7-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/xclock-1.0.7-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/xclock-1.0.7-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/xclock-1.0.7-chromeos-x86_64.tar.xz',
-  })
-  binary_sha256 ({
-    aarch64: '589fb2e417aead9724d278e8f675bcd5d6f53d717fdd9d5b208e9a69ad3e0cfc',
-     armv7l: '589fb2e417aead9724d278e8f675bcd5d6f53d717fdd9d5b208e9a69ad3e0cfc',
-       i686: '24bac5e6ab7b90d6eb070e587e6e473cfcab04f46b47dc1801d5bfcac6467d3f',
-     x86_64: '51318c17142f85d70173ce506a2f04a8b66ee8382e821e782e07548076051a1c',
-  })
 
   depends_on 'xorg_lib'
 
   def self.build
-    system './configure', "--prefix=#{CREW_PREFIX}", "--libdir=#{CREW_LIB_PREFIX}"
+    system "./configure #{CREW_OPTIONS}"
     system 'make'
   end
 
diff --git a/packages/xterm.rb b/packages/xterm.rb
index ab7035405..6c508e7d8 100644
--- a/packages/xterm.rb
+++ b/packages/xterm.rb
@@ -3,46 +3,35 @@ require 'package'
 class Xterm < Package
   description 'The xterm program is a terminal emulator for the X Window System.'
   homepage 'https://invisible-island.net/xterm/'
-  version '341-1'
+  version '361'
   compatibility 'all'
-  source_url "https://invisible-mirror.net/archives/xterm/xterm-341.tgz"
-  source_sha256 '63a07dfa2b5d501a9e1da0e05772bff7ad431ac2065127c77eebe392ef33cb44'
-
-  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/xterm-341-1-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/xterm-341-1-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/xterm-341-1-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/xterm-341-1-chromeos-x86_64.tar.xz',
-  })
-  binary_sha256 ({
-    aarch64: 'b0c2289b1f2a2927d3bd133059705407e6418bc595a59aca522eaf9bd92e9e00',
-     armv7l: 'b0c2289b1f2a2927d3bd133059705407e6418bc595a59aca522eaf9bd92e9e00',
-       i686: '0803e8b84a900c5344bc2aa4f2586e8795bf6feb517bc7b75dae69c9438d5eef',
-     x86_64: 'c93930b998ed21cccde94dc81c2aa5e0f91d986d9f193c4c61ca2714d10a8956',
-  })
-
+  source_url "https://invisible-mirror.net/archives/xterm/xterm-361.tgz"
+  source_sha256 '85610f20d5e47205cc1b6876f7a4da28d6ae051bd8eac0b932e92c37a73a623f'
   depends_on 'pcre'
   depends_on 'sommelier'
 
   def self.build
-    system './configure',
-           '--with-x',
-           '--with-pcre',
-           '--with-xinerama',
-           '--enable-dabbrev',
-           '--enable-toolbar',
-           '--with-pkg-config',
-           '--enable-exec-xterm',
-           '--enable-16bit-chars',
-           '--enable-dec-locator',
-           '--enable-double-buffer',
-           '--enable-readline-mouse',
-           '--enable-regis-graphics',
-           '--enable-sixel-graphics',
+    ENV['TMPDIR'] = "#{CREW_PREFIX}/tmp"
+    ENV['PATH'] = '/bin:/sbin:/usr/local/bin' # The /usr/bin need to remove from PATH as bash will point 'tic' to /usr/bin/tic 
+    system "./configure",
+           "--with-x",
+           "--with-pcre",
+           "--with-xinerama",
+           "--enable-dabbrev",
+           "--enable-toolbar",
+           "--with-pkg-config",
+           "--enable-exec-xterm",
+           "--enable-16bit-chars",
+           "--enable-dec-locator",
+           "--enable-double-buffer",
+           "--enable-readline-mouse",
+           "--enable-regis-graphics",
+           "--enable-sixel-graphics",
            "--prefix=#{CREW_PREFIX}",
            "--with-xpm=#{CREW_PREFIX}",
-           "--libdir=#{CREW_LIB_PREFIX}"
-    system 'make'
+           "--libdir=#{CREW_LIB_PREFIX}",
+           "--with-ticlib"
+    system "make"
   end
 
   def self.install