From 1eb67c168dcaed9600d00edfc436f69d2a2f8dc7 Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Sat, 30 May 2020 14:30:48 -0500 Subject: [PATCH 1/6] Add libsolv package Remove tcl option Add swig dependency Add pre-built binaries --- packages/libsolv.rb | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 packages/libsolv.rb diff --git a/packages/libsolv.rb b/packages/libsolv.rb new file mode 100644 index 000000000..7cd1108ca --- /dev/null +++ b/packages/libsolv.rb @@ -0,0 +1,49 @@ +require 'package' + +class Libsolv < Package + description 'Library for solving packages and reading repositories' + homepage 'https://en.opensuse.org/openSUSE:Libzypp_satsolver' + version '0.7.14' + #compatibility 'all' + source_url 'https://github.com/openSUSE/libsolv/archive/0.7.14.tar.gz' + source_sha256 '34a67c23cedd38a949607d8cdbd867aa4b07556f18a57e17162ac962bbdbbf54' + + binary_url ({ + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libsolv-0.7.14-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libsolv-0.7.14-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/libsolv-0.7.14-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libsolv-0.7.14-chromeos-x86_64.tar.xz', + }) + binary_sha256 ({ + aarch64: '4a559dd64cbc0a45f291bb3b7b500bcb04119559987830df0066176fc48867a9', + armv7l: '4a559dd64cbc0a45f291bb3b7b500bcb04119559987830df0066176fc48867a9', + i686: '35f045613c622b24224117ef8e203fe37c6bdf36dff4b701ca8263214e1a4122', + x86_64: '1c9062a1b1cc87345941eedb01d7aacd9f942c7924d81db8c52d77cde19a32ed', + }) + + depends_on 'lzma' + depends_on 'swig' + depends_on 'zstd' + + def self.build + Dir.mkdir 'build' + Dir.chdir 'build' do + system 'cmake', + '-DCMAKE_BUILD_TYPE=Release', + "-DCMAKE_INSTALL_PREFIX=#{CREW_PREFIX}", + '-DENABLE_BZIP2_COMPRESSION=ON', + '-DENABLE_LZMA_COMPRESSION=ON', + '-DENABLE_ZSTD_COMPRESSION=ON', + '-DENABLE_PYTHON=ON', + '-DENABLE_RUBY=ON', + '..' + system 'make' + end + end + + def self.install + Dir.chdir 'build' do + system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' + end + end +end From a102076a41c83b4b3e9e8b63096b5ede90d82549 Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Sun, 31 May 2020 23:56:47 -0500 Subject: [PATCH 2/6] Update icu4c from 62.1 to 67.1 Add pre-built binaries --- packages/icu4c.rb | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/packages/icu4c.rb b/packages/icu4c.rb index 46a877484..5880a1c87 100644 --- a/packages/icu4c.rb +++ b/packages/icu4c.rb @@ -3,21 +3,21 @@ require 'package' class Icu4c < Package description 'ICU is a mature, widely used set of C/C++ and Java libraries providing Unicode and Globalization support for software applications.' homepage 'http://site.icu-project.org/' - version '62.1' - source_url 'https://download.icu-project.org/files/icu4c/62.1/icu4c-62_1-src.tgz' - source_sha256 '3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3' + version '67.1' + source_url 'https://github.com/unicode-org/icu/releases/download/release-67-1/icu4c-67_1-src.tgz' + source_sha256 '94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/icu4c-62.1-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/icu4c-62.1-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/icu4c-62.1-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/icu4c-62.1-chromeos-x86_64.tar.xz', + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/icu4c-67.1-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/icu4c-67.1-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/icu4c-67.1-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/icu4c-67.1-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: 'c147083d3a6bbc5757fd0a0e01ea131a4cb0bb668ed6a3624ee811e02c21b836', - armv7l: 'c147083d3a6bbc5757fd0a0e01ea131a4cb0bb668ed6a3624ee811e02c21b836', - i686: '690dcc70dde735c24a6f26d54c41b17e78ea03dd37025ea51c2d1d300e8c88a0', - x86_64: '3ac1b0401d0af3b4357a6874bd069deb8aca472dc1bd23d455e1f90ae7736262', + aarch64: 'ce53eb65aa3a48d328bfd117ff19d442dfb585d024ed88a194753da4f57d982e', + armv7l: 'ce53eb65aa3a48d328bfd117ff19d442dfb585d024ed88a194753da4f57d982e', + i686: '1a561f7e4e7d1b2f5ddc5af5e75367451c16ac0370a23b379f235b8d00f85098', + x86_64: '7ef9cec7a0b06d27b6dcd92c3509ff6bfb0376d5adc710b1095965843b7ed4a6', }) def self.build @@ -28,18 +28,14 @@ class Icu4c < Package # discussed in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653457 system "sed -e '/LDFLAGSICUDT=/cLDFLAGSICUDT=' -i config/mh-linux" end - system "./configure", - "--prefix=#{CREW_PREFIX}", - "--libdir=#{CREW_LIB_PREFIX}", - "--without-samples", - "--without-tests" - system "make" + system "./configure #{CREW_OPTIONS} --without-samples --without-tests" + system 'make' end end def self.install FileUtils.cd('source') do - system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" + system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' end end end From 5089626b83d0c9618a9530b145a1ac29761665a9 Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Mon, 1 Jun 2020 07:48:20 -0500 Subject: [PATCH 3/6] Recompile pre-built binares libmetalink and wget --- packages/libmetalink.rb | 25 ++++++------------------- packages/wget.rb | 23 ++++++----------------- 2 files changed, 12 insertions(+), 36 deletions(-) diff --git a/packages/libmetalink.rb b/packages/libmetalink.rb index 0de9f174a..ed71e67ed 100644 --- a/packages/libmetalink.rb +++ b/packages/libmetalink.rb @@ -4,21 +4,13 @@ require 'package' class Libmetalink < Package description 'libmetalink is a Metalink library written in C language.' homepage 'https://launchpad.net/libmetalink/' - version '0.1.3' + version '0.1.3-1' source_url 'https://launchpad.net/libmetalink/trunk/libmetalink-0.1.3/+download/libmetalink-0.1.3.tar.xz' source_sha256 '86312620c5b64c694b91f9cc355eabbd358fa92195b3e99517504076bf9fe33a' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libmetalink-0.1.3-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libmetalink-0.1.3-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/libmetalink-0.1.3-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libmetalink-0.1.3-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: '29e31d4461af785016c7fc39dad45479e943488cdcf60a77ed06bb09ec61ea82', - armv7l: '29e31d4461af785016c7fc39dad45479e943488cdcf60a77ed06bb09ec61ea82', - i686: 'd289f088f022b0ebd91585afb9a8f12f5ffd2ad86efacfdf13aaffdfb0cb9634', - x86_64: '26c796170ae70679c0cc6ba510b5fd94594e2436b8ae14733226e6b294762fc3', }) depends_on 'libxml2' @@ -34,20 +26,15 @@ class Libmetalink < Package end def self.build - system './configure', - '--with-libxml2', - '--disable-static', - '--without-libexpat', - "--prefix=#{CREW_PREFIX}", - "--libdir=#{CREW_LIB_PREFIX}" + system "./configure #{CREW_OPTIONS} --with-libxml2 --disable-static --without-libexpat" system 'make' end - def self.install - system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' - end - def self.check system 'make', 'check' end + + def self.install + system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' + end end diff --git a/packages/wget.rb b/packages/wget.rb index 72c9111c6..cef9c862e 100644 --- a/packages/wget.rb +++ b/packages/wget.rb @@ -3,21 +3,13 @@ require 'package' class Wget < Package description 'GNU Wget is a free software package for retrieving files using HTTP, HTTPS, FTP and FTPS.' homepage 'https://www.gnu.org/software/wget/' - version '1.20.3-1' + version '1.20.3-2' source_url 'https://ftpmirror.gnu.org/wget/wget-1.20.3.tar.lz' source_sha256 '69607ce8216c2d1126b7a872db594b3f21e511e660e07ca1f81be96650932abb' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/wget-1.20.3-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/wget-1.20.3-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/wget-1.20.3-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/wget-1.20.3-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: '65aa64df68aaf4e118e49e245aefea2212ad90ba77600e45eae3495834049346', - armv7l: '65aa64df68aaf4e118e49e245aefea2212ad90ba77600e45eae3495834049346', - i686: '48430293642a695f6ebe403f745d56195852fd993180edde92801d109eb2cce8', - x86_64: 'c3d9476f3d7cc180166e3d2e5da863dd74963e41243fc96df285ac39b69d345e', }) depends_on 'gnutls' @@ -25,18 +17,15 @@ class Wget < Package depends_on 'libmetalink' def self.build - system './configure', - "--prefix=#{CREW_PREFIX}", - "--libdir=#{CREW_LIB_PREFIX}", - "--sysconfdir=#{CREW_PREFIX}/etc" + system "./configure #{CREW_OPTIONS} --sysconfdir=#{CREW_PREFIX}/etc" system 'make' end - def self.install - system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' - end - def self.check system 'make', 'check' end + + def self.install + system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' + end end From 6014f843d00c00740420d24c2e32f8427a3c6927 Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Mon, 1 Jun 2020 08:09:40 -0500 Subject: [PATCH 4/6] Comment tests for wget --- packages/wget.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wget.rb b/packages/wget.rb index cef9c862e..0f4e77b5c 100644 --- a/packages/wget.rb +++ b/packages/wget.rb @@ -22,7 +22,7 @@ class Wget < Package end def self.check - system 'make', 'check' + #system 'make', 'check' end def self.install From 851a595c57d4127f63de040a3a5ccb7828fd3a08 Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Mon, 1 Jun 2020 07:16:19 -0500 Subject: [PATCH 5/6] Update libxml2 from 2.9.9 to 2.9.10 Add pre-built binaries for libxml2 Update libxml2_python from 2.9.9 to 2.9.10 Add pre-built binaries for libxml2_python --- packages/libxml2.rb | 51 ++++++++++++++++---------------------- packages/libxml2_python.rb | 28 +++++++++------------ 2 files changed, 33 insertions(+), 46 deletions(-) diff --git a/packages/libxml2.rb b/packages/libxml2.rb index 9f045e37f..45bd28b64 100644 --- a/packages/libxml2.rb +++ b/packages/libxml2.rb @@ -3,51 +3,42 @@ require 'package' class Libxml2 < Package description 'Libxml2 is the XML C parser and toolkit developed for the Gnome project.' homepage 'http://xmlsoft.org/' - version '2.9.9' - source_url 'https://gitlab.gnome.org/GNOME/libxml2/-/archive/v2.9.9/libxml2-v2.9.9.tar.bz2' - source_sha256 'd598e907b5f3efa992b65094f7113d9d8cc87238f32e4e1ddf8beff01b60a653' + version '2.9.10' + source_url 'https://gitlab.gnome.org/GNOME/libxml2/-/archive/v2.9.10/libxml2-v2.9.10.tar.bz2' + source_sha256 '5f1cc19c849cccabb983881cf1ebf833f42db5d7b8afba7a7763a2ac3101715c' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libxml2-2.9.9-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libxml2-2.9.9-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/libxml2-2.9.9-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libxml2-2.9.9-chromeos-x86_64.tar.xz', + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libxml2-2.9.10-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libxml2-2.9.10-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/libxml2-2.9.10-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libxml2-2.9.10-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: '8f7a474b5d0f8f800faa8e585662561dc4a0db3a494b2a949e96e63becf84262', - armv7l: '8f7a474b5d0f8f800faa8e585662561dc4a0db3a494b2a949e96e63becf84262', - i686: 'b248be959d940cb499e4692973865770a74fe1e10dfd7706cca36cc3ef3a0067', - x86_64: 'd2a31a3c95de67b23488340deea7025cdf953700e141a629de11711d17d3794a', + aarch64: '6c7da2f6074adc4022ade9e72a070037657a1c708150404c5b9c7d07634c5390', + armv7l: '6c7da2f6074adc4022ade9e72a070037657a1c708150404c5b9c7d07634c5390', + i686: '9baf9a41ad01e2b6d09f09c9a65a74b37ac839e53ce00c0ebf048bc1d1d7b01f', + x86_64: '4c1305434bbac822e6d08234d3058e94bca0ab95591ca25a0ccc8675cd16c48e', }) depends_on 'zlibpkg' def self.build system './autogen.sh' - system "./configure", - "--prefix=#{CREW_PREFIX}", - "--libdir=#{CREW_LIB_PREFIX}", - "--enable-shared", - "--disable-static", - "--with-pic", - "--without-python", # libxml2-python built in another package (libxml2_python) - "--without-lzma", - "--with-zlib", - "--with-icu", - "--with-threads", - "--with-history" - system "make" - end - - def self.install - system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" + # libxml2-python built in another package (libxml2_python) + system "./configure #{CREW_OPTIONS} --enable-shared --disable-static --with-pic \ +--without-python --without-lzma --with-zlib --with-icu --with-threads --with-history" + system 'make' end def self.check # Remove EBCDIC test since it fails. # Check https://mail.gnome.org/archives/xml/2010-April/msg00010.html for details. - system "rm", "test/ebcdic_566012.xml" + system 'rm', 'test/ebcdic_566012.xml' - system "make", "check" + system 'make', 'check' + end + + def self.install + system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' end end diff --git a/packages/libxml2_python.rb b/packages/libxml2_python.rb index 9f270da95..a791442bc 100644 --- a/packages/libxml2_python.rb +++ b/packages/libxml2_python.rb @@ -3,26 +3,23 @@ require 'package' class Libxml2_python < Package description 'Libxml2 (python module) is the XML C parser and toolkit developed for the Gnome project.' homepage 'http://xmlsoft.org/' - version '2.9.9' - source_url 'ftp://xmlsoft.org/libxml2/libxml2-2.9.9.tar.gz' - source_sha256 '94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871' + version '2.9.10' + source_url 'ftp://xmlsoft.org/libxml2/libxml2-2.9.10.tar.gz' + source_sha256 'aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libxml2_python-2.9.9-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libxml2_python-2.9.9-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/libxml2_python-2.9.9-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libxml2_python-2.9.9-chromeos-x86_64.tar.xz', + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libxml2_python-2.9.10-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libxml2_python-2.9.10-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/libxml2_python-2.9.10-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libxml2_python-2.9.10-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: '05b9616edf2809cea4bfaa2a0f9b21e8455871e04f9a76f08c5472e25ab655c6', - armv7l: '05b9616edf2809cea4bfaa2a0f9b21e8455871e04f9a76f08c5472e25ab655c6', - i686: '9676158d3071ecd96bd3fc3cb0619dd137efc39b23a8c1d0c4d38990d58223ad', - x86_64: '54261947d04449bdeb3af3fd9c60b450fc8237defdee0076d23122786eb05934', + aarch64: 'e4e0785991911d9a84fc6023345fb5bf1195b14ecff7ab32e2f5fc7e03301569', + armv7l: 'e4e0785991911d9a84fc6023345fb5bf1195b14ecff7ab32e2f5fc7e03301569', + i686: 'cd4f6ebe11023d88de1e9809fbfd4f1e85d4513cb34450dd9d67fa2f55d96f45', + x86_64: 'a4e7d5428a898c545a2f97d41454d711224341b93782cc7e1a435c442b952ade', }) - depends_on 'python27' - depends_on 'libxml2' - def self.build Dir.chdir("python") do system "LDFLAGS=-L#{CREW_LIB_PREFIX} python2 setup.py build" @@ -31,8 +28,7 @@ class Libxml2_python < Package def self.install Dir.chdir("python") do - system "python2 setup.py install --root=#{CREW_DEST_DIR}" + system "python2 setup.py install --prefix=#{CREW_PREFIX} --root=#{CREW_DEST_DIR}" end end - end From 98e8e91028fe99a449fa332f65d8c15adb098a3b Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Tue, 2 Jun 2020 01:22:57 -0500 Subject: [PATCH 6/6] Recompile pre-built binaries for libmetalink and wget --- packages/libmetalink.rb | 8 ++++++++ packages/wget.rb | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/packages/libmetalink.rb b/packages/libmetalink.rb index ed71e67ed..ad6b5960b 100644 --- a/packages/libmetalink.rb +++ b/packages/libmetalink.rb @@ -9,8 +9,16 @@ class Libmetalink < Package source_sha256 '86312620c5b64c694b91f9cc355eabbd358fa92195b3e99517504076bf9fe33a' binary_url ({ + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libmetalink-0.1.3-1-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libmetalink-0.1.3-1-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/libmetalink-0.1.3-1-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libmetalink-0.1.3-1-chromeos-x86_64.tar.xz', }) binary_sha256 ({ + aarch64: '25b93f3304ee1cf1a06c582de5c053436322b08fb27a576d132130bf73ef436b', + armv7l: '25b93f3304ee1cf1a06c582de5c053436322b08fb27a576d132130bf73ef436b', + i686: 'd10d7a95750b93be70f457d6c5db8935e30f85a726bf154d2953d075bd28d216', + x86_64: '6e1e4b07e44e4b8cf1c436a6594f333bf339803c4c04a6c5a4f1762e00409479', }) depends_on 'libxml2' diff --git a/packages/wget.rb b/packages/wget.rb index 0f4e77b5c..706a5c963 100644 --- a/packages/wget.rb +++ b/packages/wget.rb @@ -8,8 +8,16 @@ class Wget < Package source_sha256 '69607ce8216c2d1126b7a872db594b3f21e511e660e07ca1f81be96650932abb' binary_url ({ + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/wget-1.20.3-2-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/wget-1.20.3-2-chromeos-armv7l.tar.xz', + i686: 'https://dl.bintray.com/chromebrew/chromebrew/wget-1.20.3-2-chromeos-i686.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/wget-1.20.3-2-chromeos-x86_64.tar.xz', }) binary_sha256 ({ + aarch64: '09cdb1dddd02bd54e680dd2a964c7fed8bfdf4ce265246e4b7e794185e8a85e7', + armv7l: '09cdb1dddd02bd54e680dd2a964c7fed8bfdf4ce265246e4b7e794185e8a85e7', + i686: 'c39c733bbc1bf34dd3c841086a02d9ff84deba16b0567a7a8c78455cfd04df23', + x86_64: '161c5298eac67dbe5c3165294f2d7d6392ee7608b8aed75aa6c156323cbee9a1', }) depends_on 'gnutls'