Skip to content

C
chromebrew
Commit a4f128d9 authored by Ed Reel's avatar Ed Reel
Browse files
Options

Resolve merge conflicts in ctags, graphviz, ripgrep, terraform and wxwidgets

parents 6df5cf9f 0b0b3ae1
Show whitespace changes
Inline Side-by-side
Showing with 190 additions and 82 deletions
packages/ctags.rb
View file @ a4f128d9
......@@ -3,33 +3,31 @@ require 'package'
class Ctags < Package
description 'Exuberant Ctags is a multilanguage reimplementation of the Unix ctags utility.'
homepage 'https://sourceforge.net/projects/ctags/'
version '5.8-0'
version '5.8-1'
compatibility 'all'
source_url 'http://prdownloads.sourceforge.net/ctags/ctags-5.8.tar.gz'
source_url 'https://downloads.sourceforge.net/project/ctags/ctags/5.8/ctags-5.8.tar.gz'
source_sha256 '0e44b45dcabe969e0bbbb11e30c246f81abe5d32012db37395eb57d66e9e99c7'
binary_url ({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/ctags-5.8-0-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/ctags-5.8-0-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/ctags-5.8-0-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/ctags-5.8-0-chromeos-x86_64.tar.xz',
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/ctags-5.8-1-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/ctags-5.8-1-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/ctags-5.8-1-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/ctags-5.8-1-chromeos-x86_64.tar.xz',
})
binary_sha256 ({
aarch64: 'd9eb4193eca3a4c7939d8e9e35ba63cbf8be084982f98c6ba0d9c4d12f3ca762',
armv7l: 'd9eb4193eca3a4c7939d8e9e35ba63cbf8be084982f98c6ba0d9c4d12f3ca762',
i686: '5afeda5261207a409a7569ec903df5c47845f237dedc9e78bd0a85bed4b780cc',
x86_64: 'ab996808d0c2c63d729e036cd12d5a38829dfb4bf9c5ee240db1f7201a55c723',
aarch64: '7f45accfda62bd74f626024d1a44b9ce3df6a79342f4ef1137cc9abaea3031fc',
armv7l: '7f45accfda62bd74f626024d1a44b9ce3df6a79342f4ef1137cc9abaea3031fc',
i686: '0c691ea7dd4608d4fc3b8b26c53eebefa6c3049b76e3d74fd1df3bc34c0460f9',
x86_64: 'ec5a895588b0b6f56928a44c089b3a52b2eedc8092c1b22994e72fa62442a7ab',
})
def self.build
system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}"
system "make"
system "./configure #{CREW_OPTIONS}"
system 'make'
end
def self.install
#system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" # it does not work here
system "install -Dm755 ctags #{CREW_DEST_PREFIX}/bin/ctags"
system "gzip -9 ctags.1"
system "install -Dm644 ctags.1.gz #{CREW_DEST_PREFIX}/share/man/man1/ctags.1.gz"
system "install -Dm644 ctags.1 #{CREW_DEST_MAN_PREFIX}/man1/ctags.1"
end
end
packages/github_cli.rb 0 → 100644
View file @ a4f128d9
require 'package'
class Github_cli < Package
description 'Official Github CLI tool'
homepage 'https://cli.github.com/'
version '0.9.0'
source_url 'https://github.com/cli/cli/archive/v0.9.0.tar.gz'
source_sha256 '318295e5a662f785662751f1e2cd4b1f613ec3aced1c4e7f1755d27922dbfdbf'
binary_url ({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/github_cli-0.9.0-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/github_cli-0.9.0-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/github_cli-0.9.0-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/github_cli-0.9.0-chromeos-x86_64.tar.xz',
})
binary_sha256 ({
aarch64: 'e1ac503938d742d34c46ee3c35e0ce1a0f43732c95a20826908633bedc50e625',
armv7l: 'e1ac503938d742d34c46ee3c35e0ce1a0f43732c95a20826908633bedc50e625',
i686: '6162d4893573836ace9915244dbf565342dcc41ac6369bc8dfa20f970e1cbc93',
x86_64: '624f3bf1941d4d1b097c3506af48dbf3fd16d1055057730896a742006e5dc55d',
})
depends_on 'go' => :build
def self.build
system 'make'
end
def self.install
system "install -Dm755 bin/gh #{CREW_DEST_PREFIX}/bin/gh"
end
def self.postinstall
puts
puts "Type 'gh' to get started.".lightblue
puts
end
end
packages/graphviz.rb
View file @ a4f128d9
......@@ -3,32 +3,50 @@ require 'package'
class Graphviz < Package
description 'Graphviz is open source graph visualization software.'
homepage 'https://www.graphviz.org/'
version '2.44.0'
version '2.44.0-1'
compatibility 'all'
source_url 'https://gitlab.com/graphviz/graphviz/-/archive/2.44.0/graphviz-2.44.0.tar.bz2'
source_sha256 'eaff61ce05bf8196c596097bab6310fa6e7e96ee908a199a4bc83fbd5e7082d6'
binary_url ({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/graphviz-2.44.0-1-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/graphviz-2.44.0-1-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/graphviz-2.44.0-1-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/graphviz-2.44.0-1-chromeos-x86_64.tar.xz',
})
binary_sha256 ({
aarch64: '31608ae44ed6971f1db667f6632884d3339cb6ca23726d37054d6530b5f62a74',
armv7l: '31608ae44ed6971f1db667f6632884d3339cb6ca23726d37054d6530b5f62a74',
i686: 'ced8535b2bf48eb70560d7a504919ec7cd961eabd4a1cad74693bdf9fac230da',
x86_64: '010ce4c07b742c9ee8f59abb3672efb69f524a07315169495849f56f70e91608',
})
depends_on 'automake' => :build
depends_on 'libgd'
depends_on 'pango'
depends_on 'flex'
depends_on 'gdk_pixbuf'
depends_on 'libxrender'
depends_on 'poppler'
depends_on 'tcl'
depends_on 'expat'
def self.build
system "./autogen.sh"
system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX} LDFLAGS='-L#{CREW_LIB_PREFIX}' --with-libgd=yes --with-gdincludedir=#{CREW_PREFIX}/include --with-gdlibdir=#{CREW_LIB_PREFIX} --enable-tcl=no --enable-lua=no --enable-perl=no --enable-io=no --with-libexpat=yes"
system "make"
Dir.mkdir 'build'
Dir.chdir 'build' do
system 'cmake',
"-DGLIBCONFIG_INCLUDE_DIR=#{CREW_LIB_PREFIX}/glib-2.0/include",
"-DCMAKE_C_FLAGS='-I#{CREW_PREFIX}/include/harfbuzz'",
"-DCMAKE_INSTALL_PREFIX=#{CREW_PREFIX}",
'-DCMAKE_BUILD_TYPE=Release',
'..'
system 'make'
end
end
def self.install
system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
Dir.chdir 'build' do
system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
end
case ARCH
when 'x86_64'
Dir.mkdir CREW_DEST_LIB_PREFIX
Dir.chdir CREW_DEST_PREFIX do
FileUtils.mv Dir.glob('lib/*'), 'lib64/'
end
end
end
end
packages/ripgrep.rb
View file @ a4f128d9
......@@ -3,26 +3,29 @@ require 'package'
class Ripgrep < Package
description 'ripgrep recursively searches directories for a regex pattern'
homepage 'https://github.com/BurntSushi/ripgrep'
version '12.0.1'
version '12.1.0'
compatibility 'all'
source_url 'https://github.com/BurntSushi/ripgrep/archive/12.0.1.tar.gz'
source_sha256 '5be34aa77a36ac9d8f1297a0d97069e4653e03f61c67d192cee32944cd2b6329'
source_url 'https://github.com/BurntSushi/ripgrep/archive/12.1.0.tar.gz'
source_sha256 'ca2d11dd7b7346734d47ad8073468e9c409fbe85842a608d372b8d4fb36be291'
binary_url ({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/ripgrep-12.1.0-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/ripgrep-12.1.0-chromeos-armv7l.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/ripgrep-12.1.0-chromeos-x86_64.tar.xz',
})
binary_sha256 ({
aarch64: '3a258a81559b077d04cf3d9912731da26d2f8398538e9a9faa3fb3e0a15aa6cd',
armv7l: '3a258a81559b077d04cf3d9912731da26d2f8398538e9a9faa3fb3e0a15aa6cd',
x86_64: '1e1b614726be5ad7de8e35921d8ea73c0fd72f4cd3d245b5dae78e356055e17b',
})
depends_on 'rust'
def self.build
case ARCH
when 'aarch64'
system 'rustup toolchain install 1.25.0-aarch64-unknown-linux-gnu'
system 'rustup default 1.25.0-aarch64-unknown-linux-gnu'
when 'armv7l'
system 'rustup toolchain install 1.25.0-armv7-unknown-linux-gnueabihf'
system 'rustup default 1.25.0-armv7-unknown-linux-gnueabihf'
when 'aarch64', 'armv7l'
system 'rustup toolchain install 1.43.1-armv7-unknown-linux-gnueabihf'
system 'rustup default 1.43.1-armv7-unknown-linux-gnueabihf'
else
system 'rustup toolchain install stable'
system 'rustup default stable'
......@@ -31,10 +34,17 @@ class Ripgrep < Package
end
def self.check
ENV['TMPDIR'] = "#{CREW_PREFIX}/tmp"
system 'cargo test --all'
end
def self.install
system "install -Dm755 target/release/rg #{CREW_DEST_PREFIX}/bin/rg"
end
def self.postinstall
puts
puts "Type 'rg' to get started.".lightblue
puts
end
end
packages/terraform.rb
View file @ a4f128d9
......@@ -3,37 +3,22 @@ require 'package'
class Terraform < Package
description 'Terraform is a tool for building, changing, and combining infrastructure safely and efficiently.'
homepage 'https://www.terraform.io/'
version '0.11.1'
version '0.12.25'
compatibility 'all'
source_url 'https://github.com/hashicorp/terraform/archive/v0.11.1.tar.gz'
source_sha256 'da804e69e990226ee14dadbf33850c8b074d5e0782d56522b71d62c4c5c82cba'
binary_url ({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/terraform-0.11.1-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/terraform-0.11.1-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/terraform-0.11.1-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/terraform-0.11.1-chromeos-x86_64.tar.xz',
})
binary_sha256 ({
aarch64: 'c02e4d1761a5b74e4811cda8746117c9b8a085ef020ab6a626d32fd8ccb01cbe',
armv7l: 'c02e4d1761a5b74e4811cda8746117c9b8a085ef020ab6a626d32fd8ccb01cbe',
i686: '52f1396eda1989af2be6b67598d793e64968ff9cc19a72341b8491b0007724f2',
x86_64: 'cd1bb823657e6ab6199403db138ddf83141fbe4728d6801b5dae897e782aaf29',
})
depends_on 'go' => :build
def self.build
system 'mkdir -p ../src/github.com/hashicorp/terraform'
system 'cp -aT . ../src/github.com/hashicorp/terraform/'
system 'mv ../src .'
system 'export GOPATH=`pwd`; go get -u golang.org/x/tools/cmd/stringer'
system "export TMPDIR=#{CREW_PREFIX}/tmp; export GOPATH=`pwd`; export PATH=\$PATH:\$GOPATH/bin; cd src/github.com/hashicorp/terraform/; make dev"
case ARCH
when 'x86_64'
source_url 'https://releases.hashicorp.com/terraform/0.12.25/terraform_0.12.25_linux_amd64.zip'
source_sha256 'e95daabd1985329f87e6d40ffe7b9b973ff0abc07a403f767e8658d64d733fb0'
when 'aarch64', 'armv7l'
source_url 'https://releases.hashicorp.com/terraform/0.12.25/terraform_0.12.25_linux_arm.zip'
source_sha256 '20979f0f53a0931cd23332cd2c52ed4ec8257797e8050e5b794ad53c791a7e85'
when 'i686'
source_url 'https://releases.hashicorp.com/terraform/0.12.25/terraform_0.12.25_linux_386.zip'
source_sha256 '51a4653dfdbee000bc47f05606ca8f328a1d31ebd6a3b6569230bcd303883571'
end
def self.install
Dir.chdir 'src/github.com/hashicorp/terraform' do
system "install -D -m 00755 bin/terraform #{CREW_DEST_PREFIX}/bin/terraform"
end
system "install -Dm755 terraform #{CREW_DEST_PREFIX}/bin/terraform"
end
end
packages/wxwidgets.rb
View file @ a4f128d9
......@@ -3,22 +3,22 @@ require 'package'
class Wxwidgets < Package
description 'wxWidgets is a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base.'
homepage 'https://www.wxwidgets.org/'
version '3.0.4'
version '3.0.5.1'
compatibility 'all'
source_url 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4.tar.bz2'
source_sha256 '96157f988d261b7368e5340afa1a0cad943768f35929c22841f62c25b17bf7f0'
source_url 'https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.5.1/wxWidgets-3.0.5.1.tar.bz2'
source_sha256 '440f6e73cf5afb2cbf9af10cec8da6cdd3d3998d527598a53db87099524ac807'
binary_url ({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/wxwidgets-3.0.4-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/wxwidgets-3.0.4-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/wxwidgets-3.0.4-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/wxwidgets-3.0.4-chromeos-x86_64.tar.xz',
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/wxwidgets-3.0.5.1-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/wxwidgets-3.0.5.1-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/wxwidgets-3.0.5.1-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/wxwidgets-3.0.5.1-chromeos-x86_64.tar.xz',
})
binary_sha256 ({
aarch64: 'b91d482d148f8132c67e40e8b3c33d7d2e29744cade8f39b2797c3a8bef52081',
armv7l: 'b91d482d148f8132c67e40e8b3c33d7d2e29744cade8f39b2797c3a8bef52081',
i686: 'aba2a4d219b45436427b01d8e6f1b245971966b946e906668595710a63b74f01',
x86_64: '56a888743624497531f4896cc9c3de3feb041c2c963f2ce08c770c5745e9c983',
aarch64: '9bc9ccfe7c61b34880f86340c35114f2cadd9a1cee6e7941cb345c9919a2c33d',
armv7l: '9bc9ccfe7c61b34880f86340c35114f2cadd9a1cee6e7941cb345c9919a2c33d',
i686: 'dd1e04c0d67446afcb3c3083d4e2c77ed4d1227d08434b4e512dab4bda0c4993',
x86_64: 'f7c04b355523fc215d30e16671ae2e3654fbf13112acc753d0797e3ef862d2b4',
})
depends_on 'gst_plugins_base'
......@@ -27,11 +27,10 @@ class Wxwidgets < Package
depends_on 'libsecret'
depends_on 'libsoup'
depends_on 'mesa'
depends_on 'gtk3'
def self.build
system './configure',
"--prefix=#{CREW_PREFIX}",
"--libdir=#{CREW_LIB_PREFIX}"
system "./configure #{CREW_OPTIONS} --with-gtk"
system 'make'
end
......
tools/packages.yaml
View file @ a4f128d9
......@@ -29,6 +29,16 @@ url: https://download.savannah.gnu.org/releases/acl
activity: medium
---
kind: url
name: acpi
url: https://sourceforge.net/projects/acpiclient/files/acpiclient/
activity: none
---
kind: url
name: acpica
url: https://acpica.org/downloads
activity: medium
---
kind: url
name: ag
url: https://github.com/ggreer/the_silver_searcher/releases
activity: medium
......@@ -369,6 +379,11 @@ url: https://github.com/ivmai/bdwgc/releases
activity: medium
---
kind: url
name: beav
url: https://deb.debian.org/debian/pool/main/b/beav/
activity: none
---
kind: url
name: biew
url: https://sourceforge.net/projects/beye/files/biew/
activity: none
......@@ -429,6 +444,11 @@ url: https://github.com/adobe/brackets/releases/
activity: medium
---
kind: url
name: brave
url: https://github.com/brave/brave-browser/releases/
activity: high
---
kind: url
name: broadway
url: https://developer.gnome.org/gtk3/stable/gtk-broadway.html
activity: none
......@@ -519,11 +539,6 @@ url: https://sourceforge.net/projects/ljcharm/files/charm/
activity: none
---
kind: url
name: checkinstall
url: http://asic-linux.com.mx/~izto/checkinstall/files/source/
activity: low
---
kind: url
name: chibi_scheme
url: https://github.com/ashinn/chibi-scheme/releases
activity: none
......@@ -904,6 +919,11 @@ url: https://sourceforge.net/projects/dos2unix/files/dos2unix/
activity: low
---
kind: url
name: dosbox_x
url: https://github.com/joncampbell123/dosbox-x/releases
activity: medium
---
kind: url
name: doxygen
url: https://github.com/doxygen/doxygen/releases
activity: low
......@@ -1429,6 +1449,11 @@ url: https://github.com/aktau/github-release/releases
activity: low
---
kind: url
name: gitkraken
url: https://www.gitkraken.com/download
activity: high
---
kind: url
name: gittools
url: https://github.com/internetwache/GitTools/
activity: none
......@@ -1744,6 +1769,11 @@ url: https://ftpmirror.gnu.org/gzip/
activity: low
---
kind: url
name: gzrt
url: https://www.urbanophile.com/arenn/hacking/gzrt/
activity: none
---
kind: url
name: gzsize
url: https://github.com/bfontaine/gzsize/releases
activity: low
......@@ -2474,6 +2504,11 @@ url: https://download.gnome.org/sources/libgudev/
activity: low
---
kind: url
name: libharu
url: https://github.com/libharu/libharu/releases
activity: none
---
kind: url
name: libheif
url: https://github.com/strukturag/libheif/releases
activity: low
......@@ -2524,6 +2559,11 @@ url: ftp://ftp.mars.org/pub/mpeg/
activity: none
---
kind: url
name: libmbedtls
url: https://tls.mbed.org/download-archive
activity: high
---
kind: url
name: libmbim
url: https://www.freedesktop.org/software/libmbim/
activity: low
......@@ -3689,6 +3729,11 @@ url: https://github.com/creationix/nvm/releases
activity: medium
---
kind: url
name: obs
url: https://github.com/obsproject/obs-studio/releases
activity: medium
---
kind: url
name: oc
url: https://github.com/openshift/origin/releases
activity: medium
......@@ -4064,6 +4109,11 @@ url: http://pkgconfig.freedesktop.org/releases
activity: none
---
kind: url
name: pkgsrc
url: https://github.com/NetBSD/pkgsrc
activity: high
---
kind: url
name: platformsh
url: https://github.com/platformsh/platformsh-cli/releases
activity: high
......@@ -4074,6 +4124,11 @@ url: https://github.com/mcrapet/plowshare/releases
activity: low
---
kind: url
name: plplot
url: https://sourceforge.net/projects/plplot/files/plplot/
activity: low
---
kind: url
name: pmd
url: https://github.com/pmd/pmd/releases
activity: high
......@@ -4239,6 +4294,11 @@ url: https://download.qemu.org
activity: medium
---
kind: url
name: qhull
url: https://github.com/qhull/qhull/releases
activity: low
---
kind: url
name: qpdf
url: https://github.com/qpdf/qpdf/releases
activity: medium
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7